diff --git a/ChangeLog b/ChangeLog
index 4ae25e9a61..4df55e5fd7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -33,6 +33,7 @@ phpMyAdmin - ChangeLog
 + Shift/click support in database Structure
 + Show/hide column in table Browse
 - bug #3353856 [AJAX] AJAX dialogs use wrong font-size
+- bug #3354356 [interface] Timepicker does not work in AJAX dialogs
 
 3.4.4.0 (not yet released)
 - bug #3323060 [parser] SQL parser breaks AJAX requests if query has unclosed quotes
diff --git a/Documentation.html b/Documentation.html
index 29054a28ba..0b3bd922c5 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -2392,23 +2392,6 @@ setfacl -d -m "g:www-data:rwx" tmp
         <code>first_timestamp</code>, which is used for first timestamp column
         in table.</dd>
 
-    <dt id="cfg_NumOperators">$cfg['NumOperators'] array</dt>
-    <dd>Operators available for search operations on numeric and date columns.
-    </dd>
-
-    <dt id="cfg_TextOperators">$cfg['TextOperators'] array</dt>
-    <dd>Operators available for search operations on character columns.
-        Note that we put <code>LIKE</code> by default instead of
-        <code>LIKE %...%</code>, to avoid unintended performance problems
-        in case of huge tables.</dd>
-
-    <dt id="cfg_EnumOperators">$cfg['EnumOperators'] array</dt>
-    <dd>Operators available for search operations on ENUM columns.</dd>
-
-    <dt id="cfg_NullOperators">$cfg['NullOperators'] array</dt>
-    <dd>Additional operators available for search operations when the
-        column can be null.</dd>
-
 </dl>
 
 <!-- TRANSFORMATIONS -->
diff --git a/db_routines.php b/db_routines.php
index 4c225a87be..efac9ea380 100644
--- a/db_routines.php
+++ b/db_routines.php
@@ -12,6 +12,7 @@
 require_once './libraries/common.inc.php';
 require_once './libraries/common.lib.php';
 require_once './libraries/mysql_charsets.lib.php';
+require_once './libraries/data_mysql.inc.php';
 
 /**
  * Include JavaScript libraries
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 21d70cc999..7d9564e1ee 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -2953,7 +2953,7 @@ function PMA_getSupportedDatatypes($html = false, $selected = '')
         foreach ($cfg['ColumnTypes'] as $key => $value) {
             if (is_array($value)) {
                 $retval .= "<optgroup label='" . htmlspecialchars($key) . "'>";
-                foreach ($value as $subkey => $subvalue) {
+                foreach ($value as $subvalue) {
                     if ($subvalue == $selected) {
                         $retval .= "<option selected='selected'>";
                         $retval .= $subvalue;
@@ -2977,9 +2977,9 @@ function PMA_getSupportedDatatypes($html = false, $selected = '')
         }
     } else {
         $retval = array();
-        foreach ($cfg['ColumnTypes'] as $key => $value) {
+        foreach ($cfg['ColumnTypes'] as $value) {
             if (is_array($value)) {
-                foreach ($value as $subkey => $subvalue) {
+                foreach ($value as $subvalue) {
                     if ($subvalue !== '-') {
                         $retval[] = $subvalue;
                     }
diff --git a/libraries/config.default.php b/libraries/config.default.php
index 809a48defc..d54dc5a269 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -2740,379 +2740,50 @@ $cfg['DBG']['sql'] = false;
  */
 
 /**
- * Column types;
- * VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity
+ * Column types
+ *
+ * Fill in this array to overwrite data from data_*.inc.php files
  *
  * @global array $cfg['ColumnTypes']
  */
-$cfg['ColumnTypes'] = array(
-    // most used
-    'INT',
-    'VARCHAR',
-    'TEXT',
-    'DATE',
-
-    // numeric
-    'NUMERIC' => array(
-        'TINYINT',
-        'SMALLINT',
-        'MEDIUMINT',
-        'INT',
-        'BIGINT',
-        '-',
-        'DECIMAL',
-        'FLOAT',
-        'DOUBLE',
-        'REAL',
-        '-',
-        'BIT',
-        'BOOLEAN',
-        'SERIAL',
-    ),
-
-
-    // Date/Time
-    'DATE and TIME' => array(
-        'DATE',
-        'DATETIME',
-        'TIMESTAMP',
-        'TIME',
-        'YEAR',
-    ),
-
-    // Text
-    'STRING' => array(
-        'CHAR',
-        'VARCHAR',
-        '-',
-        'TINYTEXT',
-        'TEXT',
-        'MEDIUMTEXT',
-        'LONGTEXT',
-        '-',
-        'BINARY',
-        'VARBINARY',
-        '-',
-        'TINYBLOB',
-        'MEDIUMBLOB',
-        'BLOB',
-        'LONGBLOB',
-        '-',
-        'ENUM',
-        'SET',
-    ),
-
-    'SPATIAL' => array(
-        'GEOMETRY',
-        'POINT',
-        'LINESTRING',
-        'POLYGON',
-        'MULTIPOINT',
-        'MULTILINESTRING',
-        'MULTIPOLYGON',
-        'GEOMETRYCOLLECTION',
-    ),
-);
+$cfg['ColumnTypes'] = array();
 
 /**
  * Attributes
  *
+ * Fill in this array to overwrite data from data_*.inc.php files
+ *
  * @global array $cfg['AttributeTypes']
  */
-$cfg['AttributeTypes'] = array(
-   '',
-   'BINARY',
-   'UNSIGNED',
-   'UNSIGNED ZEROFILL',
-   'on update CURRENT_TIMESTAMP',
-);
-
+$cfg['AttributeTypes'] = array();
 
 if ($cfg['ShowFunctionFields']) {
     /**
      * Available functions
      *
+     * Fill in this array to overwrite data from data_*.inc.php files
+     *
      * @global array $cfg['Functions']
      */
-    $cfg['Functions'] = array(
-        'ABS',
-        'ACOS',
-        'ASCII',
-        'ASIN',
-        'ATAN',
-        'BIN',
-        'BIT_COUNT',
-        'BIT_LENGTH',
-        'CEILING',
-        'CHAR',
-        'CHAR_LENGTH',
-        'COMPRESS',
-        'CONNECTION_ID',
-        'COS',
-        'COT',
-        'CRC32',
-        'CURDATE',
-        'CURRENT_USER',
-        'CURTIME',
-        'DATABASE',
-        'DATE',
-        'DAYNAME',
-        'DAYOFMONTH',
-        'DAYOFWEEK',
-        'DAYOFYEAR',
-        'DEGREES',
-        'DES_DECRYPT',
-        'DES_ENCRYPT',
-        'ENCRYPT',
-        'EXP',
-        'FLOOR',
-        'FROM_DAYS',
-        'FROM_UNIXTIME',
-        'HEX',
-        'HOUR',
-        'INET_ATON',
-        'INET_NTOA',
-        'LAST_DAY',
-        'LENGTH',
-        'LN',
-        'LOAD_FILE',
-        'LOG',
-        'LOG10',
-        'LOG2',
-        'LOWER',
-        'LTRIM',
-        'MD5',
-        'MICROSECOND',
-        'MINUTE',
-        'MONTH',
-        'MONTHNAME',
-        'NOW',
-        'OCT',
-        'OLD_PASSWORD',
-        'ORD',
-        'PASSWORD',
-        'PI',
-        'QUARTER',
-        'QUOTE',
-        'RADIANS',
-        'RAND',
-        'REVERSE',
-        'ROUND',
-        'RTRIM',
-        'SECOND',
-        'SEC_TO_TIME',
-        'SHA1',
-        'SIGN',
-        'SIN',
-        'SOUNDEX',
-        'SPACE',
-        'SQRT',
-        'SYSDATE',
-        'TAN',
-        'TIME',
-        'TIMESTAMP',
-        'TIME_TO_SEC',
-        'TO_DAYS',
-        'TRIM',
-        'UNCOMPRESS',
-        'UNCOMPRESSED_LENGTH',
-        'UNHEX',
-        'UNIX_TIMESTAMP',
-        'UPPER',
-        'USER',
-        'UTC_DATE',
-        'UTC_TIME',
-        'UTC_TIMESTAMP',
-        'UUID',
-        'VERSION',
-        'WEEK',
-        'WEEKDAY',
-        'WEEKOFYEAR',
-        'YEAR',
-        'YEARWEEK',
-    );
+    $cfg['Functions'] = array();
 
     /**
      * Which column types will be mapped to which Group?
      *
+     * Fill in this array to overwrite data from data_*.inc.php files
+     *
      * @global array $cfg['RestrictColumnTypes']
      */
-    $cfg['RestrictColumnTypes'] = array(
-        'TINYINT'   => 'FUNC_NUMBER',
-        'SMALLINT'  => 'FUNC_NUMBER',
-        'MEDIUMINT' => 'FUNC_NUMBER',
-        'INT'       => 'FUNC_NUMBER',
-        'BIGINT'    => 'FUNC_NUMBER',
-        'DECIMAL'   => 'FUNC_NUMBER',
-        'FLOAT'     => 'FUNC_NUMBER',
-        'DOUBLE'    => 'FUNC_NUMBER',
-        'REAL'      => 'FUNC_NUMBER',
-        'BIT'       => 'FUNC_NUMBER',
-        'BOOLEAN'   => 'FUNC_NUMBER',
-        'SERIAL'    => 'FUNC_NUMBER',
-
-        'DATE'      => 'FUNC_DATE',
-        'DATETIME'  => 'FUNC_DATE',
-        'TIMESTAMP' => 'FUNC_DATE',
-        'TIME'      => 'FUNC_DATE',
-        'YEAR'      => 'FUNC_DATE',
-
-        'CHAR'       => 'FUNC_CHAR',
-        'VARCHAR'    => 'FUNC_CHAR',
-        'TINYTEXT'   => 'FUNC_CHAR',
-        'TEXT'       => 'FUNC_CHAR',
-        'MEDIUMTEXT' => 'FUNC_CHAR',
-        'LONGTEXT'   => 'FUNC_CHAR',
-        'BINARY'     => 'FUNC_CHAR',
-        'VARBINARY'  => 'FUNC_CHAR',
-        'TINYBLOB'   => 'FUNC_CHAR',
-        'MEDIUMBLOB' => 'FUNC_CHAR',
-        'BLOB'       => 'FUNC_CHAR',
-        'LONGBLOB'   => 'FUNC_CHAR',
-        'ENUM'       => '',
-        'SET'        => '',
-
-        'GEOMETRY'           => 'FUNC_SPATIAL',
-        'POINT'              => 'FUNC_SPATIAL',
-        'LINESTRING'         => 'FUNC_SPATIAL',
-        'POLYGON'            => 'FUNC_SPATIAL',
-        'MULTIPOINT'         => 'FUNC_SPATIAL',
-        'MULTILINESTRING'    => 'FUNC_SPATIAL',
-        'MULTIPOLYGON'       => 'FUNC_SPATIAL',
-        'GEOMETRYCOLLECTION' => 'FUNC_SPATIAL',
-
-    );
+    $cfg['RestrictColumnTypes'] = array();
 
     /**
      * Map above defined groups to any function
      *
+     * Fill in this array to overwrite data from data_*.inc.php files
+     *
      * @global array $cfg['RestrictFunctions']
      */
-    $cfg['RestrictFunctions'] = array(
-        'FUNC_CHAR' => array(
-            'BIN',
-            'CHAR',
-            'CURRENT_USER',
-            'COMPRESS',
-            'DATABASE',
-            'DAYNAME',
-            'DES_DECRYPT',
-            'DES_ENCRYPT',
-            'ENCRYPT',
-            'HEX',
-            'INET_NTOA',
-            'LOAD_FILE',
-            'LOWER',
-            'LTRIM',
-            'MD5',
-            'MONTHNAME',
-            'OLD_PASSWORD',
-            'PASSWORD',
-            'QUOTE',
-            'REVERSE',
-            'RTRIM',
-            'SHA1',
-            'SOUNDEX',
-            'SPACE',
-            'TRIM',
-            'UNCOMPRESS',
-            'UNHEX',
-            'UPPER',
-            'USER',
-            'UUID',
-        ),
-
-        'FUNC_DATE' => array(
-            'CURDATE',
-            'CURTIME',
-            'DATE',
-            'FROM_DAYS',
-            'FROM_UNIXTIME',
-            'LAST_DAY',
-            'NOW',
-            'SEC_TO_TIME',
-            'SYSDATE',
-            'TIME',
-            'TIMESTAMP',
-            'UTC_DATE',
-            'UTC_TIME',
-            'UTC_TIMESTAMP',
-            'YEAR',
-        ),
-
-        'FUNC_NUMBER' => array(
-            'ABS',
-            'ACOS',
-            'ASCII',
-            'ASIN',
-            'ATAN',
-            'BIT_LENGTH',
-            'BIT_COUNT',
-            'CEILING',
-            'CHAR_LENGTH',
-            'CONNECTION_ID',
-            'COS',
-            'COT',
-            'CRC32',
-            'DAYOFMONTH',
-            'DAYOFWEEK',
-            'DAYOFYEAR',
-            'DEGREES',
-            'EXP',
-            'FLOOR',
-            'HOUR',
-            'INET_ATON',
-            'LENGTH',
-            'LN',
-            'LOG',
-            'LOG2',
-            'LOG10',
-            'MICROSECOND',
-            'MINUTE',
-            'MONTH',
-            'OCT',
-            'ORD',
-            'PI',
-            'QUARTER',
-            'RADIANS',
-            'RAND',
-            'ROUND',
-            'SECOND',
-            'SIGN',
-            'SIN',
-            'SQRT',
-            'TAN',
-            'TO_DAYS',
-            'TIME_TO_SEC',
-            'UNCOMPRESSED_LENGTH',
-            'UNIX_TIMESTAMP',
-            'WEEK',
-            'WEEKDAY',
-            'WEEKOFYEAR',
-            'YEARWEEK',
-        ),
-
-        'FUNC_SPATIAL' => array(
-            'GeomFromText',
-            'GeomFromWKB',
-
-            'GeomCollFromText',
-            'LineFromText',
-            'MLineFromText',
-            'PointFromText',
-            'MPointFromText',
-            'PolyFromText',
-            'MPolyFromText',
-
-            'GeomCollFromWKB',
-            'LineFromWKB',
-            'MLineFromWKB',
-            'PointFromWKB',
-            'MPointFromWKB',
-            'PolyFromWKB',
-            'MPolyFromWKB',
-        ),
-    );
+    $cfg['RestrictFunctions'] = array();
 
     /**
      * Default functions for above defined groups
@@ -3126,90 +2797,6 @@ if ($cfg['ShowFunctionFields']) {
         'first_timestamp' => 'NOW',
         'pk_char36' => 'UUID',
     );
-} // end if
-
-/**
- * Search operators
- *
- * @global array $cfg['NumOperators']
- */
-$cfg['NumOperators'] = array(
-   '=',
-   '>',
-   '>=',
-   '<',
-   '<=',
-   '!=',
-   'LIKE',
-   'NOT LIKE',
-   'IN (...)',
-   'NOT IN (...)',
-   'BETWEEN',
-   'NOT BETWEEN',
-);
-
-/**
- * Search operators
- *
- * @global array $cfg['TextOperators']
- */
-$cfg['TextOperators'] = array(
-   'LIKE',
-   'LIKE %...%',
-   'NOT LIKE',
-   '=',
-   '!=',
-   'REGEXP',
-   'REGEXP ^...$',
-   'NOT REGEXP',
-   "= ''",
-   "!= ''",
-   'IN (...)',
-   'NOT IN (...)',
-   'BETWEEN',
-   'NOT BETWEEN',
-);
-
-/**
- * Search operators
- *
- * @global array $cfg['EnumOperators']
- */
-$cfg['EnumOperators'] = array(
-   '=',
-   '!=',
-);
-
-/**
- * Search operators
- *
- * @global array $cfg['SetOperators']
- */
-$cfg['SetOperators'] = array(
-   'IN',
-   'NOT IN',
-);
-
-/**
- * Search operators
- *
- * @global array $cfg['NullOperators']
- */
-$cfg['NullOperators'] = array(
-   'IS NULL',
-   'IS NOT NULL',
-);
-
-/**
- * Search operators
- *
- * @global array $cfg['UnaryOperators']
- */
-$cfg['UnaryOperators'] = array(
-   'IS NULL' => 1,
-   'IS NOT NULL' => 1,
-   "= ''" => 1,
-   "!= ''" => 1
-);
+}
 
 ?>
diff --git a/libraries/data_mysql.inc.php b/libraries/data_mysql.inc.php
new file mode 100644
index 0000000000..d504d1592b
--- /dev/null
+++ b/libraries/data_mysql.inc.php
@@ -0,0 +1,286 @@
+<?php
+/**
+ * Column types and functions supported by MySQL
+ *
+ * @package phpMyAdmin
+ */
+
+// VARCHAR, TINYINT, TEXT and DATE are listed first, based on estimated popularity
+$cfg['ColumnTypes'] = !empty($cfg['ColumnTypes']) ? $cfg['ColumnTypes'] : array(
+    // most used
+    'INT',
+    'VARCHAR',
+    'TEXT',
+    'DATE',
+
+    // numeric
+    'NUMERIC' => array(
+        'TINYINT',
+        'SMALLINT',
+        'MEDIUMINT',
+        'INT',
+        'BIGINT',
+        '-',
+        'DECIMAL',
+        'FLOAT',
+        'DOUBLE',
+        'REAL',
+        '-',
+        'BIT',
+        'BOOLEAN',
+        'SERIAL',
+    ),
+
+
+    // Date/Time
+    'DATE and TIME' => array(
+        'DATE',
+        'DATETIME',
+        'TIMESTAMP',
+        'TIME',
+        'YEAR',
+    ),
+
+    // Text
+    'STRING' => array(
+        'CHAR',
+        'VARCHAR',
+        '-',
+        'TINYTEXT',
+        'TEXT',
+        'MEDIUMTEXT',
+        'LONGTEXT',
+        '-',
+        'BINARY',
+        'VARBINARY',
+        '-',
+        'TINYBLOB',
+        'MEDIUMBLOB',
+        'BLOB',
+        'LONGBLOB',
+        '-',
+        'ENUM',
+        'SET',
+    ),
+
+    'SPATIAL' => array(
+        'GEOMETRY',
+        'POINT',
+        'LINESTRING',
+        'POLYGON',
+        'MULTIPOINT',
+        'MULTILINESTRING',
+        'MULTIPOLYGON',
+        'GEOMETRYCOLLECTION',
+    ),
+);
+
+$cfg['AttributeTypes'] = !empty($cfg['AttributeTypes']) ? $cfg['AttributeTypes'] : array(
+   '',
+   'BINARY',
+   'UNSIGNED',
+   'UNSIGNED ZEROFILL',
+   'on update CURRENT_TIMESTAMP',
+);
+
+if ($cfg['ShowFunctionFields']) {
+    $cfg['RestrictColumnTypes'] = !empty($cfg['RestrictColumnTypes']) ? $cfg['RestrictColumnTypes'] : array(
+        'TINYINT'   => 'FUNC_NUMBER',
+        'SMALLINT'  => 'FUNC_NUMBER',
+        'MEDIUMINT' => 'FUNC_NUMBER',
+        'INT'       => 'FUNC_NUMBER',
+        'BIGINT'    => 'FUNC_NUMBER',
+        'DECIMAL'   => 'FUNC_NUMBER',
+        'FLOAT'     => 'FUNC_NUMBER',
+        'DOUBLE'    => 'FUNC_NUMBER',
+        'REAL'      => 'FUNC_NUMBER',
+        'BIT'       => 'FUNC_NUMBER',
+        'BOOLEAN'   => 'FUNC_NUMBER',
+        'SERIAL'    => 'FUNC_NUMBER',
+
+        'DATE'      => 'FUNC_DATE',
+        'DATETIME'  => 'FUNC_DATE',
+        'TIMESTAMP' => 'FUNC_DATE',
+        'TIME'      => 'FUNC_DATE',
+        'YEAR'      => 'FUNC_DATE',
+
+        'CHAR'       => 'FUNC_CHAR',
+        'VARCHAR'    => 'FUNC_CHAR',
+        'TINYTEXT'   => 'FUNC_CHAR',
+        'TEXT'       => 'FUNC_CHAR',
+        'MEDIUMTEXT' => 'FUNC_CHAR',
+        'LONGTEXT'   => 'FUNC_CHAR',
+        'BINARY'     => 'FUNC_CHAR',
+        'VARBINARY'  => 'FUNC_CHAR',
+        'TINYBLOB'   => 'FUNC_CHAR',
+        'MEDIUMBLOB' => 'FUNC_CHAR',
+        'BLOB'       => 'FUNC_CHAR',
+        'LONGBLOB'   => 'FUNC_CHAR',
+        'ENUM'       => '',
+        'SET'        => '',
+
+        'GEOMETRY'           => 'FUNC_SPATIAL',
+        'POINT'              => 'FUNC_SPATIAL',
+        'LINESTRING'         => 'FUNC_SPATIAL',
+        'POLYGON'            => 'FUNC_SPATIAL',
+        'MULTIPOINT'         => 'FUNC_SPATIAL',
+        'MULTILINESTRING'    => 'FUNC_SPATIAL',
+        'MULTIPOLYGON'       => 'FUNC_SPATIAL',
+        'GEOMETRYCOLLECTION' => 'FUNC_SPATIAL',
+
+    );
+
+    $restrict_functions = array(
+        'FUNC_CHAR' => array(
+            'BIN',
+            'CHAR',
+            'CURRENT_USER',
+            'COMPRESS',
+            'DATABASE',
+            'DAYNAME',
+            'DES_DECRYPT',
+            'DES_ENCRYPT',
+            'ENCRYPT',
+            'HEX',
+            'INET_NTOA',
+            'LOAD_FILE',
+            'LOWER',
+            'LTRIM',
+            'MD5',
+            'MONTHNAME',
+            'OLD_PASSWORD',
+            'PASSWORD',
+            'QUOTE',
+            'REVERSE',
+            'RTRIM',
+            'SHA1',
+            'SOUNDEX',
+            'SPACE',
+            'TRIM',
+            'UNCOMPRESS',
+            'UNHEX',
+            'UPPER',
+            'USER',
+            'UUID',
+            'VERSION',
+        ),
+
+        'FUNC_DATE' => array(
+            'CURDATE',
+            'CURTIME',
+            'DATE',
+            'FROM_DAYS',
+            'FROM_UNIXTIME',
+            'LAST_DAY',
+            'NOW',
+            'SEC_TO_TIME',
+            'SYSDATE',
+            'TIME',
+            'TIMESTAMP',
+            'UTC_DATE',
+            'UTC_TIME',
+            'UTC_TIMESTAMP',
+            'YEAR',
+        ),
+
+        'FUNC_NUMBER' => array(
+            'ABS',
+            'ACOS',
+            'ASCII',
+            'ASIN',
+            'ATAN',
+            'BIT_LENGTH',
+            'BIT_COUNT',
+            'CEILING',
+            'CHAR_LENGTH',
+            'CONNECTION_ID',
+            'COS',
+            'COT',
+            'CRC32',
+            'DAYOFMONTH',
+            'DAYOFWEEK',
+            'DAYOFYEAR',
+            'DEGREES',
+            'EXP',
+            'FLOOR',
+            'HOUR',
+            'INET_ATON',
+            'LENGTH',
+            'LN',
+            'LOG',
+            'LOG2',
+            'LOG10',
+            'MICROSECOND',
+            'MINUTE',
+            'MONTH',
+            'OCT',
+            'ORD',
+            'PI',
+            'QUARTER',
+            'RADIANS',
+            'RAND',
+            'ROUND',
+            'SECOND',
+            'SIGN',
+            'SIN',
+            'SQRT',
+            'TAN',
+            'TO_DAYS',
+            'TO_SECONDS',
+            'TIME_TO_SEC',
+            'UNCOMPRESSED_LENGTH',
+            'UNIX_TIMESTAMP',
+            'UUID_SHORT',
+            'WEEK',
+            'WEEKDAY',
+            'WEEKOFYEAR',
+            'YEARWEEK',
+        ),
+
+        'FUNC_SPATIAL' => array(
+            'GeomFromText',
+            'GeomFromWKB',
+
+            'GeomCollFromText',
+            'LineFromText',
+            'MLineFromText',
+            'PointFromText',
+            'MPointFromText',
+            'PolyFromText',
+            'MPolyFromText',
+
+            'GeomCollFromWKB',
+            'LineFromWKB',
+            'MLineFromWKB',
+            'PointFromWKB',
+            'MPointFromWKB',
+            'PolyFromWKB',
+            'MPolyFromWKB',
+        ),
+    );
+    // $restrict_functions holds all known functions, remove these that are unavailable on current server
+    if (PMA_MYSQL_INT_VERSION < 50500) {
+        $restrict_functions['FUNC_NUMBER'] = array_diff($restrict_functions['FUNC_NUMBER'], array('TO_SECONDS'));
+    }
+    if (PMA_MYSQL_INT_VERSION < 50120) {
+        $restrict_functions['FUNC_NUMBER'] = array_diff($restrict_functions['FUNC_NUMBER'], array('UUID_SHORT'));
+    }
+
+    if (empty($cfg['RestrictFunctions'])) {
+        $cfg['RestrictFunctions'] = $restrict_functions;
+    }
+
+    if (empty($cfg['Functions'])) {
+        // build a list of functions based on $restrict_functions
+        $cfg['Functions'] = array();
+        foreach ($restrict_functions as $cat => $functions) {
+            if ($cat != 'FUNC_SPATIAL') {
+                $cfg['Functions'] = array_merge($cfg['Functions'], $functions);
+            }
+        }
+        sort($cfg['Functions']);
+    }
+    unset($restrict_functions);
+} // end if
+
+?>
\ No newline at end of file
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index 4cfd48ad05..f4ade94bc8 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -27,6 +27,9 @@ require_once './libraries/StorageEngine.class.php';
  */
 require_once './libraries/Partition.class.php';
 
+// load additional configuration variables
+require_once './libraries/data_mysql.inc.php';
+
 if (is_int($cfg['DefaultPropDisplay'])) {
     if ($num_fields <= $cfg['DefaultPropDisplay']) {
         $display_type = 'vertical';
diff --git a/po/bg.po b/po/bg.po
index f637edecc5..13a18c757c 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-03 07:35-0400\n"
-"PO-Revision-Date: 2011-06-23 14:27+0200\n"
+"PO-Revision-Date: 2011-07-06 10:00+0200\n"
 "Last-Translator:  <stoyanster@gmail.com>\n"
 "Language-Team: bulgarian <bg@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -103,11 +103,11 @@ msgstr "Няма зададен BLOB поточен сървър!"
 
 #: bs_disp_as_mime_type.php:35
 msgid "Failed to fetch headers"
-msgstr "Зареждането на заглавките се провали"
+msgstr "Неуспешно зареждане на заглавки"
 
 #: bs_disp_as_mime_type.php:41
 msgid "Failed to open remote URL"
-msgstr "Отваряенто на отдалечения адрес се провали"
+msgstr "Неуспешно отваряне на отдалечен адрес"
 
 #: changelog.php:32 license.php:28
 #, php-format
@@ -509,14 +509,14 @@ msgstr "SQL заявката беше изпълнена успешно"
 #, 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] ""
+msgstr[0] "%d повлиян ред от съхранена процедура при последната заявка"
+msgstr[1] "%d повлияни реда от съхранена процедура при последната заявка"
 
 #: db_routines.php:167
-#, fuzzy, php-format
+#, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
-msgstr "Позволява стартиране на съхранени процедури."
+msgstr "Резултати от изпълнението на процедура %s"
 
 #: db_routines.php:187 libraries/import.lib.php:152 sql.php:685
 #: tbl_change.php:180 tbl_get_field.php:34
@@ -527,7 +527,7 @@ msgstr "MySQL върна празен резултат (т.е. нула редо
 #: db_routines.php:326
 #, php-format
 msgid "The following query has failed: \"%s\""
-msgstr ""
+msgstr "Следната заявка е неуспешна: \"%s\""
 
 #: db_routines.php:193 db_routines.php:298 db_routines.php:303
 #: db_routines.php:313 db_routines.php:327 libraries/common.lib.php:581
@@ -536,66 +536,63 @@ msgstr "MySQL отговори: "
 
 #: db_routines.php:210 db_routines.php:242 db_routines.php:270
 #: db_routines.php:409
-#, fuzzy
 #| msgid "Error in Processing Request"
 msgid "Error in processing request"
 msgstr "Грешка при обработка на заявката"
 
 #: db_routines.php:211 db_routines.php:243 db_routines.php:271
 #: db_routines.php:410
-#, fuzzy, php-format
+#, php-format
 #| msgid "No tables found in database"
 msgid "No routine with name %1$s found in database %2$s"
-msgstr "В БД няма таблици"
+msgstr "Процедурата %1$s не е намерена в БД %2$s"
 
 #: db_routines.php:232 db_routines.php:236
 msgid "Execute routine"
-msgstr ""
+msgstr "Изпълнение на процедура"
 
 #: db_routines.php:261 db_routines.php:265
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export as %s"
 msgid "Export of routine %s"
-msgstr "Експорт като %s"
+msgstr "Експорт на процедура %s"
 
 #: db_routines.php:290 libraries/db_routines.lib.php:911
-#, fuzzy, php-format
+#, php-format
 #| msgid "Invalid server index: %s"
 msgid "Invalid routine type: \"%s\""
-msgstr "Невалиден индекс на сървър: %s"
+msgstr "Невалиден тип процедура: \"%s\""
 
 #: db_routines.php:311
 msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
+msgstr "Съжаляваме, но възстановяването на изтритата процедура е неуспешно."
 
 #: db_routines.php:312
 msgid "The backed up query was:"
-msgstr ""
+msgstr "Архивираната заявка е:"
 
 #: db_routines.php:316
-#, fuzzy, php-format
+#, php-format
 #| msgid "Column %s has been dropped"
 msgid "Routine %1$s has been modified."
-msgstr "Колоната %s беше изтрита"
+msgstr "Процедурата%1$s  беше променена."
 
 #: db_routines.php:329
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %1$s has been created."
 msgid "Routine %1$s has been created."
-msgstr "Таблицата %1$s беше създадена."
+msgstr "Процедура %1$s беше създадена."
 
 #: db_routines.php:337
 msgid "<b>One or more errors have occured while processing your request:</b>"
-msgstr ""
+msgstr "<b>Една или повече грешки възникнаха при обработка на заявката:</b>"
 
 #: db_routines.php:381
-#, fuzzy
 #| msgid "Create view"
 msgid "Create routine"
-msgstr "Създаване на изглед"
+msgstr "Създаване на процедура"
 
 #: db_routines.php:385
-#, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
 msgstr "Редактиране"
@@ -606,6 +603,10 @@ msgid ""
 "handling multi queries. <b>The execution of some stored routines may fail!</"
 "b> Please use the improved 'mysqli' extension to avoid any problems."
 msgstr ""
+"Използвате непрепоръчителна версия на разширението на PHP 'mysql', която е "
+"неспособна да извършва множествени заявки. <b>Изпълнението на някои "
+"съхранени процедури може да пропадне!</b> Моля, използвайте подобреното "
+"разширение 'mysqli', за да избегнете проблеми."
 
 #: db_search.php:30 libraries/auth/config.auth.lib.php:83
 #: libraries/auth/config.auth.lib.php:102
@@ -799,7 +800,7 @@ msgstr "Изчистване"
 #: server_databases.php:266 tbl_structure.php:153 tbl_structure.php:154
 #: tbl_structure.php:603
 msgid "Drop"
-msgstr "Унищожаване"
+msgstr "Изтриване"
 
 #: db_structure.php:506 tbl_operations.php:604
 msgid "Check table"
@@ -942,7 +943,7 @@ msgstr "Избраният тип експорт трябва да бъде за
 #: export.php:164 export.php:189 export.php:671
 #, php-format
 msgid "Insufficient space to save the file %s."
-msgstr "Недостатъчно свободно пространство за записване на файла %s."
+msgstr "Недостатъчно свободно пространство за запазване на файла %s."
 
 #: export.php:307
 #, php-format
@@ -955,12 +956,12 @@ msgstr ""
 #: export.php:311 export.php:315
 #, php-format
 msgid "The web server does not have permission to save the file %s."
-msgstr "Web сървъра няма права за запис върху файла %s."
+msgstr "Web сървърът няма права за писане върху файла %s."
 
 #: export.php:673
 #, php-format
 msgid "Dump has been saved to file %s."
-msgstr "Схемата беше записана във файл %s."
+msgstr "Схемата беше запазена във файл %s."
 
 #: import.php:57
 #, php-format
@@ -1026,7 +1027,7 @@ msgid ""
 "Script timeout passed, if you want to finish import, please resubmit same "
 "file and import will resume."
 msgstr ""
-"Времето за изчакване на скрипта изтече. Ако искате да завършите импорта го "
+"Времето за изчакване на скрипта изтече, ако искате да завършите импорта го "
 "пуснете отново и той ще си продължи."
 
 #: import.php:424
@@ -1034,6 +1035,9 @@ msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
+"Въпреки това при последното изпълнение никакви данни не постъпиха, това "
+"обикновено означава, че phpMyAdmin няма да бъде в състояние да завърши този "
+"импорт, освен ако не бъдат увеличени времевите ограничения в PHP."
 
 #: import_status.php:30 libraries/common.lib.php:622
 #: libraries/schema/Export_Relation_Schema.class.php:203 user_password.php:109
@@ -1155,24 +1159,22 @@ msgid "Edit"
 msgstr "Редакция"
 
 #: js/messages.php:64 server_status.php:420
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Live traffic chart"
-msgstr "Избор на сървър"
+msgstr "Диаграма на трафик в реално време"
 
 #: js/messages.php:65 server_status.php:423
 msgid "Live conn./process chart"
-msgstr ""
+msgstr "Диаграма на връзки/процеси в реално време"
 
 #: js/messages.php:66 server_status.php:445
-#, fuzzy
 #| msgid "Hide query box"
 msgid "Live query chart"
-msgstr "Скриване формата за заявки"
+msgstr "Диаграма на заявки в реално време"
 
 #: js/messages.php:68
 msgid "Static data"
-msgstr ""
+msgstr "Статична информация"
 
 #. l10n: Total number of queries
 #: js/messages.php:70 libraries/build_html_for_db.lib.php:45
@@ -1185,7 +1187,7 @@ msgstr "Общо"
 #. l10n: Other, small valued, queries
 #: js/messages.php:72 server_status.php:602
 msgid "Other"
-msgstr ""
+msgstr "Друго"
 
 #. l10n: Thousands separator
 #: js/messages.php:74 libraries/common.lib.php:1322
@@ -1199,21 +1201,20 @@ msgstr "."
 
 #: js/messages.php:78
 msgid "KiB sent since last refresh"
-msgstr ""
+msgstr "KiB изпратени след последното опресняване"
 
 #: js/messages.php:79
 msgid "KiB received since last refresh"
-msgstr ""
+msgstr "KiB получени след последното опресняване"
 
 #: js/messages.php:80
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Server traffic (in KiB)"
-msgstr "Избор на сървър"
+msgstr "Сървър трафик (в KiB)"
 
 #: js/messages.php:81
 msgid "Connections since last refresh"
-msgstr ""
+msgstr "Връзки след последното опресняване"
 
 #: js/messages.php:82 server_status.php:794
 msgid "Processes"
@@ -1225,7 +1226,7 @@ msgstr "Конекции / Процеси"
 
 #: js/messages.php:84
 msgid "Issued queries since last refresh"
-msgstr ""
+msgstr "Изпратени заявки след последното опресняване"
 
 #: js/messages.php:85
 msgid "Issued queries"
@@ -1330,18 +1331,17 @@ msgstr "Изтриване"
 
 #: js/messages.php:124
 msgid "The definition of a stored function must contain a RETURN statement!"
-msgstr ""
+msgstr "Дефиницията на съхранена процедура трябва да съдържа израз RETURN!"
 
 #: js/messages.php:125
-#, fuzzy
 #| msgid "Missing value in the form!"
 msgid "Value too long in the form!"
-msgstr "Липсва стойност във полето на формата!"
+msgstr "Твърде дълга стойност!"
 
 #: js/messages.php:128
 msgid ""
 "Note: If the file contains multiple tables, they will be combined into one"
-msgstr "Заб.: Ако файлът съдържа няколко таблици, те ще бъдат обединени."
+msgstr "Заб.: Ако файлът съдържа няколко таблици, те ще бъдат обединени"
 
 #: js/messages.php:131
 msgid "Hide query box"
@@ -1393,7 +1393,7 @@ msgstr "Игнориране"
 
 #: js/messages.php:148
 msgid "Select referenced key"
-msgstr ""
+msgstr "Изберете посочвания ключ"
 
 #: js/messages.php:149
 msgid "Select Foreign Key"
@@ -1412,6 +1412,8 @@ msgid ""
 "You haven't saved the changes in the layout. They will be lost if you don't "
 "save them.Do you want to continue?"
 msgstr ""
+"Не сте записали промените в оформлението. Те ще бъдат загубени, ако не ги "
+"запазите. Искате ли да продължите?"
 
 #: js/messages.php:155
 msgid "Add an option for column "
@@ -1711,6 +1713,7 @@ msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form."
 msgstr ""
+"Изпратеният файл надхвърля директивата MAX_FILE_SIZE заложена във формата."
 
 #: libraries/File.class.php:285
 msgid "The uploaded file was only partially uploaded."
@@ -1722,7 +1725,7 @@ msgstr "Липсва временна папка."
 
 #: libraries/File.class.php:291
 msgid "Failed to write file to disk."
-msgstr "Запазването на файл на диска се провали."
+msgstr "Неуспешно записване на файл на диска."
 
 #: libraries/File.class.php:294
 msgid "File upload stopped by extension."
@@ -1737,12 +1740,12 @@ msgid ""
 "Error moving the uploaded file, see [a@./Documentation."
 "html#faq1_11@Documentation]FAQ 1.11[/a]"
 msgstr ""
-"Грешка при преместване на качения файл, вж. [a@./Documentation."
-"html#faq1_11@Documentation]ЧЗВ 1.11[/a]"
+"Грешка при преместване на качения файл, виж "
+"[a@./Documentation.html#faq1_11@Documentation]ЧЗВ 1.11[/a]"
 
 #: libraries/Index.class.php:417 tbl_relation.php:526
 msgid "No index defined!"
-msgstr "Не е дефиниран индекс!"
+msgstr "Не е избран индекс!"
 
 #: libraries/Index.class.php:422 libraries/build_html_for_db.lib.php:40
 #: tbl_tracking.php:309
@@ -1770,12 +1773,12 @@ msgstr "Коментар"
 
 #: libraries/Index.class.php:465
 msgid "The primary key has been dropped"
-msgstr "Главния ключ беше изтрит"
+msgstr "Главният ключ беше изтрит"
 
 #: libraries/Index.class.php:469
 #, php-format
 msgid "Index %s has been dropped"
-msgstr "Индекса %s беше изтрит"
+msgstr "Индекс %s беше изтрит"
 
 #: libraries/Index.class.php:567
 #, php-format
@@ -1821,10 +1824,9 @@ msgstr[0] "%1$d ред добавен."
 msgstr[1] "%1$d реда добавени."
 
 #: libraries/RecentTable.class.php:107
-#, fuzzy
 #| msgid "Could not save configuration"
 msgid "Could not save recent table"
-msgstr "Конфигурацията не може да бъде запазена"
+msgstr "Наскоро отваряната таблице не можа да бъде записана"
 
 #: libraries/RecentTable.class.php:142
 msgid "Recent tables"
@@ -1874,7 +1876,7 @@ msgstr "Таблица %s беше преименувана на %s"
 
 #: libraries/Table.class.php:1275
 msgid "Could not save table UI preferences"
-msgstr ""
+msgstr "Таблицата с визуалните настройки не може да бъде запазена"
 
 #: libraries/Theme.class.php:143
 #, php-format
@@ -1906,7 +1908,7 @@ msgstr "Не е открит път към тема %s!"
 
 #: libraries/Theme_Manager.class.php:286 themes.php:20 themes.php:40
 msgid "Theme"
-msgstr ""
+msgstr "Тема"
 
 #: libraries/auth/config.auth.lib.php:76
 msgid "Cannot connect: invalid settings."
@@ -1925,7 +1927,7 @@ msgid ""
 "1$ssetup script%2$s to create one."
 msgstr ""
 "Изглежда не се създали конфигурационен файл. Вероятно ще искате да "
-"използвате %1$sскрипта за настройки%2$s, за да го създадете"
+"използвате %1$sскрипта за настройки%2$s, за да го създадете."
 
 #: libraries/auth/config.auth.lib.php:115
 msgid ""
@@ -1979,7 +1981,7 @@ msgstr "Оттук нататък са необходими бисквитки."
 #: libraries/auth/signon.auth.lib.php:234
 msgid ""
 "Login without a password is forbidden by configuration (see AllowNoPassword)"
-msgstr "Входът без парола е забранен от конфигурацията (вж. AllowNoPassword)"
+msgstr "Входът без парола е забранен от конфигурацията (виж AllowNoPassword)"
 
 #: libraries/auth/cookie.auth.lib.php:568
 #: libraries/auth/signon.auth.lib.php:238
@@ -2009,7 +2011,7 @@ msgstr "Файлът %s не съдържа идентификатор на кл
 #: libraries/auth/swekey/swekey.auth.lib.php:157
 #: libraries/auth/swekey/swekey.auth.lib.php:180
 msgid "Hardware authentication failed"
-msgstr "Хардуерното удостоверяване провалено"
+msgstr "Неуспешно хардуерно удостоверяване"
 
 #: libraries/auth/swekey/swekey.auth.lib.php:166
 msgid "No valid authentication key plugged"
@@ -2033,7 +2035,7 @@ msgstr ""
 
 #: libraries/blobstreaming.lib.php:315
 msgid "get BLOB Content-Type failed"
-msgstr ""
+msgstr "неуспешно получаване на типа на BLOB"
 
 #: libraries/blobstreaming.lib.php:342
 msgid "View image"
@@ -2106,16 +2108,17 @@ msgid "Check Privileges"
 msgstr "Проверка на правата"
 
 #: libraries/common.inc.php:587
-#, fuzzy
 #| msgid "Failed to to read configuration file"
 msgid "Failed to read configuration file"
-msgstr "Конфигурацията не може да бъде прочетена"
+msgstr "Неуспешно прочитане на конфигурацията"
 
 #: libraries/common.inc.php:588
 msgid ""
 "This usually means there is a syntax error in it, please check any errors "
 "shown below."
 msgstr ""
+"Това обикновено означава, че има синтактична грешка в него, моля, проверете "
+"всички грешки, показани по-долу."
 
 #: libraries/common.inc.php:595
 #, php-format
@@ -2195,7 +2198,7 @@ msgstr "SQL заявка"
 
 #: libraries/common.lib.php:1031
 msgid "Failed to connect to SQL validator!"
-msgstr ""
+msgstr "Неуспешно свързване към SQL валидатора!"
 
 #: libraries/common.lib.php:1072 libraries/config/messages.inc.php:474
 msgid "Explain SQL"
@@ -2228,11 +2231,11 @@ msgstr "Валидиране на SQL"
 
 #: libraries/common.lib.php:1198
 msgid "Inline edit of this query"
-msgstr ""
+msgstr "Редакция на заявката на място"
 
 #: libraries/common.lib.php:1200
 msgid "Inline"
-msgstr ""
+msgstr "На място"
 
 #: libraries/common.lib.php:1262 sql.php:938
 msgid "Profiling"
@@ -2302,7 +2305,7 @@ msgstr "Показване БД &quot;%s&quot;."
 #: libraries/common.lib.php:2304
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
-msgstr "Функционалността %s се влияе от известен дефект, вж. %s"
+msgstr "Функционалността %s се влияе от известен дефект, виж %s"
 
 #: libraries/common.lib.php:2646 libraries/common.lib.php:2653
 #: libraries/common.lib.php:2840 libraries/config/setup.forms.php:296
@@ -2357,7 +2360,7 @@ msgstr "Няма файлве за качване"
 
 #: libraries/common.lib.php:2849 libraries/common.lib.php:2850
 msgid "Execute"
-msgstr ""
+msgstr "Изпълнение"
 
 #: libraries/config.values.php:45 libraries/config.values.php:47
 #: libraries/config.values.php:51
@@ -2366,7 +2369,7 @@ msgstr "И двете"
 
 #: libraries/config.values.php:47
 msgid "Nowhere"
-msgstr ""
+msgstr "Никъде"
 
 #: libraries/config.values.php:47
 msgid "Left"
@@ -2405,15 +2408,16 @@ msgstr "структура и данни"
 
 #: libraries/config.values.php:100
 msgid "Quick - display only the minimal options to configure"
-msgstr ""
+msgstr "Бързо - показване на минимум опции"
 
 #: libraries/config.values.php:101
 msgid "Custom - display all possible options to configure"
-msgstr ""
+msgstr "Потребителско - показване на всички опции"
 
 #: libraries/config.values.php:102
 msgid "Custom - like above, but without the quick/custom choice"
 msgstr ""
+"Потребителско - като горното, но без показване на избор бързо/потребителско"
 
 #: libraries/config.values.php:120
 msgid "complete inserts"
@@ -2528,7 +2532,7 @@ msgstr "Изчистване"
 
 #: libraries/config/messages.inc.php:17
 msgid "Improves efficiency of screen refresh"
-msgstr "Подобрява ефективността при презареждане на екрана"
+msgstr "Подобрява ефективността при оресняване на екрана"
 
 #: libraries/config/messages.inc.php:18
 msgid "Enable Ajax"
@@ -2538,6 +2542,8 @@ msgstr "Включване на Ajax"
 msgid ""
 "If enabled user can enter any MySQL server in login form for cookie auth"
 msgstr ""
+"Ако е включено потребитлят може да въведе MySQL сървър във формата за "
+"удостоверяване с бисквитка"
 
 #: libraries/config/messages.inc.php:20
 msgid "Allow login to any MySQL server"
@@ -2552,7 +2558,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:22
 msgid "Allow third party framing"
-msgstr ""
+msgstr "Позволяване на вграждане в трети сайтове"
 
 #: libraries/config/messages.inc.php:23
 msgid "Show &quot;Drop database&quot; link to normal users"
@@ -2563,6 +2569,8 @@ msgid ""
 "Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] "
 "authentication"
 msgstr ""
+"Тайна фраза, използвана за криптиране на бисквитките при [kbd]cookie[/kbd] "
+"удоствоверяване"
 
 #: libraries/config/messages.inc.php:25
 msgid "Blowfish secret"
@@ -2570,7 +2578,7 @@ msgstr "Тайна Blowfish фраза"
 
 #: libraries/config/messages.inc.php:26
 msgid "Highlight selected rows"
-msgstr "Изпъкване избрани редове"
+msgstr "Маркиране избраните редове"
 
 #: libraries/config/messages.inc.php:27
 msgid "Row marker"
@@ -2578,11 +2586,11 @@ msgstr "Маркер на ред"
 
 #: libraries/config/messages.inc.php:28
 msgid "Highlight row pointed by the mouse cursor"
-msgstr "Изпъкване редовете, посочени с мишка"
+msgstr "Маркиране редовете, посочени с мишка"
 
 #: libraries/config/messages.inc.php:29
 msgid "Highlight pointer"
-msgstr ""
+msgstr "Маркиране на показалеца"
 
 #: libraries/config/messages.inc.php:30
 msgid ""
@@ -2600,6 +2608,9 @@ msgid ""
 "columns; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/"
 "kbd] - allows newlines in columns"
 msgstr ""
+"Определя какъв вид полета за редакция да бъдат използвани за колони тип CHAR "
+"и VARCHAR:[kbd]input[/kbd] - позволява ограничаване по дължина, "
+"[kbd]textarea[/kbd] - позволява вмъкването на нови редове"
 
 #: libraries/config/messages.inc.php:33
 msgid "CHAR columns editing"
@@ -2723,10 +2734,9 @@ msgid ""
 msgstr ""
 
 #: libraries/config/messages.inc.php:61
-#, fuzzy
 #| msgid "Table maintenance"
 msgid "Disable multi table maintenance"
-msgstr "Поддръжка на таблицата"
+msgstr "Изключване на избора на множество таблици при поддръжката"
 
 #: libraries/config/messages.inc.php:62
 msgid "Edit SQL queries in popup window"
@@ -2885,7 +2895,7 @@ msgstr "Метод за експортиране"
 
 #: libraries/config/messages.inc.php:114 libraries/config/messages.inc.php:116
 msgid "Save on server"
-msgstr ""
+msgstr "Запазване на сървъра"
 
 #: libraries/config/messages.inc.php:115 libraries/config/messages.inc.php:117
 #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214
@@ -3215,7 +3225,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:216
 msgid "Customize links shown in SQL Query boxes"
-msgstr "Персонализиране на връзките показвани след изпълнение на заявка"
+msgstr "Персонализиране на връзките показвани след изпълнение на SQL заявка"
 
 #: libraries/config/messages.inc.php:219
 msgid "SQL queries settings"
@@ -3745,7 +3755,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:357
 msgid "Directory where exports can be saved on server"
-msgstr ""
+msgstr "Папка на сървъра, в която експортите да бъдат записвани"
 
 #: libraries/config/messages.inc.php:358
 msgid "Save directory"
@@ -4171,11 +4181,11 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:451
 msgid "Show password change form"
-msgstr ""
+msgstr "Показване на формуляр за смяна на парола"
 
 #: libraries/config/messages.inc.php:452
 msgid "Show create database form"
-msgstr ""
+msgstr "Показване на формуляр за създаване на БД"
 
 #: libraries/config/messages.inc.php:453
 msgid ""
@@ -4215,7 +4225,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:460
 msgid "Show phpinfo() link"
-msgstr ""
+msgstr "Показване на връзка към phpinfo()"
 
 #: libraries/config/messages.inc.php:461
 msgid "Show detailed MySQL server information"
@@ -4420,7 +4430,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:511
 msgid "Enables check for latest version on main phpMyAdmin page"
-msgstr "Позволява проверка за обновления на страницата на phpMyAdmin."
+msgstr "Позволява проверка за обновления на страницата на phpMyAdmin"
 
 #: libraries/config/messages.inc.php:512 setup/lib/index.lib.php:118
 #: setup/lib/index.lib.php:125 setup/lib/index.lib.php:142
@@ -4555,10 +4565,10 @@ msgid "The %s extension is missing. Please check your PHP configuration."
 msgstr ""
 
 #: libraries/db_events.inc.php:30
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export as %s"
 msgid "Export of event %s"
-msgstr "Експорт като %s"
+msgstr "Експорт на събитието %s"
 
 #: libraries/db_events.inc.php:34
 #, php-format
@@ -4566,10 +4576,10 @@ msgid "Export of event \"%s\""
 msgstr "Експорт на събитието \"%s\""
 
 #: libraries/db_events.inc.php:40
-#, fuzzy, php-format
+#, php-format
 #| msgid "No tables found in database"
 msgid "No event with name %s found in database %s"
-msgstr "В БД няма таблици"
+msgstr "Няма събитие с име %s в БД %s"
 
 #: libraries/db_events.inc.php:56 libraries/db_links.inc.php:101
 #: libraries/export/sql.php:609
@@ -4590,22 +4600,21 @@ msgstr "Име"
 
 #: libraries/db_events.inc.php:129
 msgid "The event scheduler is enabled"
-msgstr ""
+msgstr "Диспечер на събитията включен"
 
 #: libraries/db_events.inc.php:129
 msgid "The event scheduler is disabled"
-msgstr ""
+msgstr "Диспечер на събитията изключен"
 
 #: libraries/db_events.inc.php:131
 msgid "Turn it on"
-msgstr ""
+msgstr "Включване"
 
 #: libraries/db_events.inc.php:131
 msgid "Turn it off"
-msgstr ""
+msgstr "Изключване"
 
 #: libraries/db_events.inc.php:141
-#, fuzzy
 #| msgid "Add a new Event"
 msgid "Add an event"
 msgstr "Добавяне на събитие"
@@ -4613,20 +4622,20 @@ msgstr "Добавяне на събитие"
 #: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43
 #: libraries/db_links.inc.php:44
 msgid "Database seems to be empty!"
-msgstr ""
+msgstr "БД изглежда празна!"
 
 #: libraries/db_links.inc.php:66 libraries/relation.lib.php:140
 #: libraries/tbl_links.inc.php:97
 msgid "Tracking"
-msgstr ""
+msgstr "Проследяване"
 
 #: libraries/db_links.inc.php:71
 msgid "Query"
-msgstr "Зявка по пример"
+msgstr "Заявка по пример"
 
 #: libraries/db_links.inc.php:76 libraries/relation.lib.php:128
 msgid "Designer"
-msgstr ""
+msgstr "Строител"
 
 #: libraries/db_links.inc.php:93 libraries/server_links.inc.php:60
 #: server_privileges.php:119 server_privileges.php:1802
@@ -4636,22 +4645,21 @@ msgstr "Права"
 
 #: libraries/db_links.inc.php:97 libraries/db_routines.lib.php:1149
 msgid "Routines"
-msgstr ""
+msgstr "Процедури"
 
 #: libraries/db_links.inc.php:105 libraries/display_triggers.inc.php:62
 #: libraries/export/sql.php:987 libraries/export/xml.php:38
 msgid "Triggers"
-msgstr ""
+msgstr "Тригери"
 
 #: libraries/db_routines.lib.php:630
 msgid "Details"
 msgstr "Подробности"
 
 #: libraries/db_routines.lib.php:633
-#, fuzzy
 #| msgid "Column names"
 msgid "Routine name"
-msgstr "Име на колона"
+msgstr "Име на процедура"
 
 #: libraries/db_routines.lib.php:650
 #, php-format
@@ -4660,7 +4668,7 @@ msgstr "Промяна на %s"
 
 #: libraries/db_routines.lib.php:655
 msgid "Parameters"
-msgstr ""
+msgstr "Параметри"
 
 #: libraries/db_routines.lib.php:660
 msgid "Direction"
@@ -4690,32 +4698,28 @@ msgstr "Настройки"
 
 #: libraries/db_routines.lib.php:678
 msgid "Add parameter"
-msgstr ""
+msgstr "Добавяне на параметър"
 
 #: libraries/db_routines.lib.php:681
-#, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
-msgstr "Изтриване БД"
+msgstr "Изтриване на последен параметър"
 
 #: libraries/db_routines.lib.php:686 libraries/db_routines.lib.php:1159
 msgid "Return type"
-msgstr ""
+msgstr "Тип връщани данни"
 
 #: libraries/db_routines.lib.php:692
-#, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
-msgstr "Дължина/Стойности"
+msgstr ""
 
 #: libraries/db_routines.lib.php:697
-#, fuzzy
 #| msgid "Table options"
 msgid "Return options"
-msgstr "Опции на таблицата"
+msgstr ""
 
 #: libraries/db_routines.lib.php:716
-#, fuzzy
 #| msgid "Description"
 msgid "Definition"
 msgstr "Описание"
@@ -4729,10 +4733,9 @@ msgid "Definer"
 msgstr ""
 
 #: libraries/db_routines.lib.php:729
-#, fuzzy
 #| msgid "Security"
 msgid "Security type"
-msgstr "Сигурност"
+msgstr "Тип на сигурност"
 
 #: libraries/db_routines.lib.php:736
 msgid "SQL data access"
@@ -4740,7 +4743,7 @@ msgstr ""
 
 #: libraries/db_routines.lib.php:800 libraries/db_routines.lib.php:803
 msgid "Routine parameters"
-msgstr ""
+msgstr "Параметри на процедурата"
 
 #: libraries/db_routines.lib.php:810 tbl_change.php:284 tbl_change.php:322
 msgid "Function"
@@ -4755,12 +4758,12 @@ msgstr "Стойност"
 
 #: libraries/db_routines.lib.php:916
 msgid "You must provide a routine name"
-msgstr ""
+msgstr "Трябва да дадете име на процедурата"
 
 #: libraries/db_routines.lib.php:935
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
-msgstr ""
+msgstr "Невалидна посока \"%s\" подадена като параметър."
 
 #: libraries/db_routines.lib.php:946 libraries/db_routines.lib.php:987
 msgid ""
@@ -4770,29 +4773,26 @@ msgstr ""
 
 #: libraries/db_routines.lib.php:971
 msgid "You must provide a name and a type for each routine parameter."
-msgstr ""
+msgstr "Трябва да дадете име и тип за всеки параметър на процедурата."
 
 #: libraries/db_routines.lib.php:1028
 msgid "You must provide a routine definition."
-msgstr ""
+msgstr "Трябва да дадете дефиниция на процедурата."
 
 #: libraries/db_routines.lib.php:1151
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no routines to display."
-msgstr "Няма файлве за качване"
+msgstr "Няма процедури."
 
 #: libraries/db_routines.lib.php:1192
-#, fuzzy
 #| msgid "Add index"
 msgid "Add routine"
-msgstr "Добавяне на индекс"
+msgstr "Добавяне на процедура"
 
 #: libraries/db_routines.lib.php:1195
-#, fuzzy
 #| msgid "You don't have sufficient privileges to be here right now!"
 msgid "You do not have the necessary privileges to create a new routine"
-msgstr "Не разполагате с права, за да се намирате тук!"
+msgstr "Не разполагате с права, за да създавате процедури"
 
 #: libraries/db_structure.lib.php:43 libraries/display_tbl.lib.php:2084
 msgid ""
@@ -4850,7 +4850,7 @@ msgstr "Създаване БД"
 
 #: libraries/display_create_database.lib.php:33
 msgid "Create"
-msgstr "Създай"
+msgstr "Създаване"
 
 #: libraries/display_create_database.lib.php:43 server_privileges.php:121
 #: server_privileges.php:1493 server_replication.php:33
@@ -4874,7 +4874,7 @@ msgstr ""
 
 #: libraries/display_export.lib.php:80
 msgid "Exporting databases from the current server"
-msgstr ""
+msgstr "Експорт на БД от текущия сървър"
 
 #: libraries/display_export.lib.php:82
 #, php-format
@@ -4892,11 +4892,11 @@ msgstr "Тип на експортирането:"
 
 #: libraries/display_export.lib.php:106
 msgid "Quick - display only the minimal options"
-msgstr ""
+msgstr "Бързо - показване на минимум опции"
 
 #: libraries/display_export.lib.php:122
 msgid "Custom - display all possible options"
-msgstr ""
+msgstr "Потребителско - показване на всички опции"
 
 #: libraries/display_export.lib.php:130
 msgid "Database(s):"
@@ -5098,20 +5098,18 @@ msgid "Language"
 msgstr "Език"
 
 #: libraries/display_tbl.lib.php:397
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Restore column order"
-msgstr "Колони в текство поле"
+msgstr ""
 
 #: libraries/display_tbl.lib.php:417
 msgid "Drag to reorder"
 msgstr ""
 
 #: libraries/display_tbl.lib.php:418
-#, fuzzy
 #| msgid "Click to select"
 msgid "Click to sort"
-msgstr "Щракване за избор"
+msgstr "Щракване за сортиране"
 
 #: libraries/display_tbl.lib.php:419
 msgid "Click to mark/unmark"
@@ -5266,27 +5264,26 @@ msgid "Link not found"
 msgstr "Връзките не са намерени"
 
 #: libraries/display_triggers.inc.php:35
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export as %s"
 msgid "Export of trigger %s"
-msgstr "Експорт като %s"
+msgstr "Експорт на тригер %s"
 
 #: libraries/display_triggers.inc.php:39
 #, php-format
 msgid "Export of trigger \"%s\""
-msgstr ""
+msgstr "Експорт на тригер \"%s\""
 
 #: libraries/display_triggers.inc.php:47
-#, fuzzy, php-format
+#, php-format
 #| msgid "No valid image path for theme %s found!"
 msgid "No trigger with name %s found"
-msgstr "Не открито изображение към тема %s!"
+msgstr "Не открит тригер %s"
 
 #: libraries/display_triggers.inc.php:64 libraries/display_triggers.inc.php:66
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no triggers to display."
-msgstr "Няма файлве за качване"
+msgstr "Няма тригери."
 
 #: libraries/display_triggers.inc.php:77 server_status.php:800 sql.php:943
 msgid "Time"
@@ -5297,10 +5294,9 @@ msgid "Event"
 msgstr "Действие"
 
 #: libraries/display_triggers.inc.php:120
-#, fuzzy
 #| msgid "Add a new server"
 msgid "Add a trigger"
-msgstr "Добавяне на нов сървър"
+msgstr "Добавяне на тригер"
 
 #: libraries/engines/bdb.lib.php:20 main.php:211
 msgid "Version information"
@@ -5973,10 +5969,9 @@ msgid "Open new phpMyAdmin window"
 msgstr "Отваряне на нов прозорец с phpMyAdmin"
 
 #: libraries/gis_visualization.lib.php:129
-#, fuzzy
 #| msgid "No data found for the chart."
 msgid "No data found for GIS visualization."
-msgstr "Няма намерени данни за диаграмата."
+msgstr ""
 
 #: libraries/header_printview.inc.php:49 libraries/header_printview.inc.php:54
 msgid "SQL result"
@@ -6580,7 +6575,7 @@ msgstr "Име на страница"
 
 #: libraries/schema/User_Schema.class.php:99
 msgid "Automatic layout based on"
-msgstr ""
+msgstr "Автоматично оформление базирано на"
 
 #: libraries/schema/User_Schema.class.php:102
 msgid "Internal relations"
@@ -6966,10 +6961,9 @@ msgid "PARTITION definition"
 msgstr ""
 
 #: libraries/tbl_properties.inc.php:776
-#, fuzzy
 #| msgid "+ Add a new value"
 msgid "+ Add a value"
-msgstr "+ Добавяне на нова стойност"
+msgstr "+ Добавяне на стойност"
 
 #: libraries/transformations/application_octetstream__download.inc.php:9
 msgid ""
@@ -7093,7 +7087,7 @@ msgstr "Управление мои настройки"
 
 #: libraries/user_preferences.inc.php:47 prefs_manage.php:291
 msgid "Configuration has been saved"
-msgstr "Конфигурацията е запазена"
+msgstr "Конфигурацията е записана"
 
 #: libraries/user_preferences.inc.php:68
 #, php-format
@@ -7231,7 +7225,7 @@ msgstr ""
 
 #: main.php:282
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
-msgstr "Конфигурационния файл има нужда от тайна парола (blowfish_secret)."
+msgstr "Конфигурационният файл има нужда от тайна фраза (blowfish_secret)."
 
 #: main.php:290
 msgid ""
@@ -7416,7 +7410,7 @@ msgstr "Страница беше създадена"
 
 #: pmd_pdf.php:37
 msgid "Page creation failed"
-msgstr ""
+msgstr "Неуспешно създаване на страница"
 
 #: pmd_pdf.php:89
 msgid "Page"
@@ -7472,7 +7466,7 @@ msgstr ""
 
 #: pmd_save_pos.php:52
 msgid "Modifications have been saved"
-msgstr "Промените бяха съхранени"
+msgstr "Промените бяха запазени"
 
 #: prefs_forms.php:78
 msgid "Cannot save settings, submitted form contains errors"
@@ -7492,7 +7486,7 @@ msgstr ""
 
 #: prefs_manage.php:225 prefs_manage.php:251
 msgid "Saved on: @DATE@"
-msgstr ""
+msgstr "Записан на: @DATE@"
 
 #: prefs_manage.php:239
 msgid "Import from file"
@@ -7508,7 +7502,7 @@ msgstr "Настройки ще бъдат импортирани от лока
 
 #: prefs_manage.php:254
 msgid "You have no saved settings!"
-msgstr ""
+msgstr "Нямате запазени настройки!"
 
 #: prefs_manage.php:258 prefs_manage.php:312
 msgid "This feature is not supported by your web browser"
@@ -7533,7 +7527,7 @@ msgstr "Запис в хранилището на браузъра"
 
 #: prefs_manage.php:306
 msgid "Settings will be saved in your browser's local storage."
-msgstr ""
+msgstr "Настройките ще бъдат запазени в хранилището на вашия браузър"
 
 #: prefs_manage.php:308
 msgid "Existing settings will be overwritten!"
@@ -7711,7 +7705,7 @@ msgstr ""
 #: server_privileges.php:45 server_privileges.php:220
 #: server_privileges.php:536
 msgid "Allows executing stored routines."
-msgstr "Позволява стартиране на съхранени процедури."
+msgstr "Позволява изпълнение на съхранени процедури."
 
 #: server_privileges.php:46 server_privileges.php:199
 #: server_privileges.php:523
@@ -7728,7 +7722,7 @@ msgstr ""
 #: server_privileges.php:48 server_privileges.php:201
 #: server_privileges.php:530
 msgid "Allows creating and dropping indexes."
-msgstr "Позволява създаване и премахване на индекси."
+msgstr "Позволява създаване и изтриване на индекси."
 
 #: server_privileges.php:49 server_privileges.php:191
 #: server_privileges.php:454 server_privileges.php:518
@@ -7830,7 +7824,7 @@ msgstr ""
 #: server_privileges.php:65 server_privileges.php:211
 #: server_privileges.php:549
 msgid "Allows creating and dropping triggers"
-msgstr "Позволява създаване и премахване на тригери"
+msgstr "Позволява създаване и изтриване на тригери"
 
 #: server_privileges.php:66 server_privileges.php:192
 #: server_privileges.php:457 server_privileges.php:519
@@ -7967,8 +7961,7 @@ msgstr "Отмяна на всички права на потребителит
 #: server_privileges.php:1688 server_privileges.php:1689
 #: server_privileges.php:1690
 msgid "Drop the databases that have the same names as the users."
-msgstr ""
-"Изтриване на базите от данни които имат имена като тези на потребителите."
+msgstr "Изтриване на БД, които имат имена като тези на потребителите."
 
 #: server_privileges.php:1711
 #, php-format
@@ -8236,26 +8229,25 @@ msgid ""
 msgstr ""
 
 #: server_status.php:27
-#, fuzzy
 #| msgid "Refresh"
 msgid "Refresh rate"
-msgstr "Презареждане"
+msgstr "Скорост на опресняване"
 
 #: server_status.php:31
-#, fuzzy, php-format
+#, php-format
 #| msgid "Minute"
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "минута"
-msgstr[1] "минута"
+msgstr[0] "%d минута"
+msgstr[1] "%d минути"
 
 #: server_status.php:33
-#, fuzzy, php-format
+#, php-format
 #| msgid "Second"
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "секунда"
-msgstr[1] "секунда"
+msgstr[0] "%d секунда"
+msgstr[1] "%d секунди"
 
 #: server_status.php:134
 #, php-format
@@ -8329,42 +8321,37 @@ msgid "Runtime Information"
 msgstr "Информация за състоянието на MySQL сървъра"
 
 #: server_status.php:401
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Server traffic"
-msgstr "Избор на сървър"
+msgstr "Трафик сървър"
 
 #: server_status.php:403
 msgid "All status variables"
 msgstr ""
 
 #: server_status.php:413 server_status.php:439
-#, fuzzy
 #| msgid "Refresh"
 msgid "Refresh rate:"
-msgstr "Презареждане"
+msgstr "Скорост на опресняване:"
 
 #: server_status.php:462
-#, fuzzy
 #| msgid "Do not change the password"
 msgid "Containing the word:"
-msgstr "Да не се сменя паролата"
+msgstr "Съдържащ думата:"
 
 #: server_status.php:467
-#, fuzzy
 #| msgid "Show open tables"
 msgid "Show only alert values"
-msgstr "Показване на отворените теблици"
+msgstr ""
 
 #: server_status.php:471
 msgid "Filter by category..."
 msgstr ""
 
 #: server_status.php:484
-#, fuzzy
 #| msgid "Relations"
 msgid "Related links:"
-msgstr "Релации"
+msgstr ""
 
 #: server_status.php:528 server_status.php:563 server_status.php:676
 #: server_status.php:721
@@ -8386,7 +8373,7 @@ msgstr "Тип на заявката"
 #. l10n: # = Amount of queries
 #: server_status.php:561
 msgid "#"
-msgstr ""
+msgstr "№"
 
 #: server_status.php:625
 #, php-format
@@ -8450,7 +8437,7 @@ msgstr "максимален брой на едновременните коне
 
 #: server_status.php:734
 msgid "Failed attempts"
-msgstr "Провалили се опити"
+msgstr "Неуспешни опити"
 
 #: server_status.php:748
 msgid "Aborted"
@@ -8461,12 +8448,9 @@ msgid "ID"
 msgstr "ID"
 
 #: server_status.php:856
-#, fuzzy
 #| msgid "Limits the number of simultaneous connections the user may have."
 msgid "The number of failed attempts to connect to the MySQL server."
-msgstr ""
-"Ограничава броя на едновременните връзки, които потребителят може да държи "
-"отворени."
+msgstr "Броят неуспешни опити за връзка към MySQL сървъра."
 
 #: server_status.php:857
 msgid ""
@@ -9121,7 +9105,7 @@ msgstr ""
 
 #: server_variables.php:58
 msgid "Setting variable failed"
-msgstr ""
+msgstr "Неуспешно създаване на променлива"
 
 #: server_variables.php:77
 msgid "Server variables and settings"
@@ -9267,6 +9251,8 @@ msgid ""
 "Reading of version failed. Maybe you're offline or the upgrade server does "
 "not respond."
 msgstr ""
+"Неуспешно получаване на версията. Вероятно сте offline или сървърът за "
+"обновления не отговаря."
 
 #: setup/lib/index.lib.php:143
 msgid "Got invalid version string from server"
@@ -9525,50 +9511,43 @@ msgid "Stacked"
 msgstr ""
 
 #: tbl_chart.php:94
-#, fuzzy
 #| msgid "Report title:"
 msgid "Chart title"
-msgstr "Заглавие на доклада:"
+msgstr "Заглавие на диаграмата"
 
 #: tbl_chart.php:99
 msgid "X-Axis:"
 msgstr ""
 
 #: tbl_chart.php:113
-#, fuzzy
 #| msgid "SQL queries"
 msgid "Series:"
-msgstr "SQL заявки"
+msgstr ""
 
 #: tbl_chart.php:115
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "The remaining columns"
-msgstr "Колони в текство поле"
+msgstr "Оставащите колони"
 
 #: tbl_chart.php:128
-#, fuzzy
 #| msgid "X Axis label"
 msgid "X-Axis label:"
-msgstr "Етикет на X оста"
+msgstr "Етикет на оста X:"
 
 #: tbl_chart.php:128
-#, fuzzy
 #| msgid "Value"
 msgid "X Values"
-msgstr "Стойност"
+msgstr "Стойности на X"
 
 #: tbl_chart.php:129
-#, fuzzy
 #| msgid "Y Axis label"
 msgid "Y-Axis label:"
-msgstr "Етикет на Y оста"
+msgstr "Етикет на оста Y:"
 
 #: tbl_chart.php:129
-#, fuzzy
 #| msgid "Value"
 msgid "Y Values"
-msgstr "Стойност"
+msgstr "Стойности на Y"
 
 #: tbl_create.php:30
 #, php-format
@@ -9597,22 +9576,19 @@ msgid "Height"
 msgstr "Височина"
 
 #: tbl_gis_visualization.php:165
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Label column"
-msgstr "Колони в текство поле"
+msgstr "Етикет на колона"
 
 #: tbl_gis_visualization.php:167
-#, fuzzy
 #| msgid "- none -"
 msgid "-- None --"
-msgstr "- никой -"
+msgstr "-- без --"
 
 #: tbl_gis_visualization.php:180
-#, fuzzy
 #| msgid "Total"
 msgid "Spatial column"
-msgstr "Общо"
+msgstr ""
 
 #: tbl_gis_visualization.php:201
 msgid "Use OpenStreetMaps as Base Layer"
@@ -9623,16 +9599,14 @@ msgid "Redraw"
 msgstr ""
 
 #: tbl_gis_visualization.php:206
-#, fuzzy
 #| msgid "Save as file"
 msgid "Save to file"
-msgstr "Изпращане"
+msgstr "Запис във файл"
 
 #: tbl_gis_visualization.php:207
-#, fuzzy
 #| msgid "Table name"
 msgid "File name"
-msgstr "Име на таблица"
+msgstr "Име на файл"
 
 #: tbl_indexes.php:66
 msgid "The name of the primary key must be \"PRIMARY\"!"
@@ -9894,14 +9868,13 @@ msgid "Add unique index"
 msgstr "Добавяне на уникален ключ"
 
 #: tbl_structure.php:176 tbl_structure.php:177
-#, fuzzy
 #| msgid "Add index"
 msgid "Add SPATIAL index"
-msgstr "Добавяне на индекс"
+msgstr "Добавяне на SPATIAL индекс"
 
 #: tbl_structure.php:178 tbl_structure.php:179
 msgid "Add FULLTEXT index"
-msgstr "Добавяне на пълнотекстов индекс"
+msgstr "Добавяне на FULLTEXT индекс"
 
 #: tbl_structure.php:391
 msgctxt "None for default"
diff --git a/po/br.po b/po/br.po
index 2e6dcd3507..8b7497d35f 100644
--- a/po/br.po
+++ b/po/br.po
@@ -8,7 +8,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-03 07:35-0400\n"
-"PO-Revision-Date: 2011-06-29 20:12+0200\n"
+"PO-Revision-Date: 2011-07-02 22:10+0200\n"
 "Last-Translator:  <fulup.jakez@ofis-bzh.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -2411,139 +2411,142 @@ msgstr "Prim - na ziskouez nemet nebeudik-tre a zibarzhioù da gefluniañ"
 
 #: libraries/config.values.php:101
 msgid "Custom - display all possible options to configure"
-msgstr ""
+msgstr "Personelaet - diskouez an holl zibarzhioù kefluniañ posupl"
 
 #: libraries/config.values.php:102
 msgid "Custom - like above, but without the quick/custom choice"
-msgstr ""
+msgstr "Personelaet - evel a-us nemet hep an dibaboù prim/personelaet"
 
 #: libraries/config.values.php:120
 msgid "complete inserts"
-msgstr ""
+msgstr "Ensoc'hadennoù sevenet"
 
 #: libraries/config.values.php:121
 msgid "extended inserts"
-msgstr ""
+msgstr "Ensoc'hadennoù astennet"
 
 #: libraries/config.values.php:122
 msgid "both of the above"
-msgstr ""
+msgstr "Kement dibab zo a-us"
 
 #: libraries/config.values.php:123
 msgid "neither of the above"
-msgstr ""
+msgstr "Dibab ebet a-zouez ar re zo a-us"
 
 #: libraries/config/FormDisplay.class.php:83
 #: libraries/config/validate.lib.php:412
 msgid "Not a positive number"
-msgstr ""
+msgstr "N'eo ket un niver pozitivel"
 
 #: libraries/config/FormDisplay.class.php:84
 #: libraries/config/validate.lib.php:424
 msgid "Not a non-negative number"
-msgstr ""
+msgstr "N'eo ket un niver annegativel"
 
 #: libraries/config/FormDisplay.class.php:85
 #: libraries/config/validate.lib.php:400
 msgid "Not a valid port number"
-msgstr ""
+msgstr "Niverenn borzh direizh"
 
 #: libraries/config/FormDisplay.class.php:86
 #: libraries/config/FormDisplay.class.php:535
 #: libraries/config/validate.lib.php:352 libraries/config/validate.lib.php:439
 msgid "Incorrect value"
-msgstr ""
+msgstr "Talvoud direizh"
 
 #: libraries/config/FormDisplay.class.php:87
 #: libraries/config/validate.lib.php:453
 #, php-format
 msgid "Value must be equal or lower than %s"
-msgstr ""
+msgstr "Rankout a ra an talvoud bezañ par da pe bihanoc'h eget %s"
 
 #: libraries/config/FormDisplay.class.php:499
 #, php-format
 msgid "Missing data for %s"
-msgstr ""
+msgstr "Roadennoù a vank evit %s"
 
 #: libraries/config/FormDisplay.class.php:696
 #: libraries/config/FormDisplay.class.php:700
 msgid "unavailable"
-msgstr ""
+msgstr "N'eo ket hegerz"
 
 #: libraries/config/FormDisplay.class.php:697
 #: libraries/config/FormDisplay.class.php:701
 #, php-format
 msgid "\"%s\" requires %s extension"
-msgstr ""
+msgstr "\"%s\" zo rekis dezhañ an astenn %s"
 
 #: libraries/config/FormDisplay.class.php:715
 #, php-format
 msgid "import will not work, missing function (%s)"
-msgstr ""
+msgstr "Ne'z aio ket an enporzhiañ en-dro, un arc'hwel a vank (%s)"
 
 #: libraries/config/FormDisplay.class.php:719
 #, php-format
 msgid "export will not work, missing function (%s)"
-msgstr ""
+msgstr "Ne'z aio ket an ezporzhiañ en-dro, un arc'hwel a vank (%s)"
 
 #: libraries/config/FormDisplay.class.php:726
 msgid "SQL Validator is disabled"
-msgstr ""
+msgstr "Diweredekaet eo kadarnataer SQL"
 
 #: libraries/config/FormDisplay.class.php:733
 msgid "SOAP extension not found"
-msgstr ""
+msgstr "N'eo ket bet kavet an astenn SOAP"
 
 #: libraries/config/FormDisplay.class.php:741
 #, php-format
 msgid "maximum %s"
-msgstr ""
+msgstr "%s d'ar muiañ"
 
 #: libraries/config/FormDisplay.tpl.php:167
 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:167 libraries/relation.lib.php:78
 #: libraries/relation.lib.php:85 pmd_relation_new.php:68
 msgid "Disabled"
-msgstr ""
+msgstr "Diweredekaet"
 
 #: libraries/config/FormDisplay.tpl.php:242
 #, php-format
 msgid "Set value: %s"
-msgstr ""
+msgstr "Lakaat an talvoud da %s"
 
 #: libraries/config/FormDisplay.tpl.php:247
 #: libraries/config/messages.inc.php:356
 msgid "Restore default value"
-msgstr ""
+msgstr "Adlakaat an talvoud dre ziouer"
 
 #: libraries/config/FormDisplay.tpl.php:263
 msgid "Allow users to customize this value"
-msgstr ""
+msgstr "Aotren an implijerien da bersonelaat an talvoud-mañ"
 
 #: libraries/config/FormDisplay.tpl.php:324
 #: libraries/schema/User_Schema.class.php:466 prefs_manage.php:320
 #: prefs_manage.php:325 tbl_change.php:1025
 msgid "Reset"
-msgstr ""
+msgstr "Adderaouekaat"
 
 #: libraries/config/messages.inc.php:17
 msgid "Improves efficiency of screen refresh"
-msgstr ""
+msgstr "Gwellaat a ra efeduster ar freskaat skrammoù"
 
 #: libraries/config/messages.inc.php:18
 msgid "Enable Ajax"
-msgstr ""
+msgstr "Gweredekaat Ajax"
 
 #: libraries/config/messages.inc.php:19
 msgid ""
 "If enabled user can enter any MySQL server in login form for cookie auth"
 msgstr ""
+"Ma c'hall an implijer aotreet monet e ne vern pe servijer MySQL er furmskrid "
+"kevreañ evit ar gwiriekaat dre doupinoù"
 
 #: libraries/config/messages.inc.php:20
 msgid "Allow login to any MySQL server"
-msgstr ""
+msgstr "Aotren kevreañ ouzh ne vern pe servijer MySQL"
 
 #: libraries/config/messages.inc.php:21
 msgid ""
diff --git a/po/da.po b/po/da.po
index b391bb5d9e..cdfe5affb1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-03 07:35-0400\n"
-"PO-Revision-Date: 2011-03-07 01:17+0200\n"
-"Last-Translator: <hjortholm@gmail.com>\n"
+"PO-Revision-Date: 2011-07-04 10:57+0200\n"
+"Last-Translator:  <thomas@dyhr.com>\n"
 "Language-Team: danish <da@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -504,17 +504,17 @@ msgid "Your SQL query has been executed successfully"
 msgstr "Din SQL-forespørgsel blev udført korrekt"
 
 #: db_routines.php:157
-#, php-format
+#, php-format, fuzzy
 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] ""
+msgstr[0] "række påvirket af den sidste SQL-sætning inde i proceduren"
+msgstr[1] "rækker påvirket af den sidste SQL-sætning inde i proceduren"
 
 #: db_routines.php:167
-#, fuzzy, php-format
+#, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
-msgstr "Tillader udførelse af gemte rutiner."
+msgstr "Udførelsesresultater af rutine %s"
 
 #: db_routines.php:187 libraries/import.lib.php:152 sql.php:685
 #: tbl_change.php:180 tbl_get_field.php:34
@@ -525,7 +525,7 @@ msgstr "MySQL returnerede ingen data (fx ingen rækker)."
 #: db_routines.php:326
 #, php-format
 msgid "The following query has failed: \"%s\""
-msgstr ""
+msgstr "Den følgende SQL-forespørgsel fejlede: \"%s\""
 
 #: db_routines.php:193 db_routines.php:298 db_routines.php:303
 #: db_routines.php:313 db_routines.php:327 libraries/common.lib.php:581
@@ -534,27 +534,26 @@ msgstr "MySQL returnerede: "
 
 #: db_routines.php:210 db_routines.php:242 db_routines.php:270
 #: db_routines.php:409
-#, fuzzy
 #| msgid "Error in Processing Request"
 msgid "Error in processing request"
-msgstr "Felj i udførsel af forespørgsel"
+msgstr "Fejl i udførsel af forespørgsel"
 
 #: db_routines.php:211 db_routines.php:243 db_routines.php:271
 #: db_routines.php:410
-#, fuzzy, php-format
+#, php-format
 #| msgid "No tables found in database"
 msgid "No routine with name %1$s found in database %2$s"
-msgstr "Ingen tabeller fundet i databasen"
+msgstr "Ingen rutine med navnet %1$s fundet i databasen %2$s"
 
 #: db_routines.php:232 db_routines.php:236
 msgid "Execute routine"
-msgstr ""
+msgstr "Udfør rutine"
 
 #: db_routines.php:261 db_routines.php:265
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export defaults"
 msgid "Export of routine %s"
-msgstr "Standardindstillinger for eksport"
+msgstr "Eksport af rutine %s"
 
 #: db_routines.php:290 libraries/db_routines.lib.php:911
 #, fuzzy, php-format
@@ -584,19 +583,17 @@ msgstr "Database %1$s er oprettet,"
 
 #: db_routines.php:337
 msgid "<b>One or more errors have occured while processing your request:</b>"
-msgstr ""
+msgstr "<b>Der er opstået fejl under behandling af anmodningen:</b>"
 
 #: db_routines.php:381
-#, fuzzy
 #| msgid "Create relation"
 msgid "Create routine"
-msgstr "Opret relation"
+msgstr "Opret rutine"
 
 #: db_routines.php:385
-#, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
-msgstr "Redigeringstilstand"
+msgstr "Rediger rutine"
 
 #: db_routines.php:436
 msgid ""
@@ -604,17 +601,21 @@ msgid ""
 "handling multi queries. <b>The execution of some stored routines may fail!</"
 "b> Please use the improved 'mysqli' extension to avoid any problems."
 msgstr ""
+"Du bruger en forældet PHP 'mysql' udvidelse, som ikke er i stand til at "
+"håndtere multi forespørgsler. <b> Eksekveringen af ​​nogle lagrede rutiner "
+"kan mislykkes! </ b> Brug den forbedrede 'MySQLi \"udvidelse for at undgå "
+"eventuelle problemer."
 
 #: db_search.php:30 libraries/auth/config.auth.lib.php:83
 #: libraries/auth/config.auth.lib.php:102
 #: libraries/auth/cookie.auth.lib.php:566 libraries/auth/http.auth.lib.php:51
 #: libraries/auth/signon.auth.lib.php:236
 msgid "Access denied"
-msgstr "Adgang Nægtet"
+msgstr "Adgang nægtet"
 
 #: db_search.php:42 db_search.php:284
 msgid "at least one of the words"
-msgstr "mindst et af ordene"
+msgstr "mindst ét ​​af ordene"
 
 #: db_search.php:43 db_search.php:285
 msgid "all words"
@@ -649,7 +650,7 @@ msgstr "Vis"
 #: db_search.php:236
 #, php-format
 msgid "Delete the matches for the %s table?"
-msgstr "Slet match for %s tabellen"
+msgstr "Slet match for %s tabellen?"
 
 #: db_search.php:236 libraries/display_tbl.lib.php:1338
 #: libraries/display_tbl.lib.php:2314
@@ -675,10 +676,9 @@ msgid "Search in database"
 msgstr "Søg i databasen"
 
 #: db_search.php:275
-#, fuzzy
 #| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):"
 msgid "Words or values to search for (wildcard: \"%\"):"
-msgstr "Ord eller værdi(er) (jokertegn: \"%\"):"
+msgstr "Ord eller værdier til at søge efter (jokertegn: \"%\"):"
 
 #: db_search.php:280
 msgid "Find:"
@@ -926,11 +926,11 @@ msgstr "Indtast hver værdi i et seperat felt."
 
 #: enum_editor.php:57
 msgid "+ Restart insertion and add a new value"
-msgstr ""
+msgstr "+ Genstart indsættelse og tilføj ny værdi"
 
 #: enum_editor.php:67
 msgid "Output"
-msgstr ""
+msgstr "Output"
 
 #: enum_editor.php:68
 msgid "Copy and paste the joined values into the \"Length/Values\" field"
@@ -943,7 +943,7 @@ msgstr "Valgte eksporttype skal gemmes som fil!"
 #: export.php:164 export.php:189 export.php:671
 #, php-format
 msgid "Insufficient space to save the file %s."
-msgstr "Utilstrækkeligt plads til at gemme filen %s."
+msgstr "Utilstrækkelig plads til at gemme filen %s."
 
 #: export.php:307
 #, php-format
@@ -10511,44 +10511,46 @@ msgid "After %s"
 msgstr "Efter %s"
 
 #: tbl_structure.php:732
-#, fuzzy, php-format
+#, php-format
 #| msgid "Create an index on&nbsp;%s&nbsp;columns"
 msgid "Create an index on &nbsp;%s&nbsp;columns"
-msgstr "Dan et indeks på&nbsp;%s&nbsp;kolonner"
+msgstr "Opret et indeks på &nbsp;%s&nbsp; kolonner"
 
 #: tbl_structure.php:893
 msgid "partitioned"
-msgstr ""
+msgstr "partitioneret"
 
 #: tbl_tracking.php:109
 #, php-format
 msgid "Tracking report for table `%s`"
-msgstr ""
+msgstr "Sporings rapport for tabel `% s`"
 
 #: tbl_tracking.php:182
 #, php-format
 msgid "Version %s is created, tracking for %s.%s is activated."
-msgstr ""
+msgstr "Version %s er oprettet, sporing for %s.%s er aktiveret."
 
 #: tbl_tracking.php:190
 #, php-format
 msgid "Tracking for %s.%s , version %s is deactivated."
-msgstr ""
+msgstr "Sporing for %s.%s, version %s er deaktiveret."
 
 #: tbl_tracking.php:198
 #, php-format
 msgid "Tracking for %s.%s , version %s is activated."
-msgstr ""
+msgstr "Sporing for %s.%s, version %s er aktiveret."
 
 #: tbl_tracking.php:208
 msgid "SQL statements executed."
-msgstr ""
+msgstr "SQL-sætninger udført."
 
 #: tbl_tracking.php:214
 msgid ""
 "You can execute the dump by creating and using a temporary database. Please "
 "ensure that you have the privileges to do so."
 msgstr ""
+"Du kan udføre eksporten ved at oprette og bruge en midlertidig database. "
+"Sørg venligst for at du har privilegier til at gøre det."
 
 #: tbl_tracking.php:215
 msgid "Comment out these two lines if you do not need them."
@@ -10556,16 +10558,16 @@ msgstr ""
 
 #: tbl_tracking.php:224
 msgid "SQL statements exported. Please copy the dump or execute it."
-msgstr ""
+msgstr "SQL-sætninger eksporteres. Kopier venligst dump eller udfør den."
 
 #: tbl_tracking.php:255
 #, php-format
 msgid "Version %s snapshot (SQL code)"
-msgstr ""
+msgstr "Version %s snapshot (SQL kode)"
 
 #: tbl_tracking.php:382
 msgid "Tracking data definition successfully deleted"
-msgstr ""
+msgstr "Sporing af data definition slettet"
 
 #: tbl_tracking.php:384 tbl_tracking.php:401
 #, fuzzy
@@ -10616,7 +10618,7 @@ msgstr ""
 
 #: tbl_tracking.php:559
 msgid "SQL dump"
-msgstr ""
+msgstr "SQL dump"
 
 #: tbl_tracking.php:560
 msgid "This option will replace your table and contained data."
@@ -10624,55 +10626,55 @@ msgstr ""
 
 #: tbl_tracking.php:560
 msgid "SQL execution"
-msgstr ""
+msgstr "SQL-udførelse"
 
 #: tbl_tracking.php:572
 #, php-format
 msgid "Export as %s"
-msgstr ""
+msgstr "Eksporter som %s"
 
 #: tbl_tracking.php:612
 msgid "Show versions"
-msgstr ""
+msgstr "Vis versioner"
 
 #: tbl_tracking.php:644
 msgid "Version"
-msgstr ""
+msgstr "Version"
 
 #: tbl_tracking.php:692
 #, php-format
 msgid "Deactivate tracking for %s.%s"
-msgstr ""
+msgstr "Deaktiver tracking af %s.%s"
 
 #: tbl_tracking.php:694
 msgid "Deactivate now"
-msgstr ""
+msgstr "Deaktiver nu"
 
 #: tbl_tracking.php:705
 #, php-format
 msgid "Activate tracking for %s.%s"
-msgstr ""
+msgstr "Aktiver tracking af %s.%s"
 
 #: tbl_tracking.php:707
 msgid "Activate now"
-msgstr ""
+msgstr "Aktiver nu"
 
 #: tbl_tracking.php:720
 #, php-format
 msgid "Create version %s of %s.%s"
-msgstr ""
+msgstr "Opret version %s af %s.%s"
 
 #: tbl_tracking.php:724
 msgid "Track these data definition statements:"
-msgstr ""
+msgstr "Spor disse data definition udsagn"
 
 #: tbl_tracking.php:732
 msgid "Track these data manipulation statements:"
-msgstr ""
+msgstr "Spor disse data manipulation udsagn:"
 
 #: tbl_tracking.php:740
 msgid "Create version"
-msgstr ""
+msgstr "Opret version"
 
 #: themes.php:31
 #, php-format
@@ -10685,7 +10687,7 @@ msgstr ""
 
 #: themes.php:41
 msgid "Get more themes!"
-msgstr ""
+msgstr "Hent flere temaer!"
 
 #: transformation_overview.php:24
 msgid "Available MIME types"
@@ -10722,7 +10724,7 @@ msgstr "VIEW navn"
 
 #: view_operations.php:91
 msgid "Rename view to"
-msgstr ""
+msgstr "Omdøb view til"
 
 #, fuzzy
 #~| msgid "row(s) starting from record #"
diff --git a/po/de.po b/po/de.po
index 7268024406..ac7c136289 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-03 07:35-0400\n"
-"PO-Revision-Date: 2011-04-23 04:28+0200\n"
-"Last-Translator: Dominik Geyer <dominik.geyer@gmx.de>\n"
+"PO-Revision-Date: 2011-07-03 20:12+0200\n"
+"Last-Translator:  <mrbendig@mrbendig.com>\n"
 "Language-Team: german <de@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -509,14 +509,14 @@ msgstr "Ihr SQL-Befehl wurde erfolgreich ausgeführt."
 #, 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] ""
+msgstr[0] "%d Zeile betroffen aufgrund des letzten Befehls innerhalb der Prozedur"
+msgstr[1] "%d Zeilen betroffen aufgrund des letzten Befehls innerhalb der Prozedur"
 
 #: db_routines.php:167
-#, fuzzy, php-format
+#, php-format
 #| msgid "Allows executing stored routines."
 msgid "Execution results of routine %s"
-msgstr "Erlaubt das Ausführen von Routinen."
+msgstr "Ergebnisse der ausgeführten Routine %s"
 
 #: db_routines.php:187 libraries/import.lib.php:152 sql.php:685
 #: tbl_change.php:180 tbl_get_field.php:34
@@ -525,10 +525,10 @@ msgstr "MySQL lieferte ein leeres Resultat zurück (d.h. null Zeilen)."
 
 #: db_routines.php:192 db_routines.php:297 db_routines.php:302
 #: db_routines.php:326
-#, fuzzy, php-format
+#, php-format
 #| msgid "The following queries have been executed:"
 msgid "The following query has failed: \"%s\""
-msgstr "Die folgenden Abfragen wurden ausgeführt:"
+msgstr "Die folgende Abfrage ist fehlgeschlagen: \"%s\""
 
 #: db_routines.php:193 db_routines.php:298 db_routines.php:303
 #: db_routines.php:313 db_routines.php:327 libraries/common.lib.php:581
@@ -537,69 +537,68 @@ msgstr "MySQL meldet: "
 
 #: db_routines.php:210 db_routines.php:242 db_routines.php:270
 #: db_routines.php:409
-#, fuzzy
 #| msgid "Error in Processing Request"
 msgid "Error in processing request"
 msgstr "Fehler beim Bearbeiten der Anfrage"
 
 #: db_routines.php:211 db_routines.php:243 db_routines.php:271
 #: db_routines.php:410
-#, fuzzy, php-format
+#, php-format
 #| msgid "No tables found in database"
 msgid "No routine with name %1$s found in database %2$s"
-msgstr "Diese Datenbank enthält keine Tabellen."
+msgstr "Keine Routine namens %1$s in der Datenbank %2$s gefunden"
 
 #: db_routines.php:232 db_routines.php:236
 msgid "Execute routine"
-msgstr ""
+msgstr "Führe Routine aus"
 
 #: db_routines.php:261 db_routines.php:265
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export defaults"
 msgid "Export of routine %s"
-msgstr "Voreinstellung für Export"
+msgstr "Exportieren der Routine %s"
 
 #: db_routines.php:290 libraries/db_routines.lib.php:911
-#, fuzzy, php-format
+#, php-format
 #| msgid "Invalid server index: %s"
 msgid "Invalid routine type: \"%s\""
-msgstr "Ungültige Server-Nummer: %s"
+msgstr "Ungültiger Routinen-Typ: \"%s\""
 
 #: db_routines.php:311
 msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
+msgstr "Das wiederherstellen der gelöschten Routine schlug fehl."
 
 #: db_routines.php:312
 msgid "The backed up query was:"
-msgstr ""
+msgstr "Die gesicherte Abfrage war:"
 
 #: db_routines.php:316
-#, fuzzy, php-format
+#, php-format
 #| msgid "Column %s has been dropped"
 msgid "Routine %1$s has been modified."
-msgstr "Spalte %s wurde gelöscht"
+msgstr "Routine %1$s wurde geändert."
 
 #: db_routines.php:329
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %1$s has been created."
 msgid "Routine %1$s has been created."
-msgstr "Die Tabelle %1$s wurde erzeugt."
+msgstr "Die Routine %1$s wurde erstellt."
 
 #: db_routines.php:337
 msgid "<b>One or more errors have occured while processing your request:</b>"
 msgstr ""
+"<b>Ein oder mehrere Fehler sind aufgetreten während Ihre Anfrage verarbeitet "
+"wurde:</b>"
 
 #: db_routines.php:381
-#, fuzzy
 #| msgid "Create relation"
 msgid "Create routine"
-msgstr "Erzeuge Verknüpfung"
+msgstr "Erzeuge Routine"
 
 #: db_routines.php:385
-#, fuzzy
 #| msgid "Edit mode"
 msgid "Edit routine"
-msgstr "Bearbeitungsmodus"
+msgstr "Bearbeite Routine"
 
 #: db_routines.php:436
 msgid ""
@@ -607,6 +606,11 @@ msgid ""
 "handling multi queries. <b>The execution of some stored routines may fail!</"
 "b> Please use the improved 'mysqli' extension to avoid any problems."
 msgstr ""
+"Sie verwenden die von PHP als 'veraltet' gekennzeichnete "
+"'mysql'-Erweiterung, die nicht in der Lage ist mehrere Abfrage zu "
+"verarbeiten. <b>Die Ausführung von einigen gespeicherten Prozeduren könnte "
+"fehlschlagen!</b> Bitte verwenden Sie die verbesserte 'mysqli'-Erweiterung "
+"um Probleme zu vermeiden."
 
 #: db_search.php:30 libraries/auth/config.auth.lib.php:83
 #: libraries/auth/config.auth.lib.php:102
@@ -678,7 +682,6 @@ msgid "Search in database"
 msgstr "Durchsuche die Datenbank"
 
 #: db_search.php:275
-#, fuzzy
 #| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Zu suchende Wörter oder Werte (Platzhalter: \"%\"):"
@@ -692,7 +695,6 @@ msgid "Words are separated by a space character (\" \")."
 msgstr "Die Wörter werden durch Leerzeichen (\" \") getrennt."
 
 #: db_search.php:298
-#, fuzzy
 #| msgid "Inside table(s):"
 msgid "Inside tables:"
 msgstr "In der / den Tabelle(n):"
@@ -826,22 +828,19 @@ msgid "Analyze table"
 msgstr "Analysiere Tabelle"
 
 #: db_structure.php:514
-#, fuzzy
 #| msgid "Go to table"
 msgid "Add prefix to table"
-msgstr "Gehe zur Tabelle"
+msgstr "Prefix der Tabelle voranstellen"
 
 #: db_structure.php:516 libraries/mult_submits.inc.php:251
-#, fuzzy
 #| msgid "Replace table data with file"
 msgid "Replace table prefix"
-msgstr "Tabelleninhalt ersetzen"
+msgstr "Tabellenprefix ersetzen"
 
 #: db_structure.php:518 libraries/mult_submits.inc.php:251
-#, fuzzy
 #| msgid "Replace table data with file"
 msgid "Copy table with prefix"
-msgstr "Tabelleninhalt ersetzen"
+msgstr "Tabelle mit Prefix kopieren"
 
 #: db_structure.php:560 libraries/schema/User_Schema.class.php:383
 msgid "Data Dictionary"
@@ -1085,16 +1084,14 @@ msgid "You are about to DESTROY a complete database!"
 msgstr "Sie sind dabei eine komplette Datenbank zu ZERSTÖREN!"
 
 #: js/messages.php:32
-#, fuzzy
 #| msgid "You are about to DESTROY a complete database!"
 msgid "You are about to DESTROY a complete table!"
-msgstr "Sie sind dabei eine komplette Datenbank zu ZERSTÖREN!"
+msgstr "Sie sind dabei eine komplette Tabelle zu ZERSTÖREN!"
 
 #: js/messages.php:33
-#, fuzzy
 #| msgid "You are about to DESTROY a complete database!"
 msgid "You are about to TRUNCATE a complete table!"
-msgstr "Sie sind dabei eine komplette Datenbank zu ZERSTÖREN!"
+msgstr "Sie sind dabei die Daten einer kompletten Tabelle zu ZERSTÖREN!"
 
 #: js/messages.php:35
 msgid "Deleting tracking data"
@@ -1128,10 +1125,9 @@ msgstr "Das ist keine Zahl!"
 
 #. l10n: Default description for the y-Axis of Charts
 #: js/messages.php:49
-#, fuzzy
 #| msgid "Log file count"
 msgid "Total count"
-msgstr "Log file Anzahl"
+msgstr "Komplette Anzahl"
 
 #: js/messages.php:52
 msgid "The host name is empty!"
@@ -1151,10 +1147,9 @@ msgstr "Die eingegebenen Passwörter sind nicht identisch!"
 
 #: js/messages.php:56 server_privileges.php:1679 server_privileges.php:1703
 #: server_privileges.php:2108 server_privileges.php:2302
-#, fuzzy
 #| msgid "Any user"
 msgid "Add user"
-msgstr "Jeder Benutzer"
+msgstr "Benutzer hinzufügen"
 
 #: js/messages.php:57
 msgid "Reloading Privileges"
@@ -1179,24 +1174,22 @@ msgid "Edit"
 msgstr "Bearbeiten"
 
 #: js/messages.php:64 server_status.php:420
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Live traffic chart"
-msgstr "Server Auswählen"
+msgstr "Live Traffic Diagramm"
 
 #: js/messages.php:65 server_status.php:423
 msgid "Live conn./process chart"
-msgstr ""
+msgstr "Live Verbindung/Prozess Diagramm"
 
 #: js/messages.php:66 server_status.php:445
-#, fuzzy
 #| msgid "Show query chart"
 msgid "Live query chart"
-msgstr "Abfragediagramm anzeigen"
+msgstr "Live Abfrage Diagramm"
 
 #: js/messages.php:68
 msgid "Static data"
-msgstr ""
+msgstr "Statische Daten"
 
 #. l10n: Total number of queries
 #: js/messages.php:70 libraries/build_html_for_db.lib.php:45
@@ -1209,7 +1202,7 @@ msgstr "Insgesamt"
 #. l10n: Other, small valued, queries
 #: js/messages.php:72 server_status.php:602
 msgid "Other"
-msgstr ""
+msgstr "Weitere"
 
 #. l10n: Thousands separator
 #: js/messages.php:74 libraries/common.lib.php:1322
@@ -1223,45 +1216,42 @@ msgstr ","
 
 #: js/messages.php:78
 msgid "KiB sent since last refresh"
-msgstr ""
+msgstr "KiB gesendet seit der letzten Aktualisierung"
 
 #: js/messages.php:79
 msgid "KiB received since last refresh"
-msgstr ""
+msgstr "KiB empfangen seit der letzten Aktualisierung"
 
 #: js/messages.php:80
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Server traffic (in KiB)"
-msgstr "Server Auswählen"
+msgstr "Server Traffic (in KiB)"
 
 #: js/messages.php:81
 msgid "Connections since last refresh"
-msgstr ""
+msgstr "Verbindungen seit der letzten Aktualisierung"
 
 #: js/messages.php:82 server_status.php:794
 msgid "Processes"
 msgstr "Prozesse"
 
 #: js/messages.php:83
-#, fuzzy
 #| msgid "Connections"
 msgid "Connections / Processes"
-msgstr "Verbindungen"
+msgstr "Verbindungen / Prozesse"
 
 #: js/messages.php:84
 msgid "Issued queries since last refresh"
-msgstr ""
+msgstr "Ausgelöste SQL-Befehle seit der letzten Aktualisierung"
 
 #: js/messages.php:85
-#, fuzzy
 #| msgid "SQL queries"
 msgid "Issued queries"
-msgstr "SQL-Abfragen"
+msgstr "Ausgelöste SQL-Befehle"
 
 #: js/messages.php:87 server_status.php:402
 msgid "Query statistics"
-msgstr "Statistiken abfragen"
+msgstr "Abfrage-Statistiken"
 
 #: js/messages.php:91 libraries/tbl_properties.inc.php:777 pmd_general.php:388
 #: pmd_general.php:425 pmd_general.php:545 pmd_general.php:593
@@ -1321,10 +1311,9 @@ msgid "Create Table"
 msgstr "Erzeuge Tabelle"
 
 #: js/messages.php:112
-#, fuzzy
 #| msgid "Use Tables"
 msgid "Insert Table"
-msgstr "Verwendete Tabellen"
+msgstr "Tabelle einfügen"
 
 #: js/messages.php:113
 #, fuzzy
@@ -1343,43 +1332,42 @@ msgid "Searching"
 msgstr "Suche"
 
 #: js/messages.php:118
-#, fuzzy
 #| msgid "Hide search criteria"
 msgid "Hide search results"
-msgstr "Suchkriterien ausblenden"
+msgstr "Suchergebnisse ausblenden"
 
 #: js/messages.php:119
-#, fuzzy
 #| msgid "Show search criteria"
 msgid "Show search results"
-msgstr "Suchkriterien anzeigen"
+msgstr "Zeige Suchergebnisse"
 
 #: js/messages.php:120
-#, fuzzy
 #| msgid "Browse"
 msgid "Browsing"
-msgstr "Anzeigen"
+msgstr "Durchsehen"
 
 #: js/messages.php:121
-#, fuzzy
 #| msgid "Deleting %s"
 msgid "Deleting"
-msgstr "Lösche %s"
+msgstr "Löschen"
 
 #: js/messages.php:124
 msgid "The definition of a stored function must contain a RETURN statement!"
 msgstr ""
+"Die Definition einer gespeicherten Prozedur muss ein RETURN-Statement "
+"beinhalten!"
 
 #: js/messages.php:125
-#, fuzzy
 #| msgid "Missing value in the form!"
 msgid "Value too long in the form!"
-msgstr "Das Formular ist leer !"
+msgstr "Zu großer Wert im Formular!"
 
 #: js/messages.php:128
 msgid ""
 "Note: If the file contains multiple tables, they will be combined into one"
 msgstr ""
+"Hinweis: Wenn die Date mehrere Tabellen enthält, werden diese in einer "
+"einzigen Tabelle zusammengefasst"
 
 #: js/messages.php:131
 msgid "Hide query box"
@@ -1415,7 +1403,7 @@ msgstr "Es wurden keine Datensätze ausgewählt."
 #: querywindow.php:94 querywindow.php:97 tbl_structure.php:152
 #: tbl_structure.php:602
 msgid "Change"
-msgstr "Ändern"
+msgstr "Bearbeiten"
 
 #: js/messages.php:141
 msgid "Hide search criteria"
@@ -1451,6 +1439,8 @@ msgid ""
 "You haven't saved the changes in the layout. They will be lost if you don't "
 "save them.Do you want to continue?"
 msgstr ""
+"Sie haben die Änderungen im Layout nicht gespeichert. Sie werden verworfen "
+"wenn Sie diese nicht speichern. Wünschen Sie fortzufahren?"
 
 #: js/messages.php:155
 msgid "Add an option for column "
@@ -1478,8 +1468,8 @@ msgid ""
 "A newer version of phpMyAdmin is available and you should consider "
 "upgrading. The newest version is %s, released on %s."
 msgstr ""
-"Es ist eine neuere Version von phpMyAdmin verfügbar zu der sie aktualisieren "
-"sollten. Die neuste Version ist %s, erschienen am %s."
+"Es ist eine neuere Version von phpMyAdmin verfügbar. Ein Update wird "
+"vorgeschlagen. Die aktuellste Version ist %s, erschienen am %s."
 
 #. l10n: Latest available phpMyAdmin version
 #: js/messages.php:168
@@ -1487,10 +1477,9 @@ msgid ", latest stable version:"
 msgstr ", aktuellste stabile Version:"
 
 #: js/messages.php:169
-#, fuzzy
 #| msgid "Jump to database"
 msgid "up to date"
-msgstr "Springe zu Datenbank"
+msgstr "auf dem laufenden Stand"
 
 #. l10n: Display text for calendar close link
 #: js/messages.php:187
@@ -1864,22 +1853,19 @@ msgstr[0] "%1$d Zeile eingefügt."
 msgstr[1] "%1$d Zeilen eingefügt."
 
 #: libraries/RecentTable.class.php:107
-#, fuzzy
 #| msgid "Could not save configuration"
 msgid "Could not save recent table"
-msgstr "Fehler beim Speichern der Konfiguration"
+msgstr "Konnte die aktuelle Tabelle nicht speichern"
 
 #: libraries/RecentTable.class.php:142
-#, fuzzy
 #| msgid "Count tables"
 msgid "Recent tables"
-msgstr "Zähle Tabellen"
+msgstr "Aktuelle Tabellen"
 
 #: libraries/RecentTable.class.php:148
-#, fuzzy
 #| msgid "There are no configured servers"
 msgid "There are no recent tables"
-msgstr "Es sind keine Server konfiguriert"
+msgstr "Es gibt keine aktuellen Tabellen"
 
 #: libraries/StorageEngine.class.php:180
 msgid ""
@@ -1921,7 +1907,7 @@ msgstr "Tabelle %s wurde umbenannt in %s."
 
 #: libraries/Table.class.php:1275
 msgid "Could not save table UI preferences"
-msgstr ""
+msgstr "Konnte die UI Einstellungen der Tabelle nicht speichern"
 
 #: libraries/Theme.class.php:143
 #, php-format
@@ -1954,7 +1940,7 @@ msgstr "Pfad für das Oberflächendesign \"%s\" nicht gefunden!"
 
 #: libraries/Theme_Manager.class.php:286 themes.php:20 themes.php:40
 msgid "Theme"
-msgstr ""
+msgstr "Theme"
 
 #: libraries/auth/config.auth.lib.php:76
 msgid "Cannot connect: invalid settings."
@@ -2055,10 +2041,9 @@ msgid "Wrong username/password. Access denied."
 msgstr "Falscher Benutzername/Passwort. Zugriff verweigert."
 
 #: libraries/auth/signon.auth.lib.php:87
-#, fuzzy
 #| msgid "Config authentication"
 msgid "Can not find signon authentication script:"
-msgstr "Config-Authentifizierung"
+msgstr "Konnte Anmelde-Authentifizierungs-Script nicht finden:"
 
 #: libraries/auth/swekey/swekey.auth.lib.php:118
 #, php-format
@@ -2165,16 +2150,17 @@ msgid "Check Privileges"
 msgstr "Rechte überprüfen"
 
 #: libraries/common.inc.php:587
-#, fuzzy
 #| msgid "Could not save configuration"
 msgid "Failed to read configuration file"
-msgstr "Fehler beim Speichern der Konfiguration"
+msgstr "Fehler beim Lesen der Konfigurationsdatei"
 
 #: libraries/common.inc.php:588
 msgid ""
 "This usually means there is a syntax error in it, please check any errors "
 "shown below."
 msgstr ""
+"Dies bedeutet im Allgemeinen, dass sich ein Syntax-Fehler eingeschlichen "
+"hat. Bitte überprüfen Sie die unten gezeigten Fehler."
 
 #: libraries/common.inc.php:595
 #, php-format
@@ -2420,7 +2406,7 @@ msgstr "Es sind keine Dateien zum Upload vorhanden"
 
 #: libraries/common.lib.php:2849 libraries/common.lib.php:2850
 msgid "Execute"
-msgstr ""
+msgstr "Ausführen"
 
 #: libraries/config.values.php:45 libraries/config.values.php:47
 #: libraries/config.values.php:51
@@ -2429,17 +2415,16 @@ msgstr "Beide"
 
 #: libraries/config.values.php:47
 msgid "Nowhere"
-msgstr ""
+msgstr "Nirgends"
 
 #: libraries/config.values.php:47
 msgid "Left"
-msgstr ""
+msgstr "Links"
 
 #: libraries/config.values.php:47
-#, fuzzy
 #| msgid "Height"
 msgid "Right"
-msgstr "Höhe"
+msgstr "Rechts"
 
 #: libraries/config.values.php:75
 msgid "Open"
@@ -2805,12 +2790,13 @@ msgid ""
 "Disable the table maintenance mass operations, like optimizing or repairing "
 "the selected tables of a database."
 msgstr ""
+"Deakivieren von Massen-Operationen der Tabellen-Instandhaltung, wie "
+"optimieren oder reparieren von ausgewählten Tabellen einer Datenbank."
 
 #: libraries/config/messages.inc.php:61
-#, fuzzy
 #| msgid "Table maintenance"
 msgid "Disable multi table maintenance"
-msgstr "Hilfsmittel"
+msgstr "Deaktivieren von Massen-Operationen zur Tabellen-Instandhaltung"
 
 #: libraries/config/messages.inc.php:62
 msgid "Edit SQL queries in popup window"
@@ -3576,16 +3562,16 @@ msgid "Enable highlighting"
 msgstr "Hervorhebung ermöglichen"
 
 #: libraries/config/messages.inc.php:288
-#, fuzzy
 #| msgid "Maximum number of tables displayed in table list"
 msgid "Maximum number of recently used tables; set 0 to disable"
-msgstr "Maximale Anzahl der in einer Tabellenliste angezeigten Tabellen"
+msgstr ""
+"Maximale Anzahl der kürzlichen verwendeten Tabellen, auf 0 setzen zum "
+"deaktivieren"
 
 #: libraries/config/messages.inc.php:289
-#, fuzzy
 #| msgid "Untracked tables"
 msgid "Recently used tables"
-msgstr "Nicht verfolgte Tabellen"
+msgstr "Kürzlich verwendete Tabellen"
 
 #: libraries/config/messages.inc.php:290
 msgid "Use less graphically intense tabs"
@@ -3743,7 +3729,7 @@ msgstr "Dies sind Bearbeitungs-, Inline-Bearbeitungs-, Kopier- und Löschlinks"
 
 #: libraries/config/messages.inc.php:320
 msgid "Where to show the table row links"
-msgstr ""
+msgstr "Wo die Datensatz-Links angezeigt werden sollen"
 
 #: libraries/config/messages.inc.php:321
 msgid "Use natural order for sorting table and database names"
@@ -3873,12 +3859,12 @@ msgstr "Umwandlungs Engine"
 #: libraries/config/messages.inc.php:350
 msgid "When browsing tables, the sorting of each table is remembered"
 msgstr ""
+"Während des Durchsehens der Tabellen wird die Sortierung zwischengespeichert"
 
 #: libraries/config/messages.inc.php:351
-#, fuzzy
 #| msgid "Rename table to"
 msgid "Remember table's sorting"
-msgstr "Tabelle umbenennen in"
+msgstr "Tabellensortierung zwischenspeichern"
 
 #: libraries/config/messages.inc.php:352
 msgid "Repeat the headers every X cells, [kbd]0[/kbd] deactivates this feature"
@@ -4158,7 +4144,6 @@ msgid "Server port"
 msgstr "Port"
 
 #: libraries/config/messages.inc.php:409
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no user preferences storage in database, suggested: [kbd]"
 #| "pma_config[/kbd]"
@@ -4166,14 +4151,13 @@ msgid ""
 "Leave blank for no \"persistent\" recently used tables across sessions, "
 "suggested: [kbd]pma_recent[/kbd]"
 msgstr ""
-"Leer lassen, um die Benutzereinstellungen nicht in der Datenbank zu "
-"speichern, Vorschlag: [kbd]pma_config[/kbd]"
+"Leer lassen, um die kürzlich verwendeten Tabellen nicht in der Datenbank zu "
+"speichern, Vorschlag: [kbd]pma_recent[/kbd]"
 
 #: libraries/config/messages.inc.php:410
-#, fuzzy
 #| msgid "Recall user name"
 msgid "Recently used table"
-msgstr "Benutzername wiederherstellen"
+msgstr "Kürzich verwendete Tabellen"
 
 #: libraries/config/messages.inc.php:411
 msgid ""
@@ -4252,7 +4236,6 @@ msgid "Display columns table"
 msgstr "Tabelle für Anzeigespalten"
 
 #: libraries/config/messages.inc.php:426
-#, fuzzy
 #| msgid ""
 #| "Leave blank for no user preferences storage in database, suggested: [kbd]"
 #| "pma_config[/kbd]"
@@ -4260,14 +4243,13 @@ msgid ""
 "Leave blank for no \"persistent\" tables'UI preferences across sessions, "
 "suggested: [kbd]pma_table_uiprefs[/kbd]"
 msgstr ""
-"Leer lassen, um die Benutzereinstellungen nicht in der Datenbank zu "
-"speichern, Vorschlag: [kbd]pma_config[/kbd]"
+"Leer lassen, um die Oberflächeneinstellungen nicht in der Datenbank zu "
+"speichern, Vorschlag: [kbd]pma_table_uiprefs[/kbd]"
 
 #: libraries/config/messages.inc.php:427
-#, fuzzy
 #| msgid "User preferences storage table"
 msgid "UI preferences table"
-msgstr "Tabelle für Benutzereinstellungen"
+msgstr "Tabelle für Oberflächeneinstellungen"
 
 #: libraries/config/messages.inc.php:428
 msgid ""
@@ -4823,22 +4805,22 @@ msgid "The %s extension is missing. Please check your PHP configuration."
 msgstr "Die Erweiterung %s fehlt. Bitte die PHP Konfiguration überprüfen."
 
 #: libraries/db_events.inc.php:30
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export contents"
 msgid "Export of event %s"
-msgstr "Export-Inhalte"
+msgstr "Export des Ereignisses %s"
 
 #: libraries/db_events.inc.php:34
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export contents"
 msgid "Export of event \"%s\""
-msgstr "Export-Inhalte"
+msgstr "Export des Ereignisses \"%s\""
 
 #: libraries/db_events.inc.php:40
-#, fuzzy, php-format
+#, php-format
 #| msgid "No tables found in database"
 msgid "No event with name %s found in database %s"
-msgstr "Diese Datenbank enthält keine Tabellen."
+msgstr "Es wurde kein Ereignis mit dem Namen %s in Datenbank %s gefunden"
 
 #: libraries/db_events.inc.php:56 libraries/db_links.inc.php:101
 #: libraries/export/sql.php:609
@@ -4846,10 +4828,9 @@ msgid "Events"
 msgstr "Ereignisse"
 
 #: libraries/db_events.inc.php:58 libraries/db_events.inc.php:60
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no events to display."
-msgstr "Es sind keine Dateien zum Upload vorhanden"
+msgstr "Es sind keine Ereignisse vorhanden, die angezeigt werden könnten."
 
 #: libraries/db_events.inc.php:67 libraries/db_routines.lib.php:661
 #: libraries/db_routines.lib.php:807 libraries/db_routines.lib.php:1156
@@ -4861,25 +4842,24 @@ msgstr "Name"
 
 #: libraries/db_events.inc.php:129
 msgid "The event scheduler is enabled"
-msgstr ""
+msgstr "Der Ereignisplaner ist aktiviert"
 
 #: libraries/db_events.inc.php:129
 msgid "The event scheduler is disabled"
-msgstr ""
+msgstr "Der Ereignisplaner ist deaktiviert"
 
 #: libraries/db_events.inc.php:131
 msgid "Turn it on"
-msgstr ""
+msgstr "Anschalten"
 
 #: libraries/db_events.inc.php:131
 msgid "Turn it off"
-msgstr ""
+msgstr "Ausschalten"
 
 #: libraries/db_events.inc.php:141
-#, fuzzy
 #| msgid "Add a new server"
 msgid "Add an event"
-msgstr "Neuen Server hinzufügen"
+msgstr "Ein Ereignis hinzufügen"
 
 #: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43
 #: libraries/db_links.inc.php:44
@@ -4889,11 +4869,11 @@ msgstr "Die Datenbank scheint leer zu sein!"
 #: libraries/db_links.inc.php:66 libraries/relation.lib.php:140
 #: libraries/tbl_links.inc.php:97
 msgid "Tracking"
-msgstr "Tracking"
+msgstr "Nachverfolgung"
 
 #: libraries/db_links.inc.php:71
 msgid "Query"
-msgstr "Abfrageeditor"
+msgstr "Abfrage"
 
 #: libraries/db_links.inc.php:76 libraries/relation.lib.php:128
 msgid "Designer"
@@ -4915,36 +4895,33 @@ msgid "Triggers"
 msgstr "Trigger"
 
 #: libraries/db_routines.lib.php:630
-#, fuzzy
 #| msgid "Details..."
 msgid "Details"
 msgstr "Details ..."
 
 #: libraries/db_routines.lib.php:633
-#, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
-msgstr "Routinen"
+msgstr "Routinen Name"
 
 #: libraries/db_routines.lib.php:650
-#, fuzzy, php-format
+#, php-format
 #| msgid "Change"
 msgid "Change to %s"
-msgstr "Ändern"
+msgstr "Wechseln zu %s"
 
 #: libraries/db_routines.lib.php:655
 msgid "Parameters"
-msgstr ""
+msgstr "Parameter"
 
 #: libraries/db_routines.lib.php:660
-#, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
-msgstr "Direkte Verbindung"
+msgstr "Richtung"
 
 #: libraries/db_routines.lib.php:663 libraries/tbl_properties.inc.php:105
 msgid "Length/Values"
-msgstr "Länge/Set"
+msgstr "Länge/Werte"
 
 #: libraries/db_routines.lib.php:664 libraries/display_tbl.lib.php:593
 #: libraries/export/codegen.php:41 libraries/export/csv.php:34
@@ -4965,62 +4942,55 @@ msgid "Options"
 msgstr "Optionen"
 
 #: libraries/db_routines.lib.php:678
-#, fuzzy
 #| msgid "Add index"
 msgid "Add parameter"
-msgstr "Index hinzufügen"
+msgstr "Parameter hinzufügen"
 
 #: libraries/db_routines.lib.php:681
-#, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
-msgstr "Datenbank entfernen"
+msgstr "Letzten Parameter entfernen"
 
 #: libraries/db_routines.lib.php:686 libraries/db_routines.lib.php:1159
 msgid "Return type"
 msgstr "Rückgabe-Typ"
 
 #: libraries/db_routines.lib.php:692
-#, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
-msgstr "Länge/Set"
+msgstr "Rückgabe Länge/Werte"
 
 #: libraries/db_routines.lib.php:697
-#, fuzzy
 #| msgid "Table options"
 msgid "Return options"
-msgstr "Tabellenoptionen"
+msgstr "Rückgabe der Optionen"
 
 #: libraries/db_routines.lib.php:716
-#, fuzzy
 #| msgid "Description"
 msgid "Definition"
 msgstr "Beschreibung"
 
 #: libraries/db_routines.lib.php:720
 msgid "Is deterministic"
-msgstr ""
+msgstr "Ist plangesteuert"
 
 #: libraries/db_routines.lib.php:724
 msgid "Definer"
-msgstr ""
+msgstr "Ersteller"
 
 #: libraries/db_routines.lib.php:729
-#, fuzzy
 #| msgid "Security"
 msgid "Security type"
-msgstr "Sicherheit"
+msgstr "Sicherheits-Typ"
 
 #: libraries/db_routines.lib.php:736
 msgid "SQL data access"
-msgstr ""
+msgstr "SQL-Daten Zugriff"
 
 #: libraries/db_routines.lib.php:800 libraries/db_routines.lib.php:803
-#, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
-msgstr "Routinen"
+msgstr "Routinen Parameter"
 
 #: libraries/db_routines.lib.php:810 tbl_change.php:284 tbl_change.php:322
 msgid "Function"
@@ -5035,51 +5005,52 @@ msgstr "Wert"
 
 #: libraries/db_routines.lib.php:916
 msgid "You must provide a routine name"
-msgstr ""
+msgstr "Sie müssen einen Routinen-Namen angeben"
 
 #: libraries/db_routines.lib.php:935
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
-msgstr ""
+msgstr "Ungültige Richtung \"%s\" für Parameter angegeben."
 
 #: libraries/db_routines.lib.php:946 libraries/db_routines.lib.php:987
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
+"Sie müssen Länge/Werte Angaben für Routinen Parameter des Typs ENUM, SET, "
+"VARCHAR und VARBINARY angeben."
 
 #: libraries/db_routines.lib.php:971
 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 Routinen-Paramter angeben."
 
 #: libraries/db_routines.lib.php:1028
 msgid "You must provide a routine definition."
-msgstr ""
+msgstr "Sie müssen die Definition der Routine angeben"
 
 #: libraries/db_routines.lib.php:1151
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no routines to display."
-msgstr "Es sind keine Dateien zum Upload vorhanden"
+msgstr "Es sind keine Routinen zum Anzeigen vorhanden."
 
 #: libraries/db_routines.lib.php:1192
-#, fuzzy
 #| msgid "Add index"
 msgid "Add routine"
-msgstr "Index hinzufügen"
+msgstr "Routine hinzufügen"
 
 #: libraries/db_routines.lib.php:1195
-#, fuzzy
 #| msgid "You don't have sufficient privileges to be here right now!"
 msgid "You do not have the necessary privileges to create a new routine"
-msgstr "Sie haben nicht genug Rechte um fortzufahren!"
+msgstr "Sie haben nicht genug Rechte um eine neue Routine zu erstellen"
 
 #: libraries/db_structure.lib.php:43 libraries/display_tbl.lib.php:2084
 msgid ""
 "May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ "
 "3.11[/a]"
 msgstr ""
-"Es kann sich hierbei um Näherungswerte handeln. Bitte lesen Sie auch FAQ 3.11"
+"Es kann sich hierbei um Näherungswerte handeln. Bitte lesen Sie auch "
+"[a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]"
 
 #: libraries/dbi/mysql.dbi.lib.php:111 libraries/dbi/mysqli.dbi.lib.php:112
 msgid "Connection for controluser as defined in your configuration failed."
@@ -5095,7 +5066,7 @@ msgstr "Der Server antwortet nicht."
 #: libraries/dbi/mysql.dbi.lib.php:324 libraries/dbi/mysqli.dbi.lib.php:351
 msgid "(or the local MySQL server's socket is not correctly configured)"
 msgstr ""
-"(evtl. ist auch der Socket des lokalen MySQL-Servers socket nicht korrekt "
+"(evtl. ist auch der Socket des lokalen MySQL-Servers nicht korrekt "
 "konfiguriert)"
 
 #: libraries/dbi/mysql.dbi.lib.php:333
@@ -5124,11 +5095,10 @@ msgstr "Password-Verschlüsselung"
 
 #: libraries/display_change_password.lib.php:65
 msgid "MySQL 4.0 compatible"
-msgstr "MySQL&nbsp;4.0 kompatibel"
+msgstr "MySQL 4.0 kompatibel"
 
 #: libraries/display_create_database.lib.php:21
 #: libraries/display_create_database.lib.php:39
-#, fuzzy
 #| msgid "Create new database"
 msgid "Create database"
 msgstr "Neue Datenbank anlegen"
@@ -5154,7 +5124,8 @@ msgstr "Anzahl der Spalten"
 #: libraries/display_export.lib.php:35
 msgid "Could not load export plugins, please check your installation!"
 msgstr ""
-"Export-Plugins konnten nicht geladen werden, bitte Installation überprüfen!"
+"Export-Plugins konnten nicht geladen werden, bitte überprüfen Sie Ihre "
+"Installation!"
 
 #: libraries/display_export.lib.php:80
 msgid "Exporting databases from the current server"
@@ -5168,7 +5139,7 @@ msgstr "Exportiere Tabellen der Datenbank \"%s\""
 #: libraries/display_export.lib.php:84
 #, php-format
 msgid "Exporting rows from \"%s\" table"
-msgstr "Exportiere Zeilen aus Tabelle \"%s\""
+msgstr "Exportiere Datensätze aus Tabelle \"%s\""
 
 #: libraries/display_export.lib.php:90
 msgid "Export Method:"
@@ -5184,15 +5155,15 @@ msgstr "Angepasst – zeige alle möglichen Optionen an"
 
 #: libraries/display_export.lib.php:130
 msgid "Database(s):"
-msgstr "Datenbanken:"
+msgstr "Datenbank(en):"
 
 #: libraries/display_export.lib.php:132
 msgid "Table(s):"
-msgstr "Tabellen:"
+msgstr "Tabelle(n):"
 
 #: libraries/display_export.lib.php:142
 msgid "Rows:"
-msgstr "Zeilen:"
+msgstr "Datensätze:"
 
 #: libraries/display_export.lib.php:150
 msgid "Dump some row(s)"
@@ -5200,15 +5171,15 @@ msgstr "Einige Datensätze exportieren:"
 
 #: libraries/display_export.lib.php:152
 msgid "Number of rows:"
-msgstr "Anzahl der Zeilen:"
+msgstr "Anzahl der Datensätze:"
 
 #: libraries/display_export.lib.php:155
 msgid "Row to begin at:"
-msgstr "Anfangszeile:"
+msgstr "Anfangsdatensatz:"
 
 #: libraries/display_export.lib.php:166
 msgid "Dump all rows"
-msgstr "Alle Datensätze exportieren"
+msgstr "Alle Datensätze ausgeben"
 
 #: libraries/display_export.lib.php:174 libraries/display_export.lib.php:195
 msgid "Output:"
@@ -5321,7 +5292,7 @@ msgstr ""
 
 #: libraries/display_import.lib.php:76
 msgid "The file is being processed, please be patient."
-msgstr "Bitte Geduld, die Datei wird abgearbeitet."
+msgstr "Bitte Geduld, die Datei wird verarbeitet."
 
 #: libraries/display_import.lib.php:98
 msgid ""
@@ -5375,8 +5346,8 @@ msgstr "Teilweiser Import:"
 msgid ""
 "Previous import timed out, after resubmitting will continue from position %d."
 msgstr ""
-"Der vorherige Import-Vorgang wurde abgebrochen. Er wird nun bei Position %d "
-"fortgesetzt."
+"Der vorherige Import-Vorgang wurde durch eine Zeitüberschreitung "
+"abgebrochen. Er wird nun bei Position %d fortgesetzt."
 
 #: libraries/display_import.lib.php:221
 msgid ""
@@ -5402,24 +5373,22 @@ msgid "Language"
 msgstr "Sprache"
 
 #: libraries/display_tbl.lib.php:397
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Restore column order"
-msgstr "Textfeldspalten"
+msgstr "Spalten-Anordnung wiederherstellen"
 
 #: libraries/display_tbl.lib.php:417
 msgid "Drag to reorder"
-msgstr ""
+msgstr "Zur Umordnung ziehen."
 
 #: libraries/display_tbl.lib.php:418
-#, fuzzy
 #| msgid "Click to select"
 msgid "Click to sort"
-msgstr "Zur Auswahl anklicken"
+msgstr "Zur Anordnung anklicken"
 
 #: libraries/display_tbl.lib.php:419
 msgid "Click to mark/unmark"
-msgstr ""
+msgstr "Klicken zum aus- bzw. abwählen"
 
 #: libraries/display_tbl.lib.php:420
 msgid "Click the drop-down arrow<br />to toggle column's visibility"
@@ -5454,7 +5423,7 @@ msgstr "untereinander"
 
 #: libraries/display_tbl.lib.php:446
 msgid "horizontal (rotated headers)"
-msgstr "horizontal (gedrehte Bezeichner)"
+msgstr "horizontal (gedrehte Kopfzeilen)"
 
 #: libraries/display_tbl.lib.php:447
 msgid "vertical"
@@ -5505,15 +5474,15 @@ msgstr "Darstellungsumwandlung"
 
 #: libraries/display_tbl.lib.php:650
 msgid "Geometry"
-msgstr ""
+msgstr "Gestaltung"
 
 #: libraries/display_tbl.lib.php:651
 msgid "Well Known Text"
-msgstr ""
+msgstr "Bekannter Text"
 
 #: libraries/display_tbl.lib.php:652
 msgid "Well Known Binary"
-msgstr ""
+msgstr "Bekanntes Binary"
 
 #: libraries/display_tbl.lib.php:1303
 msgid "Copy"
@@ -5521,7 +5490,7 @@ msgstr "Kopieren"
 
 #: libraries/display_tbl.lib.php:1318 libraries/display_tbl.lib.php:1330
 msgid "The row has been deleted"
-msgstr "Die Zeile wurde gelöscht."
+msgstr "Der Datensatz wurde gelöscht."
 
 #: libraries/display_tbl.lib.php:1357 libraries/display_tbl.lib.php:2314
 #: server_status.php:831
@@ -5540,10 +5509,11 @@ msgstr "Zeige Datensätze "
 msgid "total"
 msgstr "insgesamt"
 
+# (s is the abbreviation of "Sekunde", sec is it not (according to International System of Units), so we wrote the complete one.)
 #: libraries/display_tbl.lib.php:2224 sql.php:689
 #, php-format
 msgid "Query took %01.4f sec"
-msgstr "die Abfrage dauerte %01.4f sek."
+msgstr "die Abfrage dauerte %01.4f Sekunden."
 
 #: libraries/display_tbl.lib.php:2418
 msgid "Query results operations"
@@ -5559,7 +5529,7 @@ msgstr "Diagramm anzeigen"
 
 #: libraries/display_tbl.lib.php:2509
 msgid "Visualize GIS data"
-msgstr ""
+msgstr "Visualisiere GIS Daten"
 
 #: libraries/display_tbl.lib.php:2529
 msgid "Create view"
@@ -5570,28 +5540,26 @@ msgid "Link not found"
 msgstr "Der Verweis wurde nicht gefunden."
 
 #: libraries/display_triggers.inc.php:35
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export contents"
 msgid "Export of trigger %s"
-msgstr "Export-Inhalte"
+msgstr "Export des Triggers %s"
 
 #: libraries/display_triggers.inc.php:39
 #, php-format
 msgid "Export of trigger \"%s\""
-msgstr ""
+msgstr "Export des Triggers \"%s\""
 
 #: libraries/display_triggers.inc.php:47
-#, fuzzy, php-format
+#, php-format
 #| msgid "No valid image path for theme %s found!"
 msgid "No trigger with name %s found"
-msgstr ""
-"Keinen gültiges Pfad für Grafiken des Oberflächendesigns \"%s\" gefunden!"
+msgstr "Kein Trigger mit dem Namen %s gefunden"
 
 #: libraries/display_triggers.inc.php:64 libraries/display_triggers.inc.php:66
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no triggers to display."
-msgstr "Es sind keine Dateien zum Upload vorhanden"
+msgstr "Es sind keine Trigger zum Anzeigen vorhanden."
 
 #: libraries/display_triggers.inc.php:77 server_status.php:800 sql.php:943
 msgid "Time"
@@ -5602,10 +5570,9 @@ msgid "Event"
 msgstr "Ereignis"
 
 #: libraries/display_triggers.inc.php:120
-#, fuzzy
 #| msgid "Add a new server"
 msgid "Add a trigger"
-msgstr "Neuen Server hinzufügen"
+msgstr "Einen Trigger hinzufügen"
 
 #: libraries/engines/bdb.lib.php:20 main.php:211
 msgid "Version information"
@@ -5633,7 +5600,7 @@ msgstr "Autoerweiterungs-Schrittgröße"
 msgid ""
 " The increment size for extending the size of an autoextending tablespace "
 "when it becomes full."
-msgstr "Die Größe, um die ein Tablespace erweitert wird, wenn er voll ist."
+msgstr " Die Größe, um die ein Tablespace erweitert wird, wenn er voll ist."
 
 #: libraries/engines/innodb.lib.php:32
 msgid "Buffer pool size"
@@ -5768,7 +5735,7 @@ msgstr ""
 
 #: libraries/engines/myisam.lib.php:41
 msgid "Repair threads"
-msgstr "Reparaturprozess"
+msgstr "Reparaturprozesse"
 
 #: libraries/engines/myisam.lib.php:42
 msgid ""
@@ -5793,11 +5760,13 @@ msgstr ""
 
 #: libraries/engines/pbms.lib.php:30
 msgid "Garbage Threshold"
-msgstr "Müll-Grenzwert"
+msgstr "Grenzwert zur Speicherbereinigung"
 
 #: libraries/engines/pbms.lib.php:31
 msgid "The percentage of garbage in a repository file before it is compacted."
-msgstr "Der Prozentsatz an Müll in einer Logdatei bevor sie komprimiert wird."
+msgstr ""
+"Der Prozentsatz an Speicherbereinigungswerten in einem Archiv bevor es "
+"komprimiert wird."
 
 #: libraries/engines/pbms.lib.php:35 libraries/replication_gui.lib.php:69
 #: server_synchronize.php:1174
@@ -5814,7 +5783,7 @@ msgstr ""
 
 #: libraries/engines/pbms.lib.php:40
 msgid "Repository Threshold"
-msgstr "Repository-Grenzwert"
+msgstr "Archiv-Grenzwert"
 
 #: libraries/engines/pbms.lib.php:41
 msgid ""
@@ -5822,13 +5791,13 @@ msgid ""
 "indicate the unit of the value. A value in bytes is assumed when no unit is "
 "specified."
 msgstr ""
-"Die maximale Größe einer Datei für ein BLOB-Repository. Sie können Kb, MB "
-"oder GB verwenden, um die Einheit des Wertes anzugeben. Ist keine Einheit "
+"Die maximale Größe einer Datei für ein BLOB-Archiv. Sie können Kb, MB oder "
+"GB verwenden, um die Einheit des Wertes anzugeben. Ist keine Einheit "
 "angegeben, wird von Bytes ausgegangen."
 
 #: libraries/engines/pbms.lib.php:45
 msgid "Temp Blob Timeout"
-msgstr "Temp Blob-Timeout"
+msgstr "Temp Blob-Zeitfenster"
 
 #: libraries/engines/pbms.lib.php:46
 msgid ""
@@ -5850,8 +5819,8 @@ msgid ""
 "specified."
 msgstr ""
 "Die maximale Größe einer temporären BLOB-Logdatei. Sie können Kb, MB oder GB "
-"verwenden, um die Einheit des Wertes anzugeben. Ist keine Einheit angegeben, "
-"wird von einem Byte-Wert ausgegangen."
+"verwenden, um die Einheit des Wertes anzugeben. Ist keine Einheit "
+"angegeben, wird von einem Byte-Wert ausgegangen."
 
 #: libraries/engines/pbms.lib.php:55
 msgid "Max Keep Alive"
@@ -5875,8 +5844,8 @@ msgid ""
 "A \":\" delimited list of metadata headers to be used to initialize the "
 "pbms_metadata_header table when a database is created."
 msgstr ""
-"Eine mit \";\" getrennte Liste von Metadaten-Headern, die verwendet werden, "
-"um die Tabelle pbms_metadata_header zu initialisieren, wenn eine Datenbank "
+"Eine mit \";\" getrennte Liste von Metadaten-Headern, die verwendet werden, um "
+"die Tabelle pbms_metadata_header zu initialisieren, wenn eine Datenbank "
 "erstellt wird."
 
 #: libraries/engines/pbms.lib.php:94
@@ -5885,12 +5854,12 @@ msgid ""
 "Documentation and further information about PBMS can be found on %sThe "
 "PrimeBase Media Streaming home page%s."
 msgstr ""
-"Dokumentation und weitere Informationen über PBMS sind auf der %sWebsite von "
-"The PrimeBase Media Streaming%s verfügbar."
+"Dokumentation und weitere Informationen über PBMS sind auf der %s Website "
+"von The PrimeBase Media Streaming%s verfügbar."
 
 #: libraries/engines/pbms.lib.php:96 libraries/engines/pbxt.lib.php:127
 msgid "Related Links"
-msgstr "Weiterführende Links"
+msgstr "Verwandte Links"
 
 #: libraries/engines/pbms.lib.php:98
 msgid "The PrimeBase Media Streaming Blog by Barry Leslie"
@@ -5910,7 +5879,8 @@ msgid ""
 "32MB. The memory allocated here is used only for caching index pages."
 msgstr ""
 "Die Menge an reserviertem Speicher für den Index-Cache. Die Voreinstellung "
-"ist 32 MB. Der Speicher wird nur zum cachen von Index-Seiten verwendet."
+"ist 32 MB. Der Speicher wird nur zum zwischenspeichern von Index-Seiten "
+"verwendet."
 
 #: libraries/engines/pbxt.lib.php:27
 msgid "Record cache size"
@@ -5924,7 +5894,7 @@ msgid ""
 msgstr ""
 "Die Menge an reserviertem Speicher zum Cachen von Tabellendaten. Die "
 "Voreinstellung ist 32 MB. Der Speicher wird verwendet um Änderungen an "
-"Handle-Dateien (.xtd) und Row-Pointer-Dateien (.xtr) zu cachen."
+"Handle-Dateien (.xtd) und Row-Pointer-Dateien (.xtr) zwischenzuspeichern."
 
 #: libraries/engines/pbxt.lib.php:32
 msgid "Log cache size"
@@ -5992,15 +5962,16 @@ msgstr ""
 
 #: libraries/engines/pbxt.lib.php:57
 msgid "Garbage threshold"
-msgstr "Müll-Grenzwert"
+msgstr "Speicherbereinigungs-Grenzwert"
 
 #: libraries/engines/pbxt.lib.php:58
 msgid ""
 "The percentage of garbage in a data log file before it is compacted. This is "
 "a value between 1 and 99. The default is 50."
 msgstr ""
-"Der Prozentsatz an Müll in einer Logdatei bevor sie komprimiert wird. Der "
-"Wert kann zwischen 1 und 99 liegen, Voreinstellung ist 50."
+"Der Prozentsatz an Speicherbereinigungswerten in einer Logdatei bevor sie "
+"komprimiert wird. Der Wert kann zwischen 1 und 99 liegen, Voreinstellung ist "
+"50."
 
 #: libraries/engines/pbxt.lib.php:62
 msgid "Log buffer size"
@@ -6034,7 +6005,7 @@ msgstr "Wachstum der Row-Pointer-Dateien (.xtr)."
 
 #: libraries/engines/pbxt.lib.php:77
 msgid "Log file count"
-msgstr "Log file Anzahl"
+msgstr "Log Dateien Anzahl"
 
 #: libraries/engines/pbxt.lib.php:78
 msgid ""
@@ -6093,7 +6064,7 @@ msgstr "CRLF-Zeichen aus Feldern entfernen"
 
 #: libraries/export/excel.php:33
 msgid "Excel edition:"
-msgstr "Excel-Ausgabe:"
+msgstr "Excel-Version:"
 
 #: libraries/export/htmlword.php:28 libraries/export/latex.php:70
 #: libraries/export/odt.php:56 libraries/export/sql.php:208
@@ -6203,7 +6174,7 @@ msgstr ""
 msgid "Additional custom header comment (\\n splits lines):"
 msgstr ""
 "Individuelle Kommentare für den Kopfbereich (\n"
-" erzeugt einen Zeilenumbruch):"
+"  erzeugt einen Zeilenumbruch):"
 
 #: libraries/export/sql.php:48
 msgid ""
@@ -6366,10 +6337,9 @@ msgid "Open new phpMyAdmin window"
 msgstr "Neues phpMyAdmin-Fenster"
 
 #: libraries/gis_visualization.lib.php:129
-#, fuzzy
 #| msgid "No data found for the chart."
 msgid "No data found for GIS visualization."
-msgstr "Keine Daten für das Diagramm gefunden."
+msgstr "Keine Daten für die GIS-Darstellung gefunden."
 
 #: libraries/header_printview.inc.php:49 libraries/header_printview.inc.php:54
 msgid "SQL result"
@@ -6521,14 +6491,13 @@ msgid "Convert to Kana"
 msgstr "Nach Kana konvertieren"
 
 #: libraries/mult_submits.inc.php:254
-#, fuzzy
 #| msgid "Fr"
 msgid "From"
-msgstr "Fr"
+msgstr "Von"
 
 #: libraries/mult_submits.inc.php:257
 msgid "To"
-msgstr ""
+msgstr "Zu"
 
 #: libraries/mult_submits.inc.php:262 libraries/mult_submits.inc.php:276
 #: libraries/sql_query_form.lib.php:399
@@ -6537,13 +6506,12 @@ msgstr "Abschicken"
 
 #: libraries/mult_submits.inc.php:268
 msgid "Add table prefix"
-msgstr ""
+msgstr "Tabellen-Prefix hinzufügen"
 
 #: libraries/mult_submits.inc.php:271
-#, fuzzy
 #| msgid "Add index"
 msgid "Add prefix"
-msgstr "Index hinzufügen"
+msgstr "Prefix hinzufügen"
 
 #: libraries/mult_submits.inc.php:488 tbl_replace.php:313
 msgid "No change"
@@ -6803,14 +6771,13 @@ msgid "SQL history"
 msgstr "SQL-Verlaufsprotokoll"
 
 #: libraries/relation.lib.php:132
-#, fuzzy
 #| msgid "Persistent connections"
 msgid "Persistent recently used tables"
-msgstr "Persistente Verbindung"
+msgstr "Gespeicherte kürzlich verwendete Tabellen"
 
 #: libraries/relation.lib.php:136
 msgid "Persistent tables' UI preferences"
-msgstr ""
+msgstr "Gespeicherte Tabellen-Darstellungs-Optionen"
 
 #: libraries/relation.lib.php:144
 msgid "User preferences"
@@ -7397,10 +7364,9 @@ msgid "PARTITION definition"
 msgstr "PARTITION Definition"
 
 #: libraries/tbl_properties.inc.php:776
-#, fuzzy
 #| msgid "+ Add a new value"
 msgid "+ Add a value"
-msgstr "+ Neuen Wert hinzufügen"
+msgstr "+ Wert hinzufügen"
 
 #: libraries/transformations/application_octetstream__download.inc.php:9
 msgid ""
@@ -8565,10 +8531,9 @@ msgid "wildcard"
 msgstr "Platzhalter"
 
 #: server_privileges.php:2295
-#, fuzzy
 #| msgid "View %s has been dropped"
 msgid "User has been added."
-msgstr "Die Ansicht %s wurde gelöscht"
+msgstr "Benutzer wurde hinzugefügt"
 
 #: server_replication.php:49
 msgid "Unknown error"
@@ -8589,7 +8554,7 @@ msgid "Unable to change master"
 msgstr "Kann Master nicht wechseln"
 
 #: server_replication.php:72
-#, fuzzy, php-format
+#, php-format
 #| msgid "Master server changed succesfully to %s"
 msgid "Master server changed successfully to %s"
 msgstr "Master-Server wurde erfolgreich auf %s geändert."
@@ -8751,43 +8716,42 @@ msgstr ""
 "Möchten Sie ihn <a href=\"%s\">konfigurieren</a> ?"
 
 #: server_status.php:27
-#, fuzzy
 #| msgid "Refresh"
 msgid "Refresh rate"
-msgstr "Aktualisieren"
+msgstr "Aktualisierungs-Intervall"
 
 #: server_status.php:31
-#, fuzzy, php-format
+#, php-format
 #| msgid "Minute"
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "Minute"
-msgstr[1] "Minute"
+msgstr[0] "%d Minute"
+msgstr[1] "%d Minuten"
 
 #: server_status.php:33
-#, fuzzy, php-format
+#, php-format
 #| msgid "Second"
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "Sekunde"
-msgstr[1] "Sekunde"
+msgstr[0] "%d Sekunde"
+msgstr[1] "%d Sekunden"
 
 #: server_status.php:134
 #, php-format
 msgid "Thread %s was successfully killed."
-msgstr "Der Prozess %s wurde erfolgreich abgebrochen."
+msgstr "Der Thread %s wurde erfolgreich abgebrochen."
 
 #: server_status.php:136
 #, php-format
 msgid ""
 "phpMyAdmin was unable to kill thread %s. It probably has already been closed."
 msgstr ""
-"phpMyAdmin konnte den Prozess %s nicht abbrechen. Er wurde wahrscheinlich "
+"phpMyAdmin konnte den Thread %s nicht abbrechen. Er wurde wahrscheinlich "
 "bereits geschlossen."
 
 #: server_status.php:263
 msgid "Handler"
-msgstr "Handler"
+msgstr "Bezeichner"
 
 #: server_status.php:264
 msgid "Query cache"
@@ -8846,44 +8810,38 @@ msgid "Runtime Information"
 msgstr "Laufzeit-Informationen"
 
 #: server_status.php:401
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Server traffic"
-msgstr "Server Auswählen"
+msgstr "Server Traffic"
 
 #: server_status.php:403
-#, fuzzy
 #| msgid "See slave status table"
 msgid "All status variables"
-msgstr "Die Slave Statustabelle sehen"
+msgstr "Alle Status Variablen"
 
 #: server_status.php:413 server_status.php:439
-#, fuzzy
 #| msgid "Refresh"
 msgid "Refresh rate:"
-msgstr "Aktualisieren"
+msgstr "Aktualisierungs-Intervall:"
 
 #: server_status.php:462
-#, fuzzy
 #| msgid "Do not change the password"
 msgid "Containing the word:"
-msgstr "Passwort nicht verändert"
+msgstr "Beinhalten das Wort:"
 
 #: server_status.php:467
-#, fuzzy
 #| msgid "Show open tables"
 msgid "Show only alert values"
-msgstr "Zeige alle offenen Tabellen"
+msgstr "Zeige nur Warn-Werte"
 
 #: server_status.php:471
 msgid "Filter by category..."
-msgstr ""
+msgstr "Nach Kategorie filtern..."
 
 #: server_status.php:484
-#, fuzzy
 #| msgid "Related Links"
 msgid "Related links:"
-msgstr "Weiterführende Links"
+msgstr "Verwandte Links"
 
 #: server_status.php:528 server_status.php:563 server_status.php:676
 #: server_status.php:721
@@ -8905,12 +8863,12 @@ msgstr "Abfrageart"
 #. l10n: # = Amount of queries
 #: server_status.php:561
 msgid "#"
-msgstr ""
+msgstr "#"
 
 #: server_status.php:625
 #, php-format
 msgid "Network traffic since startup: %s"
-msgstr ""
+msgstr "Netzwerk-Datenverkehr seit Start: %s"
 
 #: server_status.php:633
 #, php-format
@@ -8989,10 +8947,10 @@ msgid "ID"
 msgstr "ID"
 
 #: server_status.php:856
-#, fuzzy
 #| msgid "Whether to enable SSL for connection to MySQL server."
 msgid "The number of failed attempts to connect to the MySQL server."
-msgstr "SSL für die MySQL Serververbindung aktivieren."
+msgstr ""
+"Die maximale Nummer an Fehlversuchen um zu einem MySQL-Server zu verbinden."
 
 #: server_status.php:857
 msgid ""
@@ -9013,6 +8971,8 @@ msgstr ""
 msgid ""
 "The number of connection attempts (successful or not) to the MySQL server."
 msgstr ""
+"Die Anzahl an Verbindungsversuchen (ob erfolgreich odernicht) zum MySQL-"
+"Server."
 
 #: server_status.php:860
 msgid ""
@@ -9450,6 +9410,8 @@ msgid ""
 "The maximum number of connections that have been in use simultaneously since "
 "the server started."
 msgstr ""
+"Die maximale Anzahl an Verbindungen die seit Serverstart gleichzeitig "
+"benutzt wurden."
 
 #: server_status.php:931
 msgid "The number of rows waiting to be written in INSERT DELAYED queues."
@@ -9484,6 +9446,9 @@ msgid ""
 "fragmentation issues, which may be solved by issuing a FLUSH QUERY CACHE "
 "statement."
 msgstr ""
+"Die Anzahl der Freien Speicher Bläcken im Abfragen-Zwischenspeicher. Hohe "
+"Werte können Fragmentierungsprobleme aufzeigen, die durch eine FLUSH QUERY "
+"CACHE - Abfrage beseitigt werden können."
 
 #: server_status.php:937
 msgid "The amount of free memory for query cache."
@@ -9780,7 +9745,7 @@ msgstr ""
 
 #: server_variables.php:58
 msgid "Setting variable failed"
-msgstr ""
+msgstr "Setzen der Variable fehlgeschlagen."
 
 #: server_variables.php:77
 msgid "Server variables and settings"
@@ -9835,16 +9800,18 @@ msgid "Insecure connection"
 msgstr "Unsichere Verbindung"
 
 #: setup/frames/index.inc.php:92
-#, fuzzy
 #| msgid "Configuration storage"
 msgid "Configuration saved."
-msgstr "Konfigurationsspeicher"
+msgstr "Konfiguration gespeichert."
 
 #: setup/frames/index.inc.php:93
 msgid ""
 "Configuration saved to file config/config.inc.php in phpMyAdmin top level "
 "directory, copy it to top level one and delete directory config to use it."
 msgstr ""
+"Konfiguration in Datei config/config.inc.php im Hauptverzeichnis von "
+"phpMyAdmin. Kopieren Sie die Datei ins Hauptverzeichnis und löschen Sie das "
+"config-Verzeichnis um phpMyAdmin zu verwenden."
 
 #: setup/frames/index.inc.php:100 setup/frames/menu.inc.php:15
 msgid "Overview"
@@ -10233,10 +10200,9 @@ msgid "Line"
 msgstr "Linie"
 
 #: tbl_chart.php:88
-#, fuzzy
 #| msgid "Inline"
 msgid "Spline"
-msgstr "Inline"
+msgstr "Profil"
 
 #: tbl_chart.php:89
 msgid "Pie"
@@ -10247,50 +10213,43 @@ msgid "Stacked"
 msgstr "Gestapelt"
 
 #: tbl_chart.php:94
-#, fuzzy
 #| msgid "Report title:"
 msgid "Chart title"
 msgstr "Titel des Reports:"
 
 #: tbl_chart.php:99
 msgid "X-Axis:"
-msgstr ""
+msgstr "X-Achse:"
 
 #: tbl_chart.php:113
-#, fuzzy
 #| msgid "SQL queries"
 msgid "Series:"
-msgstr "SQL-Abfragen"
+msgstr "Reihe:"
 
 #: tbl_chart.php:115
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "The remaining columns"
-msgstr "Textfeldspalten"
+msgstr "Die verbleibenden Spalten"
 
 #: tbl_chart.php:128
-#, fuzzy
 #| msgid "X Axis label"
 msgid "X-Axis label:"
 msgstr "Beschriftung X-Achse"
 
 #: tbl_chart.php:128
-#, fuzzy
 #| msgid "Value"
 msgid "X Values"
-msgstr "Wert"
+msgstr "X-Werte"
 
 #: tbl_chart.php:129
-#, fuzzy
 #| msgid "Y Axis label"
 msgid "Y-Axis label:"
 msgstr "Beschriftung Y-Achse"
 
 #: tbl_chart.php:129
-#, fuzzy
 #| msgid "Value"
 msgid "Y Values"
-msgstr "Wert"
+msgstr "Y-Werte"
 
 #: tbl_create.php:30
 #, php-format
@@ -10307,10 +10266,9 @@ msgid "View dump (schema) of table"
 msgstr "Dump (Schema) der Tabelle anzeigen"
 
 #: tbl_gis_visualization.php:111
-#, fuzzy
 #| msgid "Display servers selection"
 msgid "Display GIS Visualization"
-msgstr "Server-Auswahl anzeigen"
+msgstr "GIS-Darstellung anzeigen"
 
 #: tbl_gis_visualization.php:157
 msgid "Width"
@@ -10321,42 +10279,37 @@ msgid "Height"
 msgstr "Höhe"
 
 #: tbl_gis_visualization.php:165
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Label column"
-msgstr "Textfeldspalten"
+msgstr "Spaltenbeschriftung"
 
 #: tbl_gis_visualization.php:167
-#, fuzzy
 #| msgid "- none -"
 msgid "-- None --"
-msgstr "- kein -"
+msgstr "-- Kein --"
 
 #: tbl_gis_visualization.php:180
-#, fuzzy
 #| msgid "Log file count"
 msgid "Spatial column"
-msgstr "Log file Anzahl"
+msgstr "Räumliche Spalte"
 
 #: tbl_gis_visualization.php:201
 msgid "Use OpenStreetMaps as Base Layer"
-msgstr ""
+msgstr "Verwende OpenStreetMaps als Basis-Layer"
 
 #: tbl_gis_visualization.php:204
 msgid "Redraw"
 msgstr "Neu zeichnen"
 
 #: tbl_gis_visualization.php:206
-#, fuzzy
 #| msgid "Save as file"
 msgid "Save to file"
-msgstr "Senden"
+msgstr "In Datei speichern"
 
 #: tbl_gis_visualization.php:207
-#, fuzzy
 #| msgid "Table name"
 msgid "File name"
-msgstr "Tabellenname"
+msgstr "Dateiname"
 
 #: tbl_indexes.php:66
 msgid "The name of the primary key must be \"PRIMARY\"!"
@@ -10602,7 +10555,7 @@ msgstr "Sortierung nach:"
 
 #: tbl_structure.php:158 tbl_structure.php:163 tbl_structure.php:611
 msgid "Spatial"
-msgstr ""
+msgstr "Räumlich"
 
 #: tbl_structure.php:165 tbl_structure.php:169
 msgid "Browse distinct values"
@@ -10621,10 +10574,9 @@ msgid "Add unique index"
 msgstr "Eindeutigen Index hinzufügen"
 
 #: tbl_structure.php:176 tbl_structure.php:177
-#, fuzzy
 #| msgid "Add index"
 msgid "Add SPATIAL index"
-msgstr "Index hinzufügen"
+msgstr "SPATIAL Index hinzufügen"
 
 #: tbl_structure.php:178 tbl_structure.php:179
 msgid "Add FULLTEXT index"
@@ -10738,22 +10690,19 @@ msgid "Version %s snapshot (SQL code)"
 msgstr "Version %s Schnappschuss (SQL code)"
 
 #: tbl_tracking.php:382
-#, fuzzy
 #| msgid "Track these data definition statements:"
 msgid "Tracking data definition successfully deleted"
-msgstr "Verfolge diese Datenbeschreibungsbefehle (DDL):"
+msgstr "Verfolge erfolgreich gelöschte Datendefinitionen"
 
 #: tbl_tracking.php:384 tbl_tracking.php:401
-#, fuzzy
 #| msgid "Gather errors"
 msgid "Query error"
-msgstr "Fehler sammeln"
+msgstr "Abfrage-Fehler"
 
 #: tbl_tracking.php:399
-#, fuzzy
 #| msgid "Track these data manipulation statements:"
 msgid "Tracking data manipulation successfully deleted"
-msgstr "Verfolge diese Datenbearbeitungsbefehle (DML):"
+msgstr "Verfolge erfolgreich gelöschte Datenmanipulationen"
 
 #: tbl_tracking.php:411
 msgid "Tracking statements"
@@ -10765,16 +10714,14 @@ msgid "Show %s with dates from %s to %s by user %s %s"
 msgstr "Zeige %s mit Datum von %s bis %s und Benutzer %s %s"
 
 #: tbl_tracking.php:432
-#, fuzzy
 #| msgid "Delete tracking data for this table"
 msgid "Delete tracking data row from report"
-msgstr "Lösche die Verlaufsdaten für diese Tabelle"
+msgstr "Lösche die Verlaufsdaten des Datensatzes"
 
 #: tbl_tracking.php:443
-#, fuzzy
 #| msgid "No databases"
 msgid "No data"
-msgstr "Keine Datenbanken"
+msgstr "Keine Daten"
 
 #: tbl_tracking.php:453 tbl_tracking.php:510
 msgid "Date"
diff --git a/po/el.po b/po/el.po
index b2605348f3..a12ea320f0 100644
--- a/po/el.po
+++ b/po/el.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-03 07:35-0400\n"
-"PO-Revision-Date: 2011-06-23 10:24+0200\n"
+"PO-Revision-Date: 2011-07-01 12:28+0200\n"
 "Last-Translator: Panagiotis Papazoglou <papaz_p@yahoo.com>\n"
 "Language-Team: greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -527,10 +527,10 @@ msgstr ""
 
 #: db_routines.php:192 db_routines.php:297 db_routines.php:302
 #: db_routines.php:326
-#, fuzzy, php-format
+#, php-format
 #| msgid "The following queries have been executed:"
 msgid "The following query has failed: \"%s\""
-msgstr "Το ερώτημα «%s» απέτυχε"
+msgstr "Το ακόλουθο ερώτημα έχει αποτύχει: «%s»"
 
 #: db_routines.php:193 db_routines.php:298 db_routines.php:303
 #: db_routines.php:313 db_routines.php:327 libraries/common.lib.php:581
@@ -544,10 +544,10 @@ msgstr "Σφάλμα στην προώθηση αιτημάτος"
 
 #: db_routines.php:211 db_routines.php:243 db_routines.php:271
 #: db_routines.php:410
-#, fuzzy, php-format
+#, php-format
 #| msgid "No routine with name %s found in database %s"
 msgid "No routine with name %1$s found in database %2$s"
-msgstr "Καμιά ρουτίνα με την ονομασία %s δεν βρέθηκε στη βάση δεδομένων %s"
+msgstr "Καμιά ρουτίνα με την ονομασία %1$s δεν βρέθηκε στη βάση δεδομένων %2$s"
 
 #: db_routines.php:232 db_routines.php:236
 msgid "Execute routine"
@@ -4836,10 +4836,9 @@ msgid "Turn it off"
 msgstr "Απενεργοποιήστε τον"
 
 #: libraries/db_events.inc.php:141
-#, fuzzy
 #| msgid "Add a new Event"
 msgid "Add an event"
-msgstr "Προσθήκη ενός νέου Συμβάντος"
+msgstr "Προσθήκη ενός συμβάντος"
 
 #: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43
 #: libraries/db_links.inc.php:44
@@ -5525,10 +5524,9 @@ msgid "Event"
 msgstr "Συμβάν"
 
 #: libraries/display_triggers.inc.php:120
-#, fuzzy
 #| msgid "Add a new Trigger"
 msgid "Add a trigger"
-msgstr "Προσθήκη μιας νέας Ενέργειας"
+msgstr "Προσθήκη μιας ενέργειας"
 
 #: libraries/engines/bdb.lib.php:20 main.php:211
 msgid "Version information"
@@ -7310,10 +7308,9 @@ msgid "PARTITION definition"
 msgstr "Ορισμός ΚΑΤΑΤΜΗΣΗΣ (PARTITION)"
 
 #: libraries/tbl_properties.inc.php:776
-#, fuzzy
 #| msgid "+ Add a new value"
 msgid "+ Add a value"
-msgstr "+ Προσθήκη νέας τιμής"
+msgstr "+ Προσθήκη μιας τιμής"
 
 #: libraries/transformations/application_octetstream__download.inc.php:9
 msgid ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c924aa7112..32bb4e075c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-03 07:35-0400\n"
-"PO-Revision-Date: 2011-06-30 23:48+0200\n"
-"Last-Translator:  <wiltave@gmail.com>\n"
+"PO-Revision-Date: 2011-07-05 15:06+0200\n"
+"Last-Translator:  <vitorpc.18@gmail.com>\n"
 "Language-Team: brazilian_portuguese <pt_BR@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -478,7 +478,6 @@ msgid "Add/Delete criteria rows"
 msgstr "Adicionar/Remover critérios de linha"
 
 #: db_qbe.php:618
-#, fuzzy
 #| msgid "Add/Delete Field Columns"
 msgid "Add/Delete columns"
 msgstr "Adicionar/Remover colunas"
@@ -511,8 +510,8 @@ msgstr "Seu comando SQL foi executado com sucesso"
 #, 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] ""
+msgstr[0] "%d linha afetada pela última instrução dentro do procedimento"
+msgstr[1] "%d linhas afetadas pela última instrução dentro do procedimento"
 
 #: db_routines.php:167
 #, php-format
@@ -526,10 +525,10 @@ msgstr "MySQL retornou um conjunto vazio (ex. zero registros)."
 
 #: db_routines.php:192 db_routines.php:297 db_routines.php:302
 #: db_routines.php:326
-#, fuzzy, php-format
+#, php-format
 #| msgid "The following queries have been executed:"
 msgid "The following query has failed: \"%s\""
-msgstr "As seguintes consultas foram executadas:"
+msgstr "A seguinte consulta falhou: \"%s\""
 
 #: db_routines.php:193 db_routines.php:298 db_routines.php:303
 #: db_routines.php:313 db_routines.php:327 libraries/common.lib.php:581
@@ -538,68 +537,66 @@ msgstr "Mensagens do MySQL : "
 
 #: db_routines.php:210 db_routines.php:242 db_routines.php:270
 #: db_routines.php:409
-#, fuzzy
 #| msgid "Error in Processing Request"
 msgid "Error in processing request"
 msgstr "Erro no processamento da requisição"
 
 #: db_routines.php:211 db_routines.php:243 db_routines.php:271
 #: db_routines.php:410
-#, fuzzy, php-format
+#, php-format
 #| msgid "No tables found in database"
 msgid "No routine with name %1$s found in database %2$s"
-msgstr "Nenhuma tabela encontrada no banco de dados"
+msgstr "Nenhuma rotina com o nome %1$s encontrada no banco de dados %2$s"
 
 #: db_routines.php:232 db_routines.php:236
 msgid "Execute routine"
-msgstr ""
+msgstr "Executar rotina"
 
 #: db_routines.php:261 db_routines.php:265
-#, fuzzy, php-format
+#, php-format
 msgid "Export of routine %s"
-msgstr "Importar arquivos"
+msgstr "Exportação de rotina %s"
 
 #: db_routines.php:290 libraries/db_routines.lib.php:911
-#, fuzzy, php-format
+#, php-format
 #| msgid "Invalid server index: \"%s\""
 msgid "Invalid routine type: \"%s\""
-msgstr "Índice de servidor inválido: \"%s\""
+msgstr "Tipo de rotina inválido: \"%s\""
 
 #: db_routines.php:311
 msgid "Sorry, we failed to restore the dropped routine."
-msgstr ""
+msgstr "Desculpa, mas falhamos ao restaurar a rotina."
 
 #: db_routines.php:312
 msgid "The backed up query was:"
-msgstr ""
+msgstr "A consulta de backup foi:"
 
 #: db_routines.php:316
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %s has been dropped"
 msgid "Routine %1$s has been modified."
-msgstr "Tabela %s foi eliminada"
+msgstr "A rotina %1$s foi modificada."
 
 #: db_routines.php:329
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %1$s has been created."
 msgid "Routine %1$s has been created."
-msgstr "A tabela %1$s foi criada."
+msgstr "A rotina %1$s foi criada."
 
 #: db_routines.php:337
 msgid "<b>One or more errors have occured while processing your request:</b>"
 msgstr ""
+"<b>Um ou mais erros ocorreram durante o processamento de sua requisição:</b>"
 
 #: db_routines.php:381
-#, fuzzy
 #| msgid "Create relation"
 msgid "Create routine"
-msgstr "Criar relacionamento"
+msgstr "Criar rotina"
 
 #: db_routines.php:385
-#, fuzzy
 #| msgid "Edit server"
 msgid "Edit routine"
-msgstr "Editar servidor"
+msgstr "Editar rotina"
 
 #: db_routines.php:436
 msgid ""
@@ -678,7 +675,6 @@ msgid "Search in database"
 msgstr "Procurar no Banco de Dados"
 
 #: db_search.php:275
-#, fuzzy
 #| msgid "Word(s) or value(s) to search for (wildcard: \"%\"):"
 msgid "Words or values to search for (wildcard: \"%\"):"
 msgstr "Palavra(s) ou valor(es) para procurar (coringa: \"%\"):"
@@ -692,7 +688,6 @@ msgid "Words are separated by a space character (\" \")."
 msgstr "Palavras são separadas por um caracter de espaço (\" \")."
 
 #: db_search.php:298
-#, fuzzy
 #| msgid "Inside table(s):"
 msgid "Inside tables:"
 msgstr "Dentro da(s) tabela(s):"
@@ -1118,7 +1113,6 @@ msgstr "Isto não é um número!"
 
 #. l10n: Default description for the y-Axis of Charts
 #: js/messages.php:49
-#, fuzzy
 #| msgid "Total"
 msgid "Total count"
 msgstr "Total"
@@ -1167,23 +1161,21 @@ msgid "Edit"
 msgstr "Editar"
 
 #: js/messages.php:64 server_status.php:420
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Live traffic chart"
-msgstr "Seleção do Servidor"
+msgstr "Gráfico de tráfego em tempo real"
 
 #: js/messages.php:65 server_status.php:423
 msgid "Live conn./process chart"
 msgstr ""
 
 #: js/messages.php:66 server_status.php:445
-#, fuzzy
 msgid "Live query chart"
-msgstr "consulta SQL"
+msgstr "Gráfico de consulta em tempo real"
 
 #: js/messages.php:68
 msgid "Static data"
-msgstr ""
+msgstr "Dado(s) estático(s)"
 
 #. l10n: Total number of queries
 #: js/messages.php:70 libraries/build_html_for_db.lib.php:45
@@ -1196,7 +1188,7 @@ msgstr "Total"
 #. l10n: Other, small valued, queries
 #: js/messages.php:72 server_status.php:602
 msgid "Other"
-msgstr ""
+msgstr "Outro"
 
 #. l10n: Thousands separator
 #: js/messages.php:74 libraries/common.lib.php:1322
@@ -1210,35 +1202,33 @@ msgstr "."
 
 #: js/messages.php:78
 msgid "KiB sent since last refresh"
-msgstr ""
+msgstr "KiB enviados desde a última atualização"
 
 #: js/messages.php:79
 msgid "KiB received since last refresh"
-msgstr ""
+msgstr "KiB recebidos desde a última atualização"
 
 #: js/messages.php:80
-#, fuzzy
 #| msgid "Server Choice"
 msgid "Server traffic (in KiB)"
-msgstr "Seleção do Servidor"
+msgstr "Tráfego do Servidor (em KiB)"
 
 #: js/messages.php:81
 msgid "Connections since last refresh"
-msgstr ""
+msgstr "Conexões desde a última atualização"
 
 #: js/messages.php:82 server_status.php:794
 msgid "Processes"
 msgstr "Processos"
 
 #: js/messages.php:83
-#, fuzzy
 #| msgid "Connections"
 msgid "Connections / Processes"
-msgstr "Conexões"
+msgstr "Conexões / Processos"
 
 #: js/messages.php:84
 msgid "Issued queries since last refresh"
-msgstr ""
+msgstr "Consultas emitidas desde a última atualização"
 
 #: js/messages.php:85
 #, fuzzy
diff --git a/po/ru.po b/po/ru.po
index bee1dc64dd..bc648e4989 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-03 07:35-0400\n"
-"PO-Revision-Date: 2011-06-24 21:23+0200\n"
+"PO-Revision-Date: 2011-07-03 19:50+0200\n"
 "Last-Translator: Victor Volkov <hanut@php-myadmin.ru>\n"
 "Language-Team: russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -687,10 +687,9 @@ msgid "Words are separated by a space character (\" \")."
 msgstr "Слова разделяются пробелом (\" \")."
 
 #: db_search.php:298
-#, fuzzy
 #| msgid "Inside table(s):"
 msgid "Inside tables:"
-msgstr "В таблице/таблицах:"
+msgstr "В таблицах:"
 
 #: db_search.php:328
 msgid "Inside column:"
@@ -1199,41 +1198,38 @@ msgstr "."
 
 #: js/messages.php:78
 msgid "KiB sent since last refresh"
-msgstr ""
+msgstr "Отправлено KiB с момента последнего обновления"
 
 #: js/messages.php:79
 msgid "KiB received since last refresh"
-msgstr ""
+msgstr "Принято KiB с момента последнего обновления"
 
 #: js/messages.php:80
-#, fuzzy
 #| msgid "Server traffic"
 msgid "Server traffic (in KiB)"
-msgstr "Трафик сервера"
+msgstr "Трафик сервера (в KiB)"
 
 #: js/messages.php:81
 msgid "Connections since last refresh"
-msgstr ""
+msgstr "Соединений с момента последнего обновления"
 
 #: js/messages.php:82 server_status.php:794
 msgid "Processes"
 msgstr "Процессы"
 
 #: js/messages.php:83
-#, fuzzy
 #| msgid "Connections"
 msgid "Connections / Processes"
-msgstr "Соединения"
+msgstr "Соединения / Процессы"
 
 #: js/messages.php:84
 msgid "Issued queries since last refresh"
-msgstr ""
+msgstr "Выполнено запросов с момента последнего обновления"
 
 #: js/messages.php:85
-#, fuzzy
 #| msgid "SQL queries"
 msgid "Issued queries"
-msgstr "SQL запросы"
+msgstr "Выполнено запросов"
 
 #: js/messages.php:87 server_status.php:402
 msgid "Query statistics"
@@ -1334,13 +1330,12 @@ msgstr "Удаление"
 
 #: js/messages.php:124
 msgid "The definition of a stored function must contain a RETURN statement!"
-msgstr ""
+msgstr "Определение хранимой функции должно содержать выражение RETURN!"
 
 #: js/messages.php:125
-#, fuzzy
 #| msgid "Missing value in the form!"
 msgid "Value too long in the form!"
-msgstr "Не заполнены необходимые поля формы!"
+msgstr "Значение в форме имеет слишком большую длину!"
 
 #: js/messages.php:128
 msgid ""
@@ -1919,7 +1914,7 @@ msgstr "Путь к файлам темы %s не найден!"
 
 #: libraries/Theme_Manager.class.php:286 themes.php:20 themes.php:40
 msgid "Theme"
-msgstr ""
+msgstr "Тема"
 
 #: libraries/auth/config.auth.lib.php:76
 msgid "Cannot connect: invalid settings."
@@ -2120,16 +2115,17 @@ msgid "Check Privileges"
 msgstr "Проверить привилегии"
 
 #: libraries/common.inc.php:587
-#, fuzzy
 #| msgid "Could not save configuration"
 msgid "Failed to read configuration file"
-msgstr "Не получилось сохранить настройки"
+msgstr "Ошибка при чтении конфигурационного файла"
 
 #: libraries/common.inc.php:588
 msgid ""
 "This usually means there is a syntax error in it, please check any errors "
 "shown below."
 msgstr ""
+"Обычно это означает наличие синтаксических ошибок, пожалуйста, проверьте "
+"выведенные ниже ошибки."
 
 #: libraries/common.inc.php:595
 #, php-format
@@ -2375,7 +2371,7 @@ msgstr "Файлы для загрузки отсутствуют"
 
 #: libraries/common.lib.php:2849 libraries/common.lib.php:2850
 msgid "Execute"
-msgstr ""
+msgstr "Выполнить"
 
 #: libraries/config.values.php:45 libraries/config.values.php:47
 #: libraries/config.values.php:51
@@ -3232,8 +3228,8 @@ msgid ""
 "storage[/a] in documentation"
 msgstr ""
 "Настройка phpMyAdmin для установки расширенных возможностей. Смотрите в "
-"документации раздел описывающий [a@../Documentation.html#linked-tables]"
-"хранение конфигурации[/a]"
+"документации раздел описывающий [a@Documentation.html#linked-tables]хранение "
+"конфигурации[/a]"
 
 #: libraries/config/messages.inc.php:206
 msgid "Changes tracking"
@@ -4787,22 +4783,22 @@ msgid "The %s extension is missing. Please check your PHP configuration."
 msgstr "Расширение %s не найдено. Пожалуйста, проверьте ваши настройки PHP."
 
 #: libraries/db_events.inc.php:30
-#, fuzzy, php-format
+#, php-format, fuzzy
 #| msgid "Export contents"
 msgid "Export of event %s"
 msgstr "Экспортировать содержимое"
 
 #: libraries/db_events.inc.php:34
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export contents"
 msgid "Export of event \"%s\""
-msgstr "Экспортировать содержимое"
+msgstr "Экспорт события \"%s\""
 
 #: libraries/db_events.inc.php:40
-#, fuzzy, php-format
+#, php-format
 #| msgid "No tables found in database"
 msgid "No event with name %s found in database %s"
-msgstr "Таблиц в базе данных не найдено"
+msgstr "В базе данных %2$s не найдено событие с именем %1$s"
 
 #: libraries/db_events.inc.php:56 libraries/db_links.inc.php:101
 #: libraries/export/sql.php:609
@@ -4810,10 +4806,9 @@ msgid "Events"
 msgstr "События"
 
 #: libraries/db_events.inc.php:58 libraries/db_events.inc.php:60
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no events to display."
-msgstr "Файлы для загрузки отсутствуют"
+msgstr "Отсутствуют события для отображения."
 
 #: libraries/db_events.inc.php:67 libraries/db_routines.lib.php:661
 #: libraries/db_routines.lib.php:807 libraries/db_routines.lib.php:1156
@@ -4825,25 +4820,24 @@ msgstr "Имя"
 
 #: libraries/db_events.inc.php:129
 msgid "The event scheduler is enabled"
-msgstr ""
+msgstr "Включен планировщик событий"
 
 #: libraries/db_events.inc.php:129
 msgid "The event scheduler is disabled"
-msgstr ""
+msgstr "Отключен планировщик событий"
 
 #: libraries/db_events.inc.php:131
 msgid "Turn it on"
-msgstr ""
+msgstr "Включить"
 
 #: libraries/db_events.inc.php:131
 msgid "Turn it off"
-msgstr ""
+msgstr "Выключить"
 
 #: libraries/db_events.inc.php:141
-#, fuzzy
 #| msgid "Add a new server"
 msgid "Add an event"
-msgstr "Добавить новый сервер"
+msgstr "Добавить событие"
 
 #: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43
 #: libraries/db_links.inc.php:44
@@ -4879,32 +4873,29 @@ msgid "Triggers"
 msgstr "Триггеры"
 
 #: libraries/db_routines.lib.php:630
-#, fuzzy
 #| msgid "Details..."
 msgid "Details"
-msgstr "Детали..."
+msgstr "Детали"
 
 #: libraries/db_routines.lib.php:633
-#, fuzzy
 #| msgid "Routines"
 msgid "Routine name"
-msgstr "Процедуры"
+msgstr "Имя процедуры"
 
 #: libraries/db_routines.lib.php:650
-#, fuzzy, php-format
+#, php-format
 #| msgid "Change"
 msgid "Change to %s"
-msgstr "Изменить"
+msgstr "Изменить на %s"
 
 #: libraries/db_routines.lib.php:655
 msgid "Parameters"
-msgstr ""
+msgstr "Параметры"
 
 #: libraries/db_routines.lib.php:660
-#, fuzzy
 #| msgid "Direct links"
 msgid "Direction"
-msgstr "Прямые линии связей"
+msgstr "Направление"
 
 #: libraries/db_routines.lib.php:663 libraries/tbl_properties.inc.php:105
 msgid "Length/Values"
@@ -4929,62 +4920,55 @@ msgid "Options"
 msgstr "Параметры"
 
 #: libraries/db_routines.lib.php:678
-#, fuzzy
 #| msgid "Add prefix"
 msgid "Add parameter"
-msgstr "Добавить префикс"
+msgstr "Добавить параметр"
 
 #: libraries/db_routines.lib.php:681
-#, fuzzy
 #| msgid "Remove database"
 msgid "Remove last parameter"
-msgstr "Удалить базу данных"
+msgstr "Удалить последний параметр"
 
 #: libraries/db_routines.lib.php:686 libraries/db_routines.lib.php:1159
 msgid "Return type"
 msgstr "Возвращаемый тип"
 
 #: libraries/db_routines.lib.php:692
-#, fuzzy
 #| msgid "Length/Values"
 msgid "Return length/values"
-msgstr "Длина/значения"
+msgstr "Вернуть длину/значения"
 
 #: libraries/db_routines.lib.php:697
-#, fuzzy
 #| msgid "Table options"
 msgid "Return options"
-msgstr "Параметры таблицы"
+msgstr "Вернуть параметры"
 
 #: libraries/db_routines.lib.php:716
-#, fuzzy
 #| msgid "Description"
 msgid "Definition"
-msgstr "Описание"
+msgstr "Определение"
 
 #: libraries/db_routines.lib.php:720
 msgid "Is deterministic"
-msgstr ""
+msgstr "Определяющий"
 
 #: libraries/db_routines.lib.php:724
 msgid "Definer"
-msgstr ""
+msgstr "Определитель"
 
 #: libraries/db_routines.lib.php:729
-#, fuzzy
 #| msgid "Security"
 msgid "Security type"
-msgstr "Безопасность"
+msgstr "Тип безопасности"
 
 #: libraries/db_routines.lib.php:736
 msgid "SQL data access"
-msgstr ""
+msgstr "Доступ к SQL данным"
 
 #: libraries/db_routines.lib.php:800 libraries/db_routines.lib.php:803
-#, fuzzy
 #| msgid "Routines"
 msgid "Routine parameters"
-msgstr "Процедуры"
+msgstr "Параметры процедуры"
 
 #: libraries/db_routines.lib.php:810 tbl_change.php:284 tbl_change.php:322
 msgid "Function"
@@ -4999,59 +4983,55 @@ msgstr "Значение"
 
 #: libraries/db_routines.lib.php:916
 msgid "You must provide a routine name"
-msgstr ""
+msgstr "Необходимо задать имя процедуры"
 
 #: libraries/db_routines.lib.php:935
 #, php-format
 msgid "Invalid direction \"%s\" given for parameter."
-msgstr ""
+msgstr "\"%s\" является ошибочным параметром."
 
 #: libraries/db_routines.lib.php:946 libraries/db_routines.lib.php:987
 msgid ""
 "You must provide length/values for routine parameters of type ENUM, SET, "
 "VARCHAR and VARBINARY."
 msgstr ""
+"Вы должны задать длину/значения для параметров процедуры имеющих тип ENUM, "
+"SET, VARCHAR и VARBINARY."
 
 #: libraries/db_routines.lib.php:971
 msgid "You must provide a name and a type for each routine parameter."
-msgstr ""
+msgstr "Вы должны задать имя и тип для каждого параметра процедуры."
 
 #: libraries/db_routines.lib.php:1028
 msgid "You must provide a routine definition."
-msgstr ""
+msgstr "Вы должны задать определение процедуры."
 
 #: libraries/db_routines.lib.php:1151
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no routines to display."
-msgstr "Файлы для загрузки отсутствуют"
+msgstr "Нет процедур для отображения."
 
 #: libraries/db_routines.lib.php:1192
-#, fuzzy
 #| msgid "Add index"
 msgid "Add routine"
-msgstr "Добавить индекс"
+msgstr "Добавить процедуру"
 
 #: libraries/db_routines.lib.php:1195
-#, fuzzy
 #| msgid "You don't have sufficient privileges to be here right now!"
 msgid "You do not have the necessary privileges to create a new routine"
-msgstr "Для доступа к данной странице у вас недостаточно прав!"
+msgstr "У вас недостаточно прав для создания новой процедуры"
 
 #: libraries/db_structure.lib.php:43 libraries/display_tbl.lib.php:2084
 msgid ""
 "May be approximate. See [a@./Documentation.html#faq3_11@Documentation]FAQ "
 "3.11[/a]"
 msgstr ""
-"Может быть приблизительно. Смотрите [a@./Documentation."
-"html#faq3_11@Documentation]FAQ 3.11[/a]"
+"Может быть примерно. Смотрите "
+"[a@./Documentation.html#faq3_11@Documentation]FAQ 3.11[/a]"
 
 #: libraries/dbi/mysql.dbi.lib.php:111 libraries/dbi/mysqli.dbi.lib.php:112
 msgid "Connection for controluser as defined in your configuration failed."
-msgstr ""
-"Не удалось установить подключение для пользователя указанного в директиве "
-"controluser, с помощью параметров определенных в конфигурационном файле "
-"config.inc.php."
+msgstr "Ошибка при указании соединения для controluser в конфигурации."
 
 #: libraries/dbi/mysql.dbi.lib.php:324 libraries/dbi/mysql.dbi.lib.php:326
 #: libraries/dbi/mysqli.dbi.lib.php:351
@@ -5060,7 +5040,7 @@ msgstr "Сервер не отвечает"
 
 #: libraries/dbi/mysql.dbi.lib.php:324 libraries/dbi/mysqli.dbi.lib.php:351
 msgid "(or the local MySQL server's socket is not correctly configured)"
-msgstr "(либо сокет локального MySQL-сервера некорректно настроен)"
+msgstr "(либо локальный сокет MySQL неверно настроен)"
 
 #: libraries/dbi/mysql.dbi.lib.php:333
 msgid "Details..."
@@ -5460,15 +5440,15 @@ msgstr "Преобразование"
 
 #: libraries/display_tbl.lib.php:650
 msgid "Geometry"
-msgstr ""
+msgstr "Геометрия"
 
 #: libraries/display_tbl.lib.php:651
 msgid "Well Known Text"
-msgstr ""
+msgstr "Текст (WKT)"
 
 #: libraries/display_tbl.lib.php:652
 msgid "Well Known Binary"
-msgstr ""
+msgstr "Бинарный (WKB)"
 
 #: libraries/display_tbl.lib.php:1303
 msgid "Copy"
@@ -5514,7 +5494,7 @@ msgstr "Отобразить график"
 
 #: libraries/display_tbl.lib.php:2509
 msgid "Visualize GIS data"
-msgstr ""
+msgstr "Визуализация GIS данных"
 
 #: libraries/display_tbl.lib.php:2529
 msgid "Create view"
@@ -5525,27 +5505,26 @@ msgid "Link not found"
 msgstr "Связь не найдена"
 
 #: libraries/display_triggers.inc.php:35
-#, fuzzy, php-format
+#, php-format
 #| msgid "Export contents"
 msgid "Export of trigger %s"
-msgstr "Экспортировать содержимое"
+msgstr "Экспорт триггера %s"
 
 #: libraries/display_triggers.inc.php:39
 #, php-format
 msgid "Export of trigger \"%s\""
-msgstr ""
+msgstr "Экспорт триггера \"%s\""
 
 #: libraries/display_triggers.inc.php:47
-#, fuzzy, php-format
+#, php-format
 #| msgid "No valid image path for theme %s found!"
 msgid "No trigger with name %s found"
-msgstr "Не найден правильный путь к изображениям для темы %s!"
+msgstr "Не найден триггер с именем %s"
 
 #: libraries/display_triggers.inc.php:64 libraries/display_triggers.inc.php:66
-#, fuzzy
 #| msgid "There are no files to upload"
 msgid "There are no triggers to display."
-msgstr "Файлы для загрузки отсутствуют"
+msgstr "Отсутствуют триггеры для отображения."
 
 #: libraries/display_triggers.inc.php:77 server_status.php:800 sql.php:943
 msgid "Time"
@@ -5556,10 +5535,9 @@ msgid "Event"
 msgstr "Событие"
 
 #: libraries/display_triggers.inc.php:120
-#, fuzzy
 #| msgid "Add a new server"
 msgid "Add a trigger"
-msgstr "Добавить новый сервер"
+msgstr "Добавить триггер"
 
 #: libraries/engines/bdb.lib.php:20 main.php:211
 msgid "Version information"
@@ -6327,10 +6305,9 @@ msgid "Open new phpMyAdmin window"
 msgstr "Открыть phpMyAdmin в новом окне"
 
 #: libraries/gis_visualization.lib.php:129
-#, fuzzy
 #| msgid "No data found for the chart."
 msgid "No data found for GIS visualization."
-msgstr "Данные для графика не найдены."
+msgstr "Данные для визуализации GIS не найдены."
 
 #: libraries/header_printview.inc.php:49 libraries/header_printview.inc.php:54
 msgid "SQL result"
@@ -7338,10 +7315,9 @@ msgid "PARTITION definition"
 msgstr "Определение разделов (PARTITION)"
 
 #: libraries/tbl_properties.inc.php:776
-#, fuzzy
 #| msgid "+ Add a new value"
 msgid "+ Add a value"
-msgstr "+ Добавить новое значение"
+msgstr "+ Добавить значение"
 
 #: libraries/transformations/application_octetstream__download.inc.php:9
 msgid ""
@@ -8683,22 +8659,22 @@ msgid "Refresh rate"
 msgstr "Частота обновления"
 
 #: server_status.php:31
-#, fuzzy, php-format
+#, php-format
 #| msgid "minutes"
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] "минуты"
-msgstr[1] "минуты"
-msgstr[2] "минуты"
+msgstr[0] "%d минута"
+msgstr[1] "%d минуты"
+msgstr[2] "%d минут"
 
 #: server_status.php:33
-#, fuzzy, php-format
+#, php-format
 #| msgid "second"
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] "секунда"
-msgstr[1] "секунда"
-msgstr[2] "секунда"
+msgstr[0] "%d секунда"
+msgstr[1] "%d секунды"
+msgstr[2] "%d секунд"
 
 #: server_status.php:134
 #, php-format
@@ -8782,10 +8758,9 @@ msgid "All status variables"
 msgstr "Все переменные состояния"
 
 #: server_status.php:413 server_status.php:439
-#, fuzzy
 #| msgid "Refresh rate"
 msgid "Refresh rate:"
-msgstr "Частота обновления"
+msgstr "Частота обновления:"
 
 #: server_status.php:462
 msgid "Containing the word:"
@@ -9228,7 +9203,7 @@ msgstr "Количество записей с помощью fsync(), сдел
 #: server_status.php:906
 msgid "The number of pending log file fsyncs."
 msgstr ""
-"Количество незавершенных попыток синхронизации с помощью операции fsync()."
+"Количество незавершенных попыток синхронизации с помощью операции fsync."
 
 #: server_status.php:907
 msgid "Pending log file writes."
@@ -9382,7 +9357,7 @@ msgstr "Количество открытых файлов."
 msgid "The number of streams that are open (used mainly for logging)."
 msgstr ""
 "Количество открытых потоков (применяется к файлам журналов). Потоком "
-"называется файл, открытый с помощью функции fopen()."
+"называется файл, открытый с помощью функции fopen."
 
 #: server_status.php:935
 msgid "The number of tables that are open."
@@ -9700,7 +9675,7 @@ msgstr ""
 
 #: server_variables.php:58
 msgid "Setting variable failed"
-msgstr ""
+msgstr "Не удалось установить переменную"
 
 #: server_variables.php:77
 msgid "Server variables and settings"
@@ -10213,10 +10188,9 @@ msgid "View dump (schema) of table"
 msgstr "Отобразить дамп (схему) таблицы"
 
 #: tbl_gis_visualization.php:111
-#, fuzzy
 #| msgid "Display servers selection"
 msgid "Display GIS Visualization"
-msgstr "Отображать выбор сервера"
+msgstr "Визуализация GIS данных"
 
 #: tbl_gis_visualization.php:157
 msgid "Width"
@@ -10227,42 +10201,37 @@ msgid "Height"
 msgstr "Высота"
 
 #: tbl_gis_visualization.php:165
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Label column"
-msgstr "Столбцов в текстовом поле"
+msgstr "Название столбца"
 
 #: tbl_gis_visualization.php:167
-#, fuzzy
 #| msgid "- none -"
 msgid "-- None --"
-msgstr "- не выбран -"
+msgstr "-- Пусто --"
 
 #: tbl_gis_visualization.php:180
-#, fuzzy
 #| msgid "Total count"
 msgid "Spatial column"
-msgstr "Общее количество"
+msgstr "Пространственный столбец"
 
 #: tbl_gis_visualization.php:201
 msgid "Use OpenStreetMaps as Base Layer"
-msgstr ""
+msgstr "Используйте в качестве основного слоя OpenStreetMaps"
 
 #: tbl_gis_visualization.php:204
 msgid "Redraw"
 msgstr "Пересоздать"
 
 #: tbl_gis_visualization.php:206
-#, fuzzy
 #| msgid "Save as file"
 msgid "Save to file"
-msgstr "Сохранить как файл"
+msgstr "Сохранить в файл"
 
 #: tbl_gis_visualization.php:207
-#, fuzzy
 #| msgid "Table name"
 msgid "File name"
-msgstr "Имя таблицы"
+msgstr "Имя файла"
 
 #: tbl_indexes.php:66
 msgid "The name of the primary key must be \"PRIMARY\"!"
@@ -10295,7 +10264,7 @@ msgstr "Тип индекса&nbsp;:"
 #: tbl_indexes.php:189
 msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
-msgstr "(Имя \"PRIMARY\" должен иметь <b>только</b> первичный индекс!)"
+msgstr "(Имя \"PRIMARY\" <b>должен</b> иметь <b>только</b> первичный индекс!)"
 
 #: tbl_indexes.php:263
 #, php-format
@@ -10505,7 +10474,7 @@ msgstr "Сортировка:"
 
 #: tbl_structure.php:158 tbl_structure.php:163 tbl_structure.php:611
 msgid "Spatial"
-msgstr ""
+msgstr "Пространственный"
 
 #: tbl_structure.php:165 tbl_structure.php:169
 msgid "Browse distinct values"
@@ -10524,10 +10493,9 @@ msgid "Add unique index"
 msgstr "Добавить уникальный индекс"
 
 #: tbl_structure.php:176 tbl_structure.php:177
-#, fuzzy
 #| msgid "Add index"
 msgid "Add SPATIAL index"
-msgstr "Добавить индекс"
+msgstr "Добавить пространственный индекс"
 
 #: tbl_structure.php:178 tbl_structure.php:179
 msgid "Add FULLTEXT index"
diff --git a/po/sl.po b/po/sl.po
index 9a30fe2e97..bc646778e0 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,15 +4,15 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-03 07:35-0400\n"
-"PO-Revision-Date: 2011-06-25 10:41+0200\n"
+"PO-Revision-Date: 2011-07-03 19:04+0200\n"
 "Last-Translator: Domen <dbc334@gmail.com>\n"
 "Language-Team: slovenian <sl@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
-"%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || "
+"n%100==4 ? 2 : 3);\n"
 "X-Generator: Pootle 2.0.5\n"
 
 #: browse_foreigners.php:35 browse_foreigners.php:53
@@ -4780,10 +4780,9 @@ msgid "Turn it off"
 msgstr "Izklopi ga"
 
 #: libraries/db_events.inc.php:141
-#, fuzzy
 #| msgid "Add a new Event"
 msgid "Add an event"
-msgstr "Dodaj nov dogodek"
+msgstr "Dodaj dogodek"
 
 #: libraries/db_links.inc.php:42 libraries/db_links.inc.php:43
 #: libraries/db_links.inc.php:44
@@ -5467,10 +5466,9 @@ msgid "Event"
 msgstr "Dogodek"
 
 #: libraries/display_triggers.inc.php:120
-#, fuzzy
 #| msgid "Add a new Trigger"
 msgid "Add a trigger"
-msgstr "Dodaj nov sprožilec"
+msgstr "Dodaj sprožilec"
 
 #: libraries/engines/bdb.lib.php:20 main.php:211
 msgid "Version information"
@@ -7242,10 +7240,9 @@ msgid "PARTITION definition"
 msgstr "Definicija PARTITION"
 
 #: libraries/tbl_properties.inc.php:776
-#, fuzzy
 #| msgid "+ Add a new value"
 msgid "+ Add a value"
-msgstr "+ Dodaj novo vrednost"
+msgstr "+ Dodaj vrednost"
 
 #: libraries/transformations/application_octetstream__download.inc.php:9
 msgid ""
diff --git a/po/uk.po b/po/uk.po
index b99bd79521..b7457581f5 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 3.5.0-dev\n"
 "Report-Msgid-Bugs-To: phpmyadmin-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2011-07-03 07:35-0400\n"
-"PO-Revision-Date: 2011-06-17 10:55+0200\n"
-"Last-Translator: Michal Čihař <michal@cihar.com>\n"
+"PO-Revision-Date: 2011-07-03 18:10+0200\n"
+"Last-Translator:  <vovka2008@gmail.com>\n"
 "Language-Team: ukrainian <uk@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -538,10 +538,9 @@ msgstr "Відповідь MySQL: "
 
 #: db_routines.php:210 db_routines.php:242 db_routines.php:270
 #: db_routines.php:409
-#, fuzzy
 #| msgid "Processing Request"
 msgid "Error in processing request"
-msgstr "Обробка запиту"
+msgstr "Помилка при обробці запиту"
 
 #: db_routines.php:211 db_routines.php:243 db_routines.php:271
 #: db_routines.php:410
@@ -833,10 +832,9 @@ msgid "Replace table prefix"
 msgstr "Замінити дані таблиці даними з файлу"
 
 #: db_structure.php:518 libraries/mult_submits.inc.php:251
-#, fuzzy
 #| msgid "Replace table data with file"
 msgid "Copy table with prefix"
-msgstr "Замінити дані таблиці даними з файлу"
+msgstr "Копіювати таблицю з префіксом"
 
 #: db_structure.php:560 libraries/schema/User_Schema.class.php:383
 msgid "Data Dictionary"
@@ -861,15 +859,15 @@ msgstr "БД"
 
 #: db_tracking.php:86
 msgid "Last version"
-msgstr ""
+msgstr "Остання версія"
 
 #: db_tracking.php:87 tbl_tracking.php:645
 msgid "Created"
-msgstr ""
+msgstr "Створено"
 
 #: db_tracking.php:88 tbl_tracking.php:646
 msgid "Updated"
-msgstr ""
+msgstr "Оновлено"
 
 #: db_tracking.php:89 libraries/server_links.inc.php:51 server_status.php:801
 #: sql.php:942 tbl_tracking.php:647
@@ -919,7 +917,7 @@ msgstr ""
 
 #: db_tracking.php:229
 msgid "Database Log"
-msgstr ""
+msgstr "Журнал бази даних"
 
 #: enum_editor.php:21 libraries/tbl_properties.inc.php:773
 #, php-format
@@ -1081,7 +1079,7 @@ msgstr ""
 
 #: js/messages.php:37
 msgid "This operation could take a long time. Proceed anyway?"
-msgstr ""
+msgstr "Ця операція може зайняти багато часу.  Продовжити ?"
 
 #: js/messages.php:40
 msgid "You are about to DISABLE a BLOB Repository!"
@@ -1125,10 +1123,9 @@ msgstr "Паролі не однакові!"
 
 #: js/messages.php:56 server_privileges.php:1679 server_privileges.php:1703
 #: server_privileges.php:2108 server_privileges.php:2302
-#, fuzzy
 #| msgid "Any user"
 msgid "Add user"
-msgstr "Довільний користувач"
+msgstr "Додати користувача"
 
 #: js/messages.php:57
 msgid "Reloading Privileges"
@@ -1141,7 +1138,7 @@ msgstr "Видалити відмічених користувачів"
 #: js/messages.php:59 libraries/tbl_properties.inc.php:772
 #: tbl_tracking.php:244 tbl_tracking.php:409
 msgid "Close"
-msgstr ""
+msgstr "Закрити"
 
 #: js/messages.php:62 js/messages.php:134 libraries/Index.class.php:459
 #: libraries/common.lib.php:566 libraries/common.lib.php:1097
@@ -1183,7 +1180,7 @@ msgstr "Разом"
 #. l10n: Other, small valued, queries
 #: js/messages.php:72 server_status.php:602
 msgid "Other"
-msgstr ""
+msgstr "Інше"
 
 #. l10n: Thousands separator
 #: js/messages.php:74 libraries/common.lib.php:1322
@@ -1218,10 +1215,9 @@ msgid "Processes"
 msgstr "Процеси"
 
 #: js/messages.php:83
-#, fuzzy
 #| msgid "Connections"
 msgid "Connections / Processes"
-msgstr "З'єднань"
+msgstr "З'єднань / Процесів"
 
 #: js/messages.php:84
 msgid "Issued queries since last refresh"
@@ -1239,11 +1235,11 @@ msgstr "Статистика запиту"
 #: pmd_general.php:425 pmd_general.php:545 pmd_general.php:593
 #: pmd_general.php:669 pmd_general.php:723 pmd_general.php:786
 msgid "Cancel"
-msgstr ""
+msgstr "Скасувати"
 
 #: js/messages.php:94
 msgid "Loading"
-msgstr ""
+msgstr "Завантаження"
 
 #: js/messages.php:95
 msgid "Processing Request"
@@ -1252,7 +1248,7 @@ msgstr "Обробка запиту"
 #: js/messages.php:96 libraries/db_events.inc.php:39
 #: libraries/display_triggers.inc.php:46 libraries/import/ods.php:80
 msgid "Error in Processing Request"
-msgstr ""
+msgstr "Помилка при обробці запиту"
 
 #: js/messages.php:97
 msgid "Dropping Column"
@@ -1293,10 +1289,9 @@ msgid "Create Table"
 msgstr "Створити Таблицю"
 
 #: js/messages.php:112
-#, fuzzy
 #| msgid "Use Tables"
 msgid "Insert Table"
-msgstr "Використовувати таблиці"
+msgstr "Вставити таблицю"
 
 #: js/messages.php:113
 #, fuzzy
@@ -1315,16 +1310,14 @@ msgid "Searching"
 msgstr "Пошук"
 
 #: js/messages.php:118
-#, fuzzy
 #| msgid "Hide search criteria"
 msgid "Hide search results"
-msgstr "Сховати критерії пошуку"
+msgstr "Сховати результати пошуку"
 
 #: js/messages.php:119
-#, fuzzy
 #| msgid "Show search criteria"
 msgid "Show search results"
-msgstr "Показати критерії пошуку"
+msgstr "Показати результати пошуку"
 
 #: js/messages.php:120
 #, fuzzy
@@ -1376,11 +1369,11 @@ msgstr "Зберегти"
 #: js/messages.php:136 libraries/display_tbl.lib.php:645 pmd_general.php:158
 #: tbl_change.php:316 tbl_change.php:322
 msgid "Hide"
-msgstr ""
+msgstr "Приховати"
 
 #: js/messages.php:137 tbl_row_action.php:28
 msgid "No rows selected"
-msgstr ""
+msgstr "Рядків не вибрано"
 
 #: js/messages.php:138 libraries/display_tbl.lib.php:2347 querywindow.php:90
 #: querywindow.php:94 querywindow.php:97 tbl_structure.php:152
@@ -1433,7 +1426,7 @@ msgstr "Згенерувати пароль"
 
 #: js/messages.php:159 libraries/replication_gui.lib.php:364
 msgid "Generate"
-msgstr ""
+msgstr "Згенерувати"
 
 #: js/messages.php:160
 msgid "Change Password"
@@ -1607,11 +1600,11 @@ msgstr "Вівторок"
 
 #: js/messages.php:239
 msgid "Wednesday"
-msgstr ""
+msgstr "Середа"
 
 #: js/messages.php:240
 msgid "Thursday"
-msgstr ""
+msgstr "Четвер"
 
 #: js/messages.php:241
 msgid "Friday"
@@ -1619,7 +1612,7 @@ msgstr "П'ятниця"
 
 #: js/messages.php:242
 msgid "Saturday"
-msgstr ""
+msgstr "Субота"
 
 #. l10n: Short week day name
 #: js/messages.php:246 libraries/common.lib.php:1483
@@ -1710,7 +1703,7 @@ msgstr "Секунда"
 
 #: libraries/Config.class.php:1158
 msgid "Font size"
-msgstr ""
+msgstr "Розмір шрифту"
 
 #: libraries/File.class.php:279
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -1732,7 +1725,7 @@ msgstr ""
 
 #: libraries/File.class.php:291
 msgid "Failed to write file to disk."
-msgstr ""
+msgstr "Неможливо записати файл на диск."
 
 #: libraries/File.class.php:294
 msgid "File upload stopped by extension."
@@ -1740,7 +1733,7 @@ msgstr ""
 
 #: libraries/File.class.php:297
 msgid "Unknown error in file upload."
-msgstr ""
+msgstr "Невідома помилка при завантаженні файлу."
 
 #: libraries/File.class.php:499
 msgid ""
@@ -1774,7 +1767,7 @@ msgstr "Кількість елементів"
 #: libraries/Index.class.php:439 libraries/db_routines.lib.php:748
 #: tbl_tracking.php:272 tbl_tracking.php:321
 msgid "Comment"
-msgstr ""
+msgstr "Коментар"
 
 #: libraries/Index.class.php:465
 msgid "The primary key has been dropped"
@@ -1866,7 +1859,7 @@ msgstr ""
 
 #: libraries/Table.class.php:1050 tbl_get_field.php:25
 msgid "Invalid table name"
-msgstr ""
+msgstr "Неправильна назва таблиці"
 
 #: libraries/Table.class.php:1065
 #, php-format
@@ -1961,7 +1954,7 @@ msgstr ""
 
 #: libraries/auth/cookie.auth.lib.php:211
 msgid "Server:"
-msgstr ""
+msgstr "Сервер:"
 
 #: libraries/auth/cookie.auth.lib.php:216
 msgid "Username:"
@@ -1983,7 +1976,7 @@ msgstr "З цього моменту Cookies повинні бути дозво
 #: libraries/auth/signon.auth.lib.php:234
 msgid ""
 "Login without a password is forbidden by configuration (see AllowNoPassword)"
-msgstr ""
+msgstr "Авторизація без паролю заборонена в настройках (див. AllowNoPassword)"
 
 #: libraries/auth/cookie.auth.lib.php:568
 #: libraries/auth/signon.auth.lib.php:238
@@ -2021,7 +2014,7 @@ msgstr ""
 
 #: libraries/auth/swekey/swekey.auth.lib.php:202
 msgid "Authenticating..."
-msgstr ""
+msgstr "Авторизуємося..."
 
 #: libraries/blobstreaming.lib.php:236
 msgid "PBMS error"
@@ -2111,7 +2104,7 @@ msgstr "Перевірити права"
 
 #: libraries/common.inc.php:587
 msgid "Failed to read configuration file"
-msgstr ""
+msgstr "Неможливо прочитати конфігураційний файл."
 
 #: libraries/common.inc.php:588
 msgid ""
@@ -2218,7 +2211,7 @@ msgstr "Створити PHP код"
 #: libraries/common.lib.php:1131 libraries/config/messages.inc.php:475
 #: server_status.php:410 server_status.php:436 server_status.php:457
 msgid "Refresh"
-msgstr ""
+msgstr "Оновити"
 
 #: libraries/common.lib.php:1140
 msgid "Skip Validate SQL"
@@ -2359,7 +2352,7 @@ msgstr ""
 
 #: libraries/common.lib.php:2849 libraries/common.lib.php:2850
 msgid "Execute"
-msgstr ""
+msgstr "Виконати"
 
 #: libraries/config.values.php:45 libraries/config.values.php:47
 #: libraries/config.values.php:51
@@ -2383,10 +2376,9 @@ msgid "Open"
 msgstr ""
 
 #: libraries/config.values.php:75
-#, fuzzy
 #| msgid "Unclosed quote"
 msgid "Closed"
-msgstr "Не закриті лапки"
+msgstr "Закрито"
 
 #: libraries/config.values.php:96 libraries/export/htmlword.php:25
 #: libraries/export/latex.php:42 libraries/export/odt.php:34
@@ -2454,7 +2446,7 @@ msgstr ""
 #: libraries/config/FormDisplay.class.php:535
 #: libraries/config/validate.lib.php:352 libraries/config/validate.lib.php:439
 msgid "Incorrect value"
-msgstr ""
+msgstr "Некоректне значення"
 
 #: libraries/config/FormDisplay.class.php:87
 #: libraries/config/validate.lib.php:453
@@ -2535,10 +2527,9 @@ msgid "Improves efficiency of screen refresh"
 msgstr ""
 
 #: libraries/config/messages.inc.php:18
-#, fuzzy
 #| msgid "Enabled"
 msgid "Enable Ajax"
-msgstr "дозволено"
+msgstr "Дозволити Ajax"
 
 #: libraries/config/messages.inc.php:19
 msgid ""
@@ -2598,7 +2589,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:31
 msgid "Bzip2"
-msgstr ""
+msgstr "Bzip2"
 
 #: libraries/config/messages.inc.php:32
 msgid ""
@@ -2766,7 +2757,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:69
 msgid "Maximum execution time"
-msgstr ""
+msgstr "Максимальний час виконання"
 
 #: libraries/config/messages.inc.php:70 prefs_manage.php:299
 msgid "Save as file"
@@ -2891,7 +2882,7 @@ msgstr "Метод експорту"
 
 #: libraries/config/messages.inc.php:114 libraries/config/messages.inc.php:116
 msgid "Save on server"
-msgstr ""
+msgstr "Зберегти на сервері"
 
 #: libraries/config/messages.inc.php:115 libraries/config/messages.inc.php:117
 #: libraries/display_export.lib.php:188 libraries/display_export.lib.php:214
@@ -3006,15 +2997,15 @@ msgstr "CSV дані"
 
 #: libraries/config/messages.inc.php:160
 msgid "Developer"
-msgstr ""
+msgstr "Розробник"
 
 #: libraries/config/messages.inc.php:161
 msgid "Settings for phpMyAdmin developers"
-msgstr ""
+msgstr "Параметри для розробників phpMyAdmin"
 
 #: libraries/config/messages.inc.php:162
 msgid "Edit mode"
-msgstr ""
+msgstr "Режим редагування"
 
 #: libraries/config/messages.inc.php:163
 msgid "Customize edit mode"
@@ -3045,7 +3036,7 @@ msgstr ""
 #: libraries/server_links.inc.php:69 libraries/tbl_links.inc.php:89
 #: prefs_manage.php:231 setup/frames/menu.inc.php:20
 msgid "Import"
-msgstr ""
+msgstr "Імпорт"
 
 #: libraries/config/messages.inc.php:171
 msgid "Import defaults"
@@ -3057,7 +3048,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:173
 msgid "Import / export"
-msgstr ""
+msgstr "Імпорт / Експорт"
 
 #: libraries/config/messages.inc.php:174
 msgid "Set import and export directories and compression options"
@@ -3082,7 +3073,7 @@ msgstr ""
 #: libraries/config/messages.inc.php:181 libraries/select_server.lib.php:36
 #: setup/frames/index.inc.php:110
 msgid "Servers"
-msgstr ""
+msgstr "Сервери"
 
 #: libraries/config/messages.inc.php:182
 msgid "Servers display options"
@@ -3098,7 +3089,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:186
 msgid "Microsoft Office"
-msgstr ""
+msgstr "Microsoft Office"
 
 #: libraries/config/messages.inc.php:188
 msgid "Open Document"
@@ -3106,7 +3097,7 @@ msgstr "Відкрити Документ"
 
 #: libraries/config/messages.inc.php:190
 msgid "Other core settings"
-msgstr ""
+msgstr "Інші параметри ядра"
 
 #: libraries/config/messages.inc.php:191
 msgid "Settings that didn't fit enywhere else"
@@ -3136,7 +3127,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:196
 msgid "Security"
-msgstr ""
+msgstr "Безпека"
 
 #: libraries/config/messages.inc.php:197
 msgid ""
@@ -3154,11 +3145,11 @@ msgstr "Аутентифікація"
 
 #: libraries/config/messages.inc.php:200
 msgid "Authentication settings"
-msgstr ""
+msgstr "Параметри аутентифікації"
 
 #: libraries/config/messages.inc.php:201
 msgid "Server configuration"
-msgstr ""
+msgstr "Конфігурація сервера"
 
 #: libraries/config/messages.inc.php:202
 msgid ""
@@ -3280,11 +3271,11 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:233
 msgid "GZip"
-msgstr ""
+msgstr "GZip"
 
 #: libraries/config/messages.inc.php:234
 msgid "Extra parameters for iconv"
-msgstr ""
+msgstr "Додаткові параметри для iconv"
 
 #: libraries/config/messages.inc.php:235
 msgid ""
@@ -3338,7 +3329,7 @@ msgstr "Імена колонок і першому рядку"
 
 #: libraries/config/messages.inc.php:255 libraries/import/ods.php:27
 msgid "Do not import empty rows"
-msgstr ""
+msgstr "Не імпортувати пусті рядки"
 
 #: libraries/config/messages.inc.php:256
 msgid "Import currencies ($5.00 to 5.00)"
@@ -3358,7 +3349,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:261
 msgid "Do not use AUTO_INCREMENT for zero values"
-msgstr ""
+msgstr "Не використовувати AUTO_INCREMENT для нульових значень"
 
 #: libraries/config/messages.inc.php:264
 msgid "Initial state for sliders"
@@ -3598,7 +3589,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:318
 msgid "Memory limit"
-msgstr ""
+msgstr "Ліміт пам'яті"
 
 #: libraries/config/messages.inc.php:319
 msgid "These are Edit, Inline edit, Copy and Delete links"
@@ -3776,11 +3767,11 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:363
 msgid "Allow logins without a password"
-msgstr ""
+msgstr "Дозволити авторизацію без паролю"
 
 #: libraries/config/messages.inc.php:364
 msgid "Allow root login"
-msgstr ""
+msgstr "Дозволити авторизацію для root"
 
 #: libraries/config/messages.inc.php:365
 msgid "HTTP Basic Auth Realm name to display when doing HTTP Auth"
diff --git a/tbl_change.php b/tbl_change.php
index 94c7da078d..7d5bba3ec8 100644
--- a/tbl_change.php
+++ b/tbl_change.php
@@ -19,6 +19,9 @@ require_once './libraries/common.lib.php';
  */
 require_once './libraries/db_table_exists.lib.php';
 
+// load additional configuration variables
+require_once './libraries/data_mysql.inc.php';
+
 /**
  * Sets global variables.
  * Here it's better to use a if, instead of the '?' operator
diff --git a/tbl_select.php b/tbl_select.php
index 33b7e48dad..52e8b93fb1 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -129,31 +129,57 @@ if (! isset($param) || $param[0] == '') {
             <td><?php echo $fields_collation[$i]; ?></td>
             <td><select name="func[]">
         <?php
+        // determine valid operators
         if (strncasecmp($fields_type[$i], 'enum', 4) == 0) {
-            foreach ($GLOBALS['cfg']['EnumOperators'] as $fc) {
-                echo "\n" . '                        '
-                   . '<option value="' . htmlspecialchars($fc) . '">'
-                   . htmlspecialchars($fc) . '</option>';
-            }
+            // enum operators
+            $operators = array(
+                '=',
+                '!=',
+            );
         } elseif (preg_match('@char|blob|text|set@i', $fields_type[$i])) {
-            foreach ($GLOBALS['cfg']['TextOperators'] as $fc) {
-            echo "\n" . '                        '
-               . '<option value="' . htmlspecialchars($fc) . '">'
-               . htmlspecialchars($fc) . '</option>';
-            }
+            // text operators
+            $operators = array(
+               'LIKE',
+               'LIKE %...%',
+               'NOT LIKE',
+               '=',
+               '!=',
+               'REGEXP',
+               'REGEXP ^...$',
+               'NOT REGEXP',
+               "= ''",
+               "!= ''",
+               'IN (...)',
+               'NOT IN (...)',
+               'BETWEEN',
+               'NOT BETWEEN',
+            );
         } else {
-            foreach ($GLOBALS['cfg']['NumOperators'] as $fc) {
-                echo "\n" . '                        '
-                   . '<option value="' .  htmlspecialchars($fc) . '">'
-                   . htmlspecialchars($fc) . '</option>';
-            }
+            // numeric operators
+            $operators = array(
+               '=',
+               '>',
+               '>=',
+               '<',
+               '<=',
+               '!=',
+               'LIKE',
+               'NOT LIKE',
+               'IN (...)',
+               'NOT IN (...)',
+               'BETWEEN',
+               'NOT BETWEEN',
+            );
         } // end if... else...
+
+        // if field can be NULL, add IS NULL and IS NOT NULL
         if ($fields_null[$i]) {
-            foreach ($GLOBALS['cfg']['NullOperators'] as $fc) {
-                echo "\n" . '                        '
-                   . '<option value="' .  htmlspecialchars($fc) . '">'
-                   . htmlspecialchars($fc) . '</option>';
-            }
+            $operators[] = 'IS NULL';
+            $operators[] = 'IS NOT NULL';
+        }
+        foreach ($operators as $op) {
+            echo "\n" . '                        '
+               . '<option value="' .  htmlspecialchars($op) . '">' . htmlspecialchars($op) . '</option>';
         }
         ?>
 
@@ -327,11 +353,17 @@ else {
         $sql_query .= ' WHERE ' . $where;
     } else {
         $w = $charsets = array();
+        $unary_operators = array(
+           'IS NULL' => 1,
+           'IS NOT NULL' => 1,
+           "= ''" => 1,
+           "!= ''" => 1
+        );
         $cnt_func = count($func);
         reset($func);
         while (list($i, $func_type) = each($func)) {
             list($charsets[$i]) = explode('_', $collations[$i]);
-            if (isset($GLOBALS['cfg']['UnaryOperators'][$func_type]) && $GLOBALS['cfg']['UnaryOperators'][$func_type] == 1) {
+            if (isset($unary_operators[$func_type])) {
                 $fields[$i] = '';
                 $w[] = PMA_backquote($names[$i]) . ' ' . $func_type;
 
diff --git a/themes/original/jquery/jquery-ui-1.8.override.css b/themes/original/jquery/jquery-ui-1.8.override.css
index 4aee6fbb1e..2835781529 100644
--- a/themes/original/jquery/jquery-ui-1.8.override.css
+++ b/themes/original/jquery/jquery-ui-1.8.override.css
@@ -5,3 +5,4 @@
 /* Component containers
 ----------------------------------*/
 .ui-widget { font-size: 1em; }
+#ui-timepicker-div { z-index: 1003; }
diff --git a/themes/pmahomme/jquery/jquery-ui-1.8.override.css b/themes/pmahomme/jquery/jquery-ui-1.8.override.css
index 4aee6fbb1e..2835781529 100644
--- a/themes/pmahomme/jquery/jquery-ui-1.8.override.css
+++ b/themes/pmahomme/jquery/jquery-ui-1.8.override.css
@@ -5,3 +5,4 @@
 /* Component containers
 ----------------------------------*/
 .ui-widget { font-size: 1em; }
+#ui-timepicker-div { z-index: 1003; }