diff --git a/ChangeLog b/ChangeLog
index 319658a732..3cd0d8f326 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -40,10 +40,12 @@ phpMyAdmin - ChangeLog
 + [interface] Improved support for triggers
 + [interface] Improved server monitoring
 + AJAX for table Structure column Add
++ AJAX for table Operations copy table
 
 3.4.5.0 (not yet released)
 - bug #3375325 [interface] Page list in navigation frame looks odd
 - bug #3313235 [interface] Error div misplaced
+- bug #3374802 [interface] Comment on a column breaks inline editing
 
 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 26673cbc23..393e5c710d 100644
--- a/Documentation.html
+++ b/Documentation.html
@@ -699,18 +699,16 @@ since this link provides funding for phpMyAdmin.
         <br /><br />
 
         <tt><i>mysql</i></tt> :
-        The classic MySQL extension. This is the recommended and default
-        method at this time.<br /><br />
+        The classic MySQL extension.<br /><br />
 
         <tt><i>mysqli</i></tt> :
         The improved MySQL extension. This extension became available
-        with php 5.0.0 and is the recommended way to connect to a server
+        with PHP 5.0.0 and is the recommended way to connect to a server
         running MySQL 4.1.x or newer.</dd>
 
     <dt id="cfg_Servers_compress">$cfg['Servers'][$i]['compress'] boolean</dt>
     <dd>Whether to use a compressed protocol for the MySQL server connection
-        or not (experimental).<br />
-        This feature requires PHP&nbsp;&gt;=&nbsp;4.3.0.</dd>
+        or not (experimental).</dd>
 
     <dt id="controluser">
         <span id="cfg_Servers_controluser">$cfg['Servers'][$i]['controluser']</span> string<br />
@@ -1839,9 +1837,7 @@ $cfg['TrustedProxies'] =
     <dd>Specifies whether GD &gt;= 2 is available. If yes it can be used for
         MIME transformations.<br />
         Possible values are:
-        <ul><li>auto - automatically detect, this is a bit expensive
-                operation for php &lt; 4.3.0 so it is preferred to change this
-                according to your server real possibilities</li>
+        <ul><li>auto - automatically detect</li>
             <li>yes - GD 2 functions can be used</li>
             <li>no - GD 2 function cannot be used</li>
         </ul>
@@ -2673,7 +2669,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     <abbr title="HyperText Transfer Protocol">HTTP</abbr> headers ...&quot;.</a>
 </h4>
 
-<p> You just forgot to read the <i>install.txt</i> file from the php distribution.
+<p> You just forgot to read the <i>install.txt</i> file from the PHP distribution.
     Have a look at the last message in this
     <a href="http://bugs.php.net/bug.php?id=12061">bug report</a> from the
     official PHP bug database.</p>
@@ -2815,7 +2811,7 @@ setfacl -d -m "g:www-data:rwx" tmp
     connect to your MySQL server using PHP's classic
     <a href="http://php.net/mysql">MySQL extension</a> as well as the
     <a href="http://php.net/mysqli">improved MySQL extension (MySQLi)</a> that
-    is available in php 5.0. The latter one should be used unless you have a
+    is available in PHP 5.0. The latter one should be used unless you have a
     good reason not to do so.<br />
     When compiling PHP, we strongly recommend that you manually link the MySQL
     extension of your choice to a MySQL client library of at least the same
@@ -3013,11 +3009,7 @@ SetInputFilter PHP
 </ol>
 
 <h4 id="faq1_33">
-    <a href="#faq1_33">1.33 Is there a problem with the mysqli extension when running
-    PHP 5.0.4 on 64-bit systems?</a></h4>
-
-<p> Yes. This problem affects phpMyAdmin (&quot;Call to undefined function
-    pma_reloadnavigation&quot;), so upgrade your PHP to the next version.</p>
+    <a href="#faq1_33">1.33 (withdrawn).</a></h4>
 
 <h4 id="faq1_34">
     <a href="#faq1_34">1.34 Can I access directly to database or table pages?</a></h4>
@@ -3226,8 +3218,8 @@ the <tt>mysql_upgrade</tt> command on the server.</p>
 <p> Try to set the <a href="#cfg_OBGzip" class="configrule">$cfg['OBGZip']</a>
     directive to <tt>FALSE</tt> in the phpMyAdmin configuration file. It helps
     sometime.<br />
-    Also have a look at your PHP version number: if it contains &quot;4.0b...&quot;
-    it means you're running a beta version of PHP. That's not a so good idea,
+    Also have a look at your PHP version number: if it contains &quot;b&quot; or &quot;alpha&quot;
+    it means you're running a testing version of PHP. That's not a so good idea,
     please upgrade to a plain revision.</p>
 
 <h4 id="faq2_5">
diff --git a/js/functions.js b/js/functions.js
index bbe00b51d3..287195dcce 100644
--- a/js/functions.js
+++ b/js/functions.js
@@ -211,9 +211,10 @@ function confirmLink(theLink, theSqlQuery)
     var is_confirmed = confirm(PMA_messages['strDoYouReally'] + ' :\n' + theSqlQuery);
     if (is_confirmed) {
         if ( $(theLink).hasClass('formLinkSubmit') ) {
-			var name = 'is_js_confirmed';
-            if($(theLink).attr('href').indexOf('usesubform') != -1)
-				name = 'subform[' + $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i)[1] + '][is_js_confirmed]';
+            var name = 'is_js_confirmed';
+            if ($(theLink).attr('href').indexOf('usesubform') != -1) {
+                name = 'subform[' + $(theLink).attr('href').substr('#').match(/usesubform\[(\d+)\]/i)[1] + '][is_js_confirmed]';
+            }
 
             $(theLink).parents('form').append('<input type="hidden" name="' + name + '" value="1" />');
         } else if ( typeof(theLink.href) != 'undefined' ) {
@@ -596,7 +597,7 @@ $(document).ready(function() {
      * next pages reached via AJAX); a tr may have the class noclick to remove
      * this behavior.
      */
-    $('tr.odd:not(.noclick), tr.even:not(.noclick)').live('click',function(e) {
+    $('table:not(.noclick) tr.odd:not(.noclick), table:not(.noclick) tr.even:not(.noclick)').live('click',function(e) {
         // do not trigger when clicked on anchor
         if ($(e.target).is('a, img, a *')) {
             return;
@@ -848,10 +849,11 @@ function insertValueQuery() {
         var chaineAj = "";
         var NbSelect = 0;
         for(var i=0; i<myListBox.options.length; i++) {
-            if (myListBox.options[i].selected){
+            if (myListBox.options[i].selected) {
                 NbSelect++;
-                if (NbSelect > 1)
+                if (NbSelect > 1) {
                     chaineAj += ", ";
+                }
                 chaineAj += myListBox.options[i].value;
             }
         }
@@ -1139,12 +1141,14 @@ function pdfPaperSize(format, axis) {
 function popupBSMedia(url_params, bs_ref, m_type, is_cust_type, w_width, w_height)
 {
     // if width not specified, use default
-    if (w_width == undefined)
+    if (w_width == undefined) {
         w_width = 640;
+    }
 
     // if height not specified, use default
-    if (w_height == undefined)
+    if (w_height == undefined) {
         w_height = 480;
+    }
 
     // open popup window (for displaying video/playing audio)
     var mediaWin = window.open('bs_play_media.php?' + url_params + '&bs_reference=' + bs_ref + '&media_type=' + m_type + '&custom_type=' + is_cust_type, 'viewBSMedia', 'width=' + w_width + ', height=' + w_height + ', resizable=1, scrollbars=1, status=0');
@@ -1161,15 +1165,17 @@ function popupBSMedia(url_params, bs_ref, m_type, is_cust_type, w_width, w_heigh
 function requestMIMETypeChange(db, table, reference, current_mime_type)
 {
     // no mime type specified, set to default (nothing)
-    if (undefined == current_mime_type)
+    if (undefined == current_mime_type) {
         current_mime_type = "";
+    }
 
     // prompt user for new mime type
     var new_mime_type = prompt("Enter custom MIME type", current_mime_type);
 
     // if new mime_type is specified and is not the same as the previous type, request for mime type change
-    if (new_mime_type && new_mime_type != current_mime_type)
+    if (new_mime_type && new_mime_type != current_mime_type) {
         changeMIMEType(db, table, reference, new_mime_type);
+    }
 }
 
 /**
@@ -1470,8 +1476,11 @@ function PMA_createChart(passedSettings) {
                                     return;
                                 }
 
-                                if(lastValue==null) diff = curValue.x - thisChart.xAxis[0].getExtremes().max;
-                                else diff = parseInt(curValue.x - lastValue.x);
+                                if (lastValue==null) {
+                                    diff = curValue.x - thisChart.xAxis[0].getExtremes().max;
+                                } else {
+                                    diff = parseInt(curValue.x - lastValue.x);
+                                }
 
                                 thisChart.xAxis[0].setExtremes(
                                     thisChart.xAxis[0].getExtremes().min+diff,
@@ -1485,7 +1494,9 @@ function PMA_createChart(passedSettings) {
                                 numLoadedPoints++;
 
                                 // Timeout has been cleared => don't start a new timeout
-                                if(chart_activeTimeouts[container] == null) return;
+                                if (chart_activeTimeouts[container] == null) {
+                                    return;
+                                }
 
                                 chart_activeTimeouts[container] = setTimeout(
                                     thisChart.options.realtime.timeoutCallBack,
@@ -1537,11 +1548,13 @@ function PMA_createChart(passedSettings) {
 
     /* Set/Get realtime chart default values */
     if(passedSettings.realtime) {
-        if(!passedSettings.realtime.refreshRate)
+        if(!passedSettings.realtime.refreshRate) {
             passedSettings.realtime.refreshRate = 5000;
+        }
 
-        if(!passedSettings.realtime.numMaxPoints)
+        if(!passedSettings.realtime.numMaxPoints) {
             passedSettings.realtime.numMaxPoints = 30;
+        }
 
         // Allow custom POST vars to be added
         passedSettings.realtime.postData = $.extend(false,{ ajax_request: true, chart_data: 1, type: passedSettings.realtime.type },passedSettings.realtime.postData);
@@ -1597,10 +1610,15 @@ function PMA_createProfilingChart(data, options) {
 
 // Formats a profiling duration nicely. Used in PMA_createProfilingChart() and server_status.js
 function PMA_prettyProfilingNum(num, acc) {
-    if(!acc) acc = 1;
+    if (!acc) {
+        acc = 1;
+    }
     acc = Math.pow(10,acc);
-    if(num*1000 < 0.1) num = Math.round(acc*(num*1000*1000))/acc + 'µ'
-    else if(num < 0.1) num = Math.round(acc*(num*1000))/acc + 'm'
+    if (num*1000 < 0.1) {
+        num = Math.round(acc*(num*1000*1000))/acc + 'µ'
+    } else if (num < 0.1) {
+        num = Math.round(acc*(num*1000))/acc + 'm'
+    }
 
     return num + 's';
 }
@@ -1954,6 +1972,9 @@ $(document).ready(function() {
             if ($("#sqlqueryresults").length != 0) {
                 $("#sqlqueryresults").remove();
             }
+            if ($("#result_query").length != 0) {
+                $("#result_query").remove();
+            }
             if (data.success == true) {
                 PMA_ajaxShowMessage(data.message);
                 $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer");
@@ -1961,10 +1982,57 @@ $(document).ready(function() {
                 $("#result_query .notice").remove();
                 $("#result_query").prepend((data.message));
             } else {
-                PMA_ajaxShowMessage(data.error);
+                $temp_div = $("<div id='temp_div'></div>")
+                $temp_div.html(data.error);
+                $error = $temp_div.find("code").addClass("error");
+                PMA_ajaxShowMessage($error);
             }
         }) // end $.post()
     });//end of alterTableOrderby ajax submit
+
+    /**
+     *Ajax action for submitting the "Copy table"
+    **/
+    $("#copyTable.ajax input[name='submit_copy']").live('click', function(event) {
+        event.preventDefault();
+        $form = $("#copyTable");
+        if($form.find("input[name='switch_to_new']").attr('checked')) {
+            $form.append('<input type="hidden" name="submit_copy" value="Go" />');
+            $form.removeClass('ajax');
+            $form.find("#ajax_request_hidden").remove();
+            $form.submit();
+        } else {
+            PMA_prepareForAjaxRequest($form);
+            /*variables which stores the common attributes*/
+            $.post($form.attr('action'), $form.serialize()+"&submit_copy=Go", function(data) {
+                if ($("#sqlqueryresults").length != 0) {
+                    $("#sqlqueryresults").remove();
+                }
+                if ($("#result_query").length != 0) {
+                    $("#result_query").remove();
+                }
+                if (data.success == true) {
+                    PMA_ajaxShowMessage(data.message);
+                    $("<div id='sqlqueryresults'></div>").insertAfter("#topmenucontainer");
+                    $("#sqlqueryresults").html(data.sql_query);
+                    $("#result_query .notice").remove();
+                    $("#result_query").prepend((data.message));
+                    $("#copyTable").find("select[name='target_db'] option[value="+data.db+"]").attr('selected', 'selected');
+                
+                    //Refresh navigation frame when the table is coppied
+                    if (window.parent && window.parent.frame_navigation) {
+                        window.parent.frame_navigation.location.reload();
+                    }
+                } else {
+                    $temp_div = $("<div id='temp_div'></div>")
+                    $temp_div.html(data.error);
+                    $error = $temp_div.find("code").addClass("error");
+                    PMA_ajaxShowMessage($error);
+                }
+            }) // end $.post()
+        }
+    });//end of copyTable ajax submit
+
 }, 'top.frame_content'); //end $(document).ready for 'Table operations'
 
 
diff --git a/js/server_synchronize.js b/js/server_synchronize.js
index 1dfd3d2387..2cc03652fe 100644
--- a/js/server_synchronize.js
+++ b/js/server_synchronize.js
@@ -33,17 +33,17 @@ function showDetails(i, update_size, insert_size, remove_size, insert_index, rem
     // The image source is changed when the showDetails function is called.
     if ($img.hasClass('selected')) {
         if ($img.hasClass('struct_img')) {
-            $img.attr('src', pmaThemeImage + 'new_struct_selected.jpg');
+            $img.attr('src', pmaThemeImage + 'new_struct_selected.png');
         }
         if ($img.hasClass('data_img')) {
-            $img.attr('src', pmaThemeImage + 'new_data_selected.jpg');
+            $img.attr('src', pmaThemeImage + 'new_data_selected.png');
         }
     } else {
         if ($img.hasClass('struct_img')) {
-            $img.attr('src', pmaThemeImage + 'new_struct.jpg');
+            $img.attr('src', pmaThemeImage + 'new_struct.png');
         }
         if ($img.hasClass('data_img')) {
-            $img.attr('src', pmaThemeImage + 'new_data.jpg');
+            $img.attr('src', pmaThemeImage + 'new_data.png');
         }
     }
 
@@ -347,9 +347,9 @@ $(document).ready(function() {
             var $img = $(this);
             $img.addClass('hover');
             if ($img.hasClass('selected')) {
-                $img.attr('src', pmaThemeImage + 'new_struct_selected_hovered.jpg');
+                $img.attr('src', pmaThemeImage + 'new_struct_selected_hovered.png');
             } else {
-                $img.attr('src', pmaThemeImage + 'new_struct_hovered.jpg');
+                $img.attr('src', pmaThemeImage + 'new_struct_hovered.png');
             }
         },
         function() {
@@ -357,9 +357,9 @@ $(document).ready(function() {
             var $img = $(this);
             $img.removeClass('hover');
             if ($img.hasClass('selected')) {
-                $img.attr('src', pmaThemeImage + 'new_struct_selected.jpg');
+                $img.attr('src', pmaThemeImage + 'new_struct_selected.png');
             } else {
-                $img.attr('src', pmaThemeImage + 'new_struct.jpg');
+                $img.attr('src', pmaThemeImage + 'new_struct.png');
             }
         }
     );
@@ -370,9 +370,9 @@ $(document).ready(function() {
             var $img = $(this);
             $img.addClass('hover');
             if ($img.hasClass('selected')) {
-                $img.attr('src', pmaThemeImage + 'new_data_selected_hovered.jpg');
+                $img.attr('src', pmaThemeImage + 'new_data_selected_hovered.png');
             } else {
-                $img.attr('src', pmaThemeImage + 'new_data_hovered.jpg');
+                $img.attr('src', pmaThemeImage + 'new_data_hovered.png');
             }
         },
         function() {
@@ -380,9 +380,9 @@ $(document).ready(function() {
             var $img = $(this);
             $img.removeClass('hover');
             if ($img.hasClass('selected')) {
-                $img.attr('src', pmaThemeImage + 'new_data_selected.jpg');
+                $img.attr('src', pmaThemeImage + 'new_data_selected.png');
             } else {
-                $img.attr('src', pmaThemeImage + 'new_data.jpg');
+                $img.attr('src', pmaThemeImage + 'new_data.png');
             }
         }
     );
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index 61f5aa6936..d812262c0b 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1182,7 +1182,7 @@ function PMA_showMessage($message, $sql_query = null, $type = 'notice', $is_view
         // in the tools div, only display the Inline link when not in ajax
         // mode because 1) it currently does not work and 2) we would
         // have two similar mechanisms on the page for the same goal
-        if ($is_select || $GLOBALS['is_ajax_request'] === false) {
+        if ($is_select || $GLOBALS['is_ajax_request'] === false && ! $query_too_big) {
         // see in js/functions.js the jQuery code attached to id inline_edit
         // document.write conflicts with jQuery, hence used $().append()
             echo "<script type=\"text/javascript\">\n" .
diff --git a/libraries/config.default.php b/libraries/config.default.php
index c59402100b..6f69b17c60 100644
--- a/libraries/config.default.php
+++ b/libraries/config.default.php
@@ -145,7 +145,7 @@ $cfg['Servers'][$i]['connect_type'] = 'tcp';
 $cfg['Servers'][$i]['extension'] = 'mysqli';
 
 /**
- * Use compressed protocol for the MySQL connection (requires PHP >= 4.3.0)
+ * Use compressed protocol for the MySQL connection
  *
  * @global boolean $cfg['Servers'][$i]['compress']
  */
diff --git a/libraries/config/config_functions.lib.php b/libraries/config/config_functions.lib.php
index 7b71748743..daa335fcf7 100644
--- a/libraries/config/config_functions.lib.php
+++ b/libraries/config/config_functions.lib.php
@@ -11,11 +11,11 @@
  * for formatting. Takes variable number of arguments.
  * Based on PMA_sanitize from sanitize.lib.php.
  *
- * @param  string  $lang_key key in $GLOBALS WITHOUT 'strSetup' prefix
- * @param  mixed   $args     arguments for sprintf
+ * @param  string  $lang_key  key in $GLOBALS WITHOUT 'strSetup' prefix
+ * @param  mixed   $args,...  arguments for sprintf
  * @return string
  */
-function PMA_lang($lang_key)
+function PMA_lang($lang_key, $args = null)
 {
     $message = isset($GLOBALS["strConfig$lang_key"]) ? $GLOBALS["strConfig$lang_key"] : $lang_key;
 
@@ -48,29 +48,4 @@ function PMA_lang_name($canonical_path, $type = 'name', $default = 'key')
         ? ($type == 'desc' ? PMA_lang($lang_key) : $GLOBALS["strConfig$lang_key"])
         : ($default == 'key' ? $lang_key : $default);
 }
-
-/**
- * Wraps link in &lt;a&gt; tags and replaces argument separator in internal links
- * to the one returned by PMA_get_arg_separator()
- *
- * @param string $link
- * @param string $text
- * @return string
- */
-function PMA_lang_link_replace($link, $text)
-{
-    static $separator;
-
-    if (!isset($separator)) {
-        $separator = PMA_get_arg_separator('html');
-    }
-
-    if (!preg_match('#^https?://#', $link)) {
-        $link = str_replace('&amp;', $separator, $link);
-    } else {
-        $link = PMA_linkURL($link);
-    }
-
-    return '<a href="' . $link . '">' . $text . '</a>';
-}
 ?>
diff --git a/libraries/config/validate.lib.php b/libraries/config/validate.lib.php
index 163ff8762a..2b60725ed8 100644
--- a/libraries/config/validate.lib.php
+++ b/libraries/config/validate.lib.php
@@ -188,7 +188,7 @@ function test_php_errormsg($start = true)
 function test_db_connection($extension, $connect_type, $host, $port, $socket, $user, $pass = null, $error_key = 'Server')
 {
     //    test_php_errormsg();
-    $socket = empty($socket) || $connect_type == 'tcp' ? null : ':' . $socket;
+    $socket = empty($socket) || $connect_type == 'tcp' ? null : $socket;
     $port = empty($port) || $connect_type == 'socket' ? null : ':' . $port;
     $error = null;
     if ($extension == 'mysql') {
diff --git a/libraries/display_change_password.lib.php b/libraries/display_change_password.lib.php
index 4dcb2c9070..48444a6326 100644
--- a/libraries/display_change_password.lib.php
+++ b/libraries/display_change_password.lib.php
@@ -27,14 +27,14 @@ $chg_evt_handler = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER >= 5)
             }?>
     <fieldset id="fieldset_change_password">
         <legend><?php echo __('Change password'); ?></legend>
-        <table class="data">
-        <tr class="odd noclick">
+        <table class="data noclick">
+        <tr class="odd">
             <td colspan="2">
                 <input type="radio" name="nopass" value="1" id="nopass_1" onclick="pma_pw.value = ''; pma_pw2.value = ''; this.checked = true" />
         <label for="nopass_1"><?php echo __('No Password') . "\n"; ?></label>
             </td>
         </tr>
-        <tr class="even noclick">
+        <tr class="even">
             <td>
                 <input type="radio" name="nopass" value="0" id="nopass_0" onclick="document.getElementById('text_pma_pw').focus();" checked="checked " />
         <label for="nopass_0"><?php echo __('Password'); ?>:&nbsp;</label>
diff --git a/libraries/export/codegen.php b/libraries/export/codegen.php
index 357eac06cb..b8b35d5a1c 100644
--- a/libraries/export/codegen.php
+++ b/libraries/export/codegen.php
@@ -42,188 +42,188 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/**
- * Set of functions used to build exports of tables
- */
+    /**
+     * Set of functions used to build exports of tables
+     */
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter()
-{
-    return true;
-}
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter()
+    {
+        return true;
+    }
 
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader()
-{
-    return true;
-}
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader()
+    {
+        return true;
+    }
 
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db)
-{
-    return true;
-}
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db)
+    {
+        return true;
+    }
 
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db)
-{
-    return true;
-}
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db)
+    {
+        return true;
+    }
 
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db)
-{
-    return true;
-}
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db)
+    {
+        return true;
+    }
 
-/**
- * Outputs the content of a table in NHibernate format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    global $CG_FORMATS, $CG_HANDLERS, $what;
-    $format = $GLOBALS[$what . '_format'];
-    if (isset($CG_FORMATS[$format])) {
-        return PMA_exportOutputHandler($CG_HANDLERS[$format]($db, $table, $crlf));
+    /**
+     * Outputs the content of a table in NHibernate format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        global $CG_FORMATS, $CG_HANDLERS, $what;
+        $format = $GLOBALS[$what . '_format'];
+        if (isset($CG_FORMATS[$format])) {
+            return PMA_exportOutputHandler($CG_HANDLERS[$format]($db, $table, $crlf));
+        }
+        return PMA_exportOutputHandler(sprintf("%s is not supported.", $format));
     }
-    return PMA_exportOutputHandler(sprintf("%s is not supported.", $format));
-}
 
-/**
- *
- * @package phpMyAdmin-Export
- * @subpackage Codegen
- */
-class TableProperty
-{
-    public $name;
-    public $type;
-    public $nullable;
-    public $key;
-    public $defaultValue;
-    public $ext;
-    function __construct($row)
+    /**
+     *
+     * @package phpMyAdmin-Export
+     * @subpackage Codegen
+     */
+    class TableProperty
     {
-        $this->name = trim($row[0]);
-        $this->type = trim($row[1]);
-        $this->nullable = trim($row[2]);
-        $this->key = trim($row[3]);
-        $this->defaultValue = trim($row[4]);
-        $this->ext = trim($row[5]);
+        public $name;
+        public $type;
+        public $nullable;
+        public $key;
+        public $defaultValue;
+        public $ext;
+        function __construct($row)
+        {
+            $this->name = trim($row[0]);
+            $this->type = trim($row[1]);
+            $this->nullable = trim($row[2]);
+            $this->key = trim($row[3]);
+            $this->defaultValue = trim($row[4]);
+            $this->ext = trim($row[5]);
+        }
+        function getPureType()
+        {
+            $pos=strpos($this->type, "(");
+            if ($pos > 0)
+                return substr($this->type, 0, $pos);
+            return $this->type;
+        }
+        function isNotNull()
+        {
+            return $this->nullable == "NO" ? "true" : "false";
+        }
+        function isUnique()
+        {
+            return $this->key == "PRI" || $this->key == "UNI" ? "true" : "false";
+        }
+        function getDotNetPrimitiveType()
+        {
+            if (strpos($this->type, "int") === 0) return "int";
+            if (strpos($this->type, "long") === 0) return "long";
+            if (strpos($this->type, "char") === 0) return "string";
+            if (strpos($this->type, "varchar") === 0) return "string";
+            if (strpos($this->type, "text") === 0) return "string";
+            if (strpos($this->type, "longtext") === 0) return "string";
+            if (strpos($this->type, "tinyint") === 0) return "bool";
+            if (strpos($this->type, "datetime") === 0) return "DateTime";
+            return "unknown";
+        }
+        function getDotNetObjectType()
+        {
+            if (strpos($this->type, "int") === 0) return "Int32";
+            if (strpos($this->type, "long") === 0) return "Long";
+            if (strpos($this->type, "char") === 0) return "String";
+            if (strpos($this->type, "varchar") === 0) return "String";
+            if (strpos($this->type, "text") === 0) return "String";
+            if (strpos($this->type, "longtext") === 0) return "String";
+            if (strpos($this->type, "tinyint") === 0) return "Boolean";
+            if (strpos($this->type, "datetime") === 0) return "DateTime";
+            return "Unknown";
+        }
+        function getIndexName()
+        {
+            if (strlen($this->key)>0)
+                return "index=\"" . htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8') . "\"";
+            return "";
+        }
+        function isPK()
+        {
+            return $this->key=="PRI";
+        }
+        function formatCs($text)
+        {
+            $text=str_replace("#name#", cgMakeIdentifier($this->name, false), $text);
+            return $this->format($text);
+        }
+        function formatXml($text)
+        {
+            $text=str_replace("#name#", htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8'), $text);
+            $text=str_replace("#indexName#", $this->getIndexName(), $text);
+            return $this->format($text);
+        }
+        function format($text)
+        {
+            $text=str_replace("#ucfirstName#", cgMakeIdentifier($this->name), $text);
+            $text=str_replace("#dotNetPrimitiveType#", $this->getDotNetPrimitiveType(), $text);
+            $text=str_replace("#dotNetObjectType#", $this->getDotNetObjectType(), $text);
+            $text=str_replace("#type#", $this->getPureType(), $text);
+            $text=str_replace("#notNull#", $this->isNotNull(), $text);
+            $text=str_replace("#unique#", $this->isUnique(), $text);
+            return $text;
+        }
     }
-    function getPureType()
-    {
-        $pos=strpos($this->type, "(");
-        if ($pos > 0)
-            return substr($this->type, 0, $pos);
-        return $this->type;
-    }
-    function isNotNull()
-    {
-        return $this->nullable == "NO" ? "true" : "false";
-    }
-    function isUnique()
-    {
-        return $this->key == "PRI" || $this->key == "UNI" ? "true" : "false";
-    }
-    function getDotNetPrimitiveType()
-    {
-        if (strpos($this->type, "int") === 0) return "int";
-        if (strpos($this->type, "long") === 0) return "long";
-        if (strpos($this->type, "char") === 0) return "string";
-        if (strpos($this->type, "varchar") === 0) return "string";
-        if (strpos($this->type, "text") === 0) return "string";
-        if (strpos($this->type, "longtext") === 0) return "string";
-        if (strpos($this->type, "tinyint") === 0) return "bool";
-        if (strpos($this->type, "datetime") === 0) return "DateTime";
-        return "unknown";
-    }
-    function getDotNetObjectType()
-    {
-        if (strpos($this->type, "int") === 0) return "Int32";
-        if (strpos($this->type, "long") === 0) return "Long";
-        if (strpos($this->type, "char") === 0) return "String";
-        if (strpos($this->type, "varchar") === 0) return "String";
-        if (strpos($this->type, "text") === 0) return "String";
-        if (strpos($this->type, "longtext") === 0) return "String";
-        if (strpos($this->type, "tinyint") === 0) return "Boolean";
-        if (strpos($this->type, "datetime") === 0) return "DateTime";
-        return "Unknown";
-    }
-    function getIndexName()
-    {
-        if (strlen($this->key)>0)
-            return "index=\"" . htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8') . "\"";
-        return "";
-    }
-    function isPK()
-    {
-        return $this->key=="PRI";
-    }
-    function formatCs($text)
-    {
-        $text=str_replace("#name#", cgMakeIdentifier($this->name, false), $text);
-        return $this->format($text);
-    }
-    function formatXml($text)
-    {
-        $text=str_replace("#name#", htmlspecialchars($this->name, ENT_COMPAT, 'UTF-8'), $text);
-        $text=str_replace("#indexName#", $this->getIndexName(), $text);
-        return $this->format($text);
-    }
-    function format($text)
-    {
-        $text=str_replace("#ucfirstName#", cgMakeIdentifier($this->name), $text);
-        $text=str_replace("#dotNetPrimitiveType#", $this->getDotNetPrimitiveType(), $text);
-        $text=str_replace("#dotNetObjectType#", $this->getDotNetObjectType(), $text);
-        $text=str_replace("#type#", $this->getPureType(), $text);
-        $text=str_replace("#notNull#", $this->isNotNull(), $text);
-        $text=str_replace("#unique#", $this->isUnique(), $text);
-        return $text;
-    }
-}
 
     function cgMakeIdentifier($str, $ucfirst = true)
     {
diff --git a/libraries/export/csv.php b/libraries/export/csv.php
index 19ca57335b..8b04841ba1 100644
--- a/libraries/export/csv.php
+++ b/libraries/export/csv.php
@@ -35,189 +35,189 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    global $what;
-    global $csv_terminated;
-    global $csv_separator;
-    global $csv_enclosed;
-    global $csv_escaped;
-
-    // Here we just prepare some values for export
-    if ($what == 'excel') {
-        $csv_terminated      = "\015\012";
-        switch($GLOBALS['excel_edition']) {
-        case 'win':
-            // as tested on Windows with Excel 2002 and Excel 2007
-            $csv_separator = ';';
-            break;
-        case 'mac_excel2003':
-            $csv_separator = ';';
-            break;
-        case 'mac_excel2008':
-            $csv_separator = ',';
-            break;
-        }
-        $csv_enclosed           = '"';
-        $csv_escaped            = '"';
-        if (isset($GLOBALS['excel_columns'])) {
-            $GLOBALS['csv_columns'] = 'yes';
-        }
-    } else {
-        if (empty($csv_terminated) || strtolower($csv_terminated) == 'auto') {
-            $csv_terminated  = $GLOBALS['crlf'];
-        } else {
-            $csv_terminated  = str_replace('\\r', "\015", $csv_terminated);
-            $csv_terminated  = str_replace('\\n', "\012", $csv_terminated);
-            $csv_terminated  = str_replace('\\t', "\011", $csv_terminated);
-        } // end if
-        $csv_separator          = str_replace('\\t', "\011", $csv_separator);
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        return true;
     }
-    return true;
-}
 
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    return true;
-}
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        global $what;
+        global $csv_terminated;
+        global $csv_separator;
+        global $csv_enclosed;
+        global $csv_escaped;
 
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in CSV format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    global $what;
-    global $csv_terminated;
-    global $csv_separator;
-    global $csv_enclosed;
-    global $csv_escaped;
-
-    // Gets the data from the database
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-    $fields_cnt  = PMA_DBI_num_fields($result);
-
-    // If required, get fields name at the first line
-    if (isset($GLOBALS['csv_columns'])) {
-        $schema_insert = '';
-        for ($i = 0; $i < $fields_cnt; $i++) {
-            if ($csv_enclosed == '') {
-                $schema_insert .= stripslashes(PMA_DBI_field_name($result, $i));
-            } else {
-                $schema_insert .= $csv_enclosed
-                               . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, stripslashes(PMA_DBI_field_name($result, $i)))
-                               . $csv_enclosed;
+        // Here we just prepare some values for export
+        if ($what == 'excel') {
+            $csv_terminated      = "\015\012";
+            switch($GLOBALS['excel_edition']) {
+            case 'win':
+                // as tested on Windows with Excel 2002 and Excel 2007
+                $csv_separator = ';';
+                break;
+            case 'mac_excel2003':
+                $csv_separator = ';';
+                break;
+            case 'mac_excel2008':
+                $csv_separator = ',';
+                break;
             }
-            $schema_insert     .= $csv_separator;
-        } // end for
-        $schema_insert  =trim(substr($schema_insert, 0, -1));
-        if (!PMA_exportOutputHandler($schema_insert . $csv_terminated)) {
-            return false;
+            $csv_enclosed           = '"';
+            $csv_escaped            = '"';
+            if (isset($GLOBALS['excel_columns'])) {
+                $GLOBALS['csv_columns'] = 'yes';
+            }
+        } else {
+            if (empty($csv_terminated) || strtolower($csv_terminated) == 'auto') {
+                $csv_terminated  = $GLOBALS['crlf'];
+            } else {
+                $csv_terminated  = str_replace('\\r', "\015", $csv_terminated);
+                $csv_terminated  = str_replace('\\n', "\012", $csv_terminated);
+                $csv_terminated  = str_replace('\\t', "\011", $csv_terminated);
+            } // end if
+            $csv_separator          = str_replace('\\t', "\011", $csv_separator);
         }
-    } // end if
+        return true;
+    }
 
-    // Format the data
-    while ($row = PMA_DBI_fetch_row($result)) {
-        $schema_insert = '';
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            if (!isset($row[$j]) || is_null($row[$j])) {
-                $schema_insert .= $GLOBALS[$what . '_null'];
-            } elseif ($row[$j] == '0' || $row[$j] != '') {
-                // always enclose fields
-                if ($what == 'excel') {
-                    $row[$j]       = preg_replace("/\015(\012)?/", "\012", $row[$j]);
-                }
-                // remove CRLF characters within field
-                if (isset($GLOBALS[$what . '_removeCRLF']) && $GLOBALS[$what . '_removeCRLF']) {
-                    $row[$j] = str_replace("\n", "", str_replace("\r", "", $row[$j]));
-                }
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        return true;
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in CSV format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        global $what;
+        global $csv_terminated;
+        global $csv_separator;
+        global $csv_enclosed;
+        global $csv_escaped;
+
+        // Gets the data from the database
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+        $fields_cnt  = PMA_DBI_num_fields($result);
+
+        // If required, get fields name at the first line
+        if (isset($GLOBALS['csv_columns'])) {
+            $schema_insert = '';
+            for ($i = 0; $i < $fields_cnt; $i++) {
                 if ($csv_enclosed == '') {
-                    $schema_insert .= $row[$j];
+                    $schema_insert .= stripslashes(PMA_DBI_field_name($result, $i));
                 } else {
-                    // also double the escape string if found in the data
-                    if ('csv' == $what) {
-                        $schema_insert .= $csv_enclosed
-                                   . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, str_replace($csv_escaped, $csv_escaped . $csv_escaped, $row[$j]))
+                    $schema_insert .= $csv_enclosed
+                                   . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, stripslashes(PMA_DBI_field_name($result, $i)))
                                    . $csv_enclosed;
-                    } else {
-                        // for excel, avoid a problem when a field contains
-                        // double quotes
-                        $schema_insert .= $csv_enclosed
-                                   . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, $row[$j])
-                                   . $csv_enclosed;
-                    }
                 }
-            } else {
-                $schema_insert .= '';
+                $schema_insert     .= $csv_separator;
+            } // end for
+            $schema_insert  =trim(substr($schema_insert, 0, -1));
+            if (!PMA_exportOutputHandler($schema_insert . $csv_terminated)) {
+                return false;
             }
-            if ($j < $fields_cnt-1) {
-                $schema_insert .= $csv_separator;
+        } // end if
+
+        // Format the data
+        while ($row = PMA_DBI_fetch_row($result)) {
+            $schema_insert = '';
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                if (!isset($row[$j]) || is_null($row[$j])) {
+                    $schema_insert .= $GLOBALS[$what . '_null'];
+                } elseif ($row[$j] == '0' || $row[$j] != '') {
+                    // always enclose fields
+                    if ($what == 'excel') {
+                        $row[$j]       = preg_replace("/\015(\012)?/", "\012", $row[$j]);
+                    }
+                    // remove CRLF characters within field
+                    if (isset($GLOBALS[$what . '_removeCRLF']) && $GLOBALS[$what . '_removeCRLF']) {
+                        $row[$j] = str_replace("\n", "", str_replace("\r", "", $row[$j]));
+                    }
+                    if ($csv_enclosed == '') {
+                        $schema_insert .= $row[$j];
+                    } else {
+                        // also double the escape string if found in the data
+                        if ('csv' == $what) {
+                            $schema_insert .= $csv_enclosed
+                                       . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, str_replace($csv_escaped, $csv_escaped . $csv_escaped, $row[$j]))
+                                       . $csv_enclosed;
+                        } else {
+                            // for excel, avoid a problem when a field contains
+                            // double quotes
+                            $schema_insert .= $csv_enclosed
+                                       . str_replace($csv_enclosed, $csv_escaped . $csv_enclosed, $row[$j])
+                                       . $csv_enclosed;
+                        }
+                    }
+                } else {
+                    $schema_insert .= '';
+                }
+                if ($j < $fields_cnt-1) {
+                    $schema_insert .= $csv_separator;
+                }
+            } // end for
+
+            if (!PMA_exportOutputHandler($schema_insert . $csv_terminated)) {
+                return false;
             }
-        } // end for
+        } // end while
+        PMA_DBI_free_result($result);
 
-        if (!PMA_exportOutputHandler($schema_insert . $csv_terminated)) {
-            return false;
-        }
-    } // end while
-    PMA_DBI_free_result($result);
-
-    return true;
-} // end of the 'PMA_getTableCsv()' function
+        return true;
+    } // end of the 'PMA_getTableCsv()' function
 
 }
 ?>
diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php
index 6604ac6e7e..707bc7714c 100644
--- a/libraries/export/htmlword.php
+++ b/libraries/export/htmlword.php
@@ -34,321 +34,321 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    return PMA_exportOutputHandler('</body></html>');
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    global $charset_of_file;
-    return PMA_exportOutputHandler('<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:x="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html>
-<head>
-    <meta http-equiv="Content-type" content="text/html;charset=' . (isset($charset_of_file) ? $charset_of_file : 'utf-8') . '" />
-</head>
-<body>');
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    return PMA_exportOutputHandler('<h1>' . __('Database') . ' ' . htmlspecialchars($db) . '</h1>');
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in HTML (Microsoft Word) format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    global $what;
-
-    if (! PMA_exportOutputHandler('<h2>' . __('Dumping data for table') . ' ' . htmlspecialchars($table) . '</h2>')) {
-        return false;
-    }
-    if (! PMA_exportOutputHandler('<table class="width100" cellspacing="1">')) {
-        return false;
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        return PMA_exportOutputHandler('</body></html>');
     }
 
-    // Gets the data from the database
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-    $fields_cnt  = PMA_DBI_num_fields($result);
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        global $charset_of_file;
+        return PMA_exportOutputHandler('<html xmlns:o="urn:schemas-microsoft-com:office:office"
+    xmlns:x="urn:schemas-microsoft-com:office:word"
+    xmlns="http://www.w3.org/TR/REC-html40">
 
-    // If required, get fields name at the first line
-    if (isset($GLOBALS['htmlword_columns'])) {
-        $schema_insert = '<tr class="print-category">';
-        for ($i = 0; $i < $fields_cnt; $i++) {
-            $schema_insert .= '<td class="print"><b>' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i))) . '</b></td>';
-        } // end for
-        $schema_insert .= '</tr>';
-        if (! PMA_exportOutputHandler($schema_insert)) {
+    <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+    <html>
+    <head>
+        <meta http-equiv="Content-type" content="text/html;charset=' . (isset($charset_of_file) ? $charset_of_file : 'utf-8') . '" />
+    </head>
+    <body>');
+    }
+
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        return PMA_exportOutputHandler('<h1>' . __('Database') . ' ' . htmlspecialchars($db) . '</h1>');
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in HTML (Microsoft Word) format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        global $what;
+
+        if (! PMA_exportOutputHandler('<h2>' . __('Dumping data for table') . ' ' . htmlspecialchars($table) . '</h2>')) {
+            return false;
+        }
+        if (! PMA_exportOutputHandler('<table class="width100" cellspacing="1">')) {
             return false;
         }
-    } // end if
 
-    // Format the data
-    while ($row = PMA_DBI_fetch_row($result)) {
-        $schema_insert = '<tr class="print-category">';
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            if (! isset($row[$j]) || is_null($row[$j])) {
-                $value = $GLOBALS[$what . '_null'];
-            } elseif ($row[$j] == '0' || $row[$j] != '') {
-                $value = $row[$j];
+        // Gets the data from the database
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+        $fields_cnt  = PMA_DBI_num_fields($result);
+
+        // If required, get fields name at the first line
+        if (isset($GLOBALS['htmlword_columns'])) {
+            $schema_insert = '<tr class="print-category">';
+            for ($i = 0; $i < $fields_cnt; $i++) {
+                $schema_insert .= '<td class="print"><b>' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i))) . '</b></td>';
+            } // end for
+            $schema_insert .= '</tr>';
+            if (! PMA_exportOutputHandler($schema_insert)) {
+                return false;
+            }
+        } // end if
+
+        // Format the data
+        while ($row = PMA_DBI_fetch_row($result)) {
+            $schema_insert = '<tr class="print-category">';
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                if (! isset($row[$j]) || is_null($row[$j])) {
+                    $value = $GLOBALS[$what . '_null'];
+                } elseif ($row[$j] == '0' || $row[$j] != '') {
+                    $value = $row[$j];
+                } else {
+                    $value = '';
+                }
+                $schema_insert .= '<td class="print">' . htmlspecialchars($value) . '</td>';
+            } // end for
+            $schema_insert .= '</tr>';
+            if (! PMA_exportOutputHandler($schema_insert)) {
+                return false;
+            }
+        } // end while
+        PMA_DBI_free_result($result);
+        if (! PMA_exportOutputHandler('</table>')) {
+            return false;
+        }
+
+        return true;
+    }
+
+    /**
+     * Outputs table's structure
+     *
+     * @param string  $db           database name
+     * @param string  $table        table name
+     * @param string  $crlf         the end of line sequence
+     * @param string  $error_url    the url to go back in case of error
+     * @param bool    $do_relation  whether to include relation comments
+     * @param bool    $do_comments  whether to include the pmadb-style column comments
+     *                                as comments in the structure; this is deprecated
+     *                                but the parameter is left here because export.php
+     *                                calls PMA_exportStructure() also for other export
+     *                                types which use this parameter
+     * @param bool    $do_mime      whether to include mime comments
+     * @param bool    $dates        whether to include creation/update/check dates
+     * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
+     * @param string  $export_type  'server', 'database', 'table'
+     * @return  bool      Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
+    {
+        global $cfgRelation;
+
+        if (! PMA_exportOutputHandler('<h2>' . __('Table structure for table') . ' ' . htmlspecialchars($table) . '</h2>')) {
+            return false;
+        }
+
+        /**
+         * Get the unique keys in the table
+         */
+        $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
+        $keys_result    = PMA_DBI_query($keys_query);
+        $unique_keys    = array();
+        while ($key = PMA_DBI_fetch_assoc($keys_result)) {
+            if ($key['Non_unique'] == 0) {
+                $unique_keys[] = $key['Column_name'];
+            }
+        }
+        PMA_DBI_free_result($keys_result);
+
+        /**
+         * Gets fields properties
+         */
+        PMA_DBI_select_db($db);
+
+        // Check if we can use Relations
+        if ($do_relation && ! empty($cfgRelation['relation'])) {
+            // Find which tables are related with the current one and write it in
+            // an array
+            $res_rel = PMA_getForeigners($db, $table);
+
+            if ($res_rel && count($res_rel) > 0) {
+                $have_rel = true;
             } else {
-                $value = '';
+                $have_rel = false;
             }
-            $schema_insert .= '<td class="print">' . htmlspecialchars($value) . '</td>';
-        } // end for
-        $schema_insert .= '</tr>';
-        if (! PMA_exportOutputHandler($schema_insert)) {
+        } else {
+               $have_rel = false;
+        } // end if
+
+        /**
+         * Displays the table structure
+         */
+        if (! PMA_exportOutputHandler('<table class="width100" cellspacing="1">')) {
             return false;
         }
-    } // end while
-    PMA_DBI_free_result($result);
-    if (! PMA_exportOutputHandler('</table>')) {
-        return false;
-    }
-
-    return true;
-}
-
-/**
- * Outputs table's structure
- *
- * @param string  $db           database name
- * @param string  $table        table name
- * @param string  $crlf         the end of line sequence
- * @param string  $error_url    the url to go back in case of error
- * @param bool    $do_relation  whether to include relation comments
- * @param bool    $do_comments  whether to include the pmadb-style column comments
- *                                as comments in the structure; this is deprecated
- *                                but the parameter is left here because export.php
- *                                calls PMA_exportStructure() also for other export
- *                                types which use this parameter
- * @param bool    $do_mime      whether to include mime comments
- * @param bool    $dates        whether to include creation/update/check dates
- * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
- * @param string  $export_type  'server', 'database', 'table'
- * @return  bool      Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
-{
-    global $cfgRelation;
-
-    if (! PMA_exportOutputHandler('<h2>' . __('Table structure for table') . ' ' . htmlspecialchars($table) . '</h2>')) {
-        return false;
-    }
-
-    /**
-     * Get the unique keys in the table
-     */
-    $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
-    $keys_result    = PMA_DBI_query($keys_query);
-    $unique_keys    = array();
-    while ($key = PMA_DBI_fetch_assoc($keys_result)) {
-        if ($key['Non_unique'] == 0) {
-            $unique_keys[] = $key['Column_name'];
-        }
-    }
-    PMA_DBI_free_result($keys_result);
-
-    /**
-     * Gets fields properties
-     */
-    PMA_DBI_select_db($db);
-
-    // Check if we can use Relations
-    if ($do_relation && ! empty($cfgRelation['relation'])) {
-        // Find which tables are related with the current one and write it in
-        // an array
-        $res_rel = PMA_getForeigners($db, $table);
-
-        if ($res_rel && count($res_rel) > 0) {
-            $have_rel = true;
-        } else {
-            $have_rel = false;
-        }
-    } else {
-           $have_rel = false;
-    } // end if
-
-    /**
-     * Displays the table structure
-     */
-    if (! PMA_exportOutputHandler('<table class="width100" cellspacing="1">')) {
-        return false;
-    }
-
-    $columns_cnt = 4;
-    if ($do_relation && $have_rel) {
-        $columns_cnt++;
-    }
-    if ($do_comments && $cfgRelation['commwork']) {
-        $columns_cnt++;
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $columns_cnt++;
-    }
-
-    $schema_insert = '<tr class="print-category">';
-    $schema_insert .= '<th class="print">' . htmlspecialchars(__('Column')) . '</th>';
-    $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Type')) . '</b></td>';
-    $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Null')) . '</b></td>';
-    $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Default')) . '</b></td>';
-    if ($do_relation && $have_rel) {
-        $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Links to')) . '</b></td>';
-    }
-    if ($do_comments) {
-        $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Comments')) . '</b></td>';
-        $comments = PMA_getComments($db, $table);
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $schema_insert .= '<td class="print"><b>' . htmlspecialchars('MIME') . '</b></td>';
-        $mime_map = PMA_getMIME($db, $table, true);
-    }
-    $schema_insert .= '</tr>';
-
-    if (! PMA_exportOutputHandler($schema_insert)) {
-        return false;
-    }
-
-    $columns = PMA_DBI_get_columns($db, $table);
-    foreach ($columns as $column) {
-
-        $schema_insert = '<tr class="print-category">';
-        $type          = $column['Type'];
-        // reformat mysql query output
-        // set or enum types: slashes single quotes inside options
-        if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
-            $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
-            $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
-            $type_nowrap  = '';
-
-            $binary       = 0;
-            $unsigned     = 0;
-            $zerofill     = 0;
-        } else {
-            $type_nowrap  = ' nowrap="nowrap"';
-            $type         = preg_replace('/BINARY/i', '', $type);
-            $type         = preg_replace('/ZEROFILL/i', '', $type);
-            $type         = preg_replace('/UNSIGNED/i', '', $type);
-            if (empty($type)) {
-                $type     = '&nbsp;';
-            }
-
-            $binary       = preg_match('/BINARY/i', $column['Type']);
-            $unsigned     = preg_match('/UNSIGNED/i', $column['Type']);
-            $zerofill     = preg_match('/ZEROFILL/i', $column['Type']);
-        }
-        $attribute     = '&nbsp;';
-        if ($binary) {
-            $attribute = 'BINARY';
-        }
-        if ($unsigned) {
-            $attribute = 'UNSIGNED';
-        }
-        if ($zerofill) {
-            $attribute = 'UNSIGNED ZEROFILL';
-        }
-        if (! isset($column['Default'])) {
-            if ($column['Null'] != 'NO') {
-                $column['Default'] = 'NULL';
-            }
-        }
-
-        $fmt_pre = '';
-        $fmt_post = '';
-        if (in_array($column['Field'], $unique_keys)) {
-            $fmt_pre = '<b>' . $fmt_pre;
-            $fmt_post = $fmt_post . '</b>';
-        }
-        if ($column['Key'] == 'PRI') {
-            $fmt_pre = '<i>' . $fmt_pre;
-            $fmt_post = $fmt_post . '</i>';
-        }
-        $schema_insert .= '<td class="print">' . $fmt_pre . htmlspecialchars($column['Field']) . $fmt_post . '</td>';
-        $schema_insert .= '<td class="print">' . htmlspecialchars($type) . '</td>';
-        $schema_insert .= '<td class="print">' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes')) . '</td>';
-        $schema_insert .= '<td class="print">' . htmlspecialchars(isset($column['Default']) ? $column['Default'] : '') . '</td>';
-
-        $field_name = $column['Field'];
 
+        $columns_cnt = 4;
         if ($do_relation && $have_rel) {
-            $schema_insert .= '<td class="print">' . (isset($res_rel[$field_name]) ? htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')') : '') . '</td>';
+            $columns_cnt++;
         }
         if ($do_comments && $cfgRelation['commwork']) {
-            $schema_insert .= '<td class="print">' . (isset($comments[$field_name]) ? htmlspecialchars($comments[$field_name]) : '') . '</td>';
+            $columns_cnt++;
         }
         if ($do_mime && $cfgRelation['mimework']) {
-            $schema_insert .= '<td class="print">' . (isset($mime_map[$field_name]) ? htmlspecialchars(str_replace('_', '/', $mime_map[$field_name]['mimetype'])) : '') . '</td>';
+            $columns_cnt++;
         }
 
+        $schema_insert = '<tr class="print-category">';
+        $schema_insert .= '<th class="print">' . htmlspecialchars(__('Column')) . '</th>';
+        $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Type')) . '</b></td>';
+        $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Null')) . '</b></td>';
+        $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Default')) . '</b></td>';
+        if ($do_relation && $have_rel) {
+            $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Links to')) . '</b></td>';
+        }
+        if ($do_comments) {
+            $schema_insert .= '<td class="print"><b>' . htmlspecialchars(__('Comments')) . '</b></td>';
+            $comments = PMA_getComments($db, $table);
+        }
+        if ($do_mime && $cfgRelation['mimework']) {
+            $schema_insert .= '<td class="print"><b>' . htmlspecialchars('MIME') . '</b></td>';
+            $mime_map = PMA_getMIME($db, $table, true);
+        }
         $schema_insert .= '</tr>';
 
         if (! PMA_exportOutputHandler($schema_insert)) {
             return false;
         }
-    } // end while
 
-    return PMA_exportOutputHandler('</table>');
-}
+        $columns = PMA_DBI_get_columns($db, $table);
+        foreach ($columns as $column) {
+
+            $schema_insert = '<tr class="print-category">';
+            $type          = $column['Type'];
+            // reformat mysql query output
+            // set or enum types: slashes single quotes inside options
+            if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
+                $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
+                $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
+                $type_nowrap  = '';
+
+                $binary       = 0;
+                $unsigned     = 0;
+                $zerofill     = 0;
+            } else {
+                $type_nowrap  = ' nowrap="nowrap"';
+                $type         = preg_replace('/BINARY/i', '', $type);
+                $type         = preg_replace('/ZEROFILL/i', '', $type);
+                $type         = preg_replace('/UNSIGNED/i', '', $type);
+                if (empty($type)) {
+                    $type     = '&nbsp;';
+                }
+
+                $binary       = preg_match('/BINARY/i', $column['Type']);
+                $unsigned     = preg_match('/UNSIGNED/i', $column['Type']);
+                $zerofill     = preg_match('/ZEROFILL/i', $column['Type']);
+            }
+            $attribute     = '&nbsp;';
+            if ($binary) {
+                $attribute = 'BINARY';
+            }
+            if ($unsigned) {
+                $attribute = 'UNSIGNED';
+            }
+            if ($zerofill) {
+                $attribute = 'UNSIGNED ZEROFILL';
+            }
+            if (! isset($column['Default'])) {
+                if ($column['Null'] != 'NO') {
+                    $column['Default'] = 'NULL';
+                }
+            }
+
+            $fmt_pre = '';
+            $fmt_post = '';
+            if (in_array($column['Field'], $unique_keys)) {
+                $fmt_pre = '<b>' . $fmt_pre;
+                $fmt_post = $fmt_post . '</b>';
+            }
+            if ($column['Key'] == 'PRI') {
+                $fmt_pre = '<i>' . $fmt_pre;
+                $fmt_post = $fmt_post . '</i>';
+            }
+            $schema_insert .= '<td class="print">' . $fmt_pre . htmlspecialchars($column['Field']) . $fmt_post . '</td>';
+            $schema_insert .= '<td class="print">' . htmlspecialchars($type) . '</td>';
+            $schema_insert .= '<td class="print">' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes')) . '</td>';
+            $schema_insert .= '<td class="print">' . htmlspecialchars(isset($column['Default']) ? $column['Default'] : '') . '</td>';
+
+            $field_name = $column['Field'];
+
+            if ($do_relation && $have_rel) {
+                $schema_insert .= '<td class="print">' . (isset($res_rel[$field_name]) ? htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')') : '') . '</td>';
+            }
+            if ($do_comments && $cfgRelation['commwork']) {
+                $schema_insert .= '<td class="print">' . (isset($comments[$field_name]) ? htmlspecialchars($comments[$field_name]) : '') . '</td>';
+            }
+            if ($do_mime && $cfgRelation['mimework']) {
+                $schema_insert .= '<td class="print">' . (isset($mime_map[$field_name]) ? htmlspecialchars(str_replace('_', '/', $mime_map[$field_name]['mimetype'])) : '') . '</td>';
+            }
+
+            $schema_insert .= '</tr>';
+
+            if (! PMA_exportOutputHandler($schema_insert)) {
+                return false;
+            }
+        } // end while
+
+        return PMA_exportOutputHandler('</table>');
+    }
 
 }
 ?>
diff --git a/libraries/export/json.php b/libraries/export/json.php
index e008f0cd61..860d640caa 100644
--- a/libraries/export/json.php
+++ b/libraries/export/json.php
@@ -30,144 +30,144 @@ if (isset($plugin_list)) {
     );
 } else {
 
-/**
- * Set of functions used to build exports of tables
- */
+    /**
+     * Set of functions used to build exports of tables
+     */
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter()
-{
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader()
-{
-    PMA_exportOutputHandler(
-        '/**' . $GLOBALS['crlf']
-        . ' Export to JSON plugin for PHPMyAdmin' . $GLOBALS['crlf']
-        . ' @version 0.1' . $GLOBALS['crlf']
-        . ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf']
-    );
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db)
-{
-    PMA_exportOutputHandler('// Database \'' . $db . '\'' . $GLOBALS['crlf'] );
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db)
-{
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db)
-{
-    return true;
-}
-
-/**
- * Outputs the content of a table in JSON format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-
-    $columns_cnt = PMA_DBI_num_fields($result);
-    for ($i = 0; $i < $columns_cnt; $i++) {
-        $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter()
+    {
+        return true;
     }
-    unset($i);
 
-    $buffer = '';
-    $record_cnt = 0;
-    while ($record = PMA_DBI_fetch_row($result)) {
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader()
+    {
+        PMA_exportOutputHandler(
+            '/**' . $GLOBALS['crlf']
+            . ' Export to JSON plugin for PHPMyAdmin' . $GLOBALS['crlf']
+            . ' @version 0.1' . $GLOBALS['crlf']
+            . ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf']
+        );
+        return true;
+    }
 
-        $record_cnt++;
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db)
+    {
+        PMA_exportOutputHandler('// Database \'' . $db . '\'' . $GLOBALS['crlf'] );
+        return true;
+    }
 
-        // Output table name as comment if this is the first record of the table
-        if ($record_cnt == 1) {
-            $buffer .= '// ' . $db . '.' . $table . $crlf . $crlf;
-            $buffer .= '[{';
-        } else {
-            $buffer .= ', {';
-        }
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db)
+    {
+        return true;
+    }
 
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db)
+    {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in JSON format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+
+        $columns_cnt = PMA_DBI_num_fields($result);
         for ($i = 0; $i < $columns_cnt; $i++) {
+            $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
+        }
+        unset($i);
 
-            $isLastLine = ($i + 1 >= $columns_cnt);
+        $buffer = '';
+        $record_cnt = 0;
+        while ($record = PMA_DBI_fetch_row($result)) {
 
-            $column = $columns[$i];
+            $record_cnt++;
 
-            if (is_null($record[$i])) {
-                $buffer .= '"' . addslashes($column) . '": null' . (! $isLastLine ? ',' : '');
-            } elseif (is_numeric($record[$i])) {
-                $buffer .= '"' . addslashes($column) . '": ' . $record[$i] . (! $isLastLine ? ',' : '');
+            // Output table name as comment if this is the first record of the table
+            if ($record_cnt == 1) {
+                $buffer .= '// ' . $db . '.' . $table . $crlf . $crlf;
+                $buffer .= '[{';
             } else {
-                $buffer .= '"' . addslashes($column) . '": "' . addslashes($record[$i]) . '"' . (! $isLastLine ? ',' : '');
+                $buffer .= ', {';
             }
+
+            for ($i = 0; $i < $columns_cnt; $i++) {
+
+                $isLastLine = ($i + 1 >= $columns_cnt);
+
+                $column = $columns[$i];
+
+                if (is_null($record[$i])) {
+                    $buffer .= '"' . addslashes($column) . '": null' . (! $isLastLine ? ',' : '');
+                } elseif (is_numeric($record[$i])) {
+                    $buffer .= '"' . addslashes($column) . '": ' . $record[$i] . (! $isLastLine ? ',' : '');
+                } else {
+                    $buffer .= '"' . addslashes($column) . '": "' . addslashes($record[$i]) . '"' . (! $isLastLine ? ',' : '');
+                }
+            }
+
+            $buffer .= '}';
         }
 
-        $buffer .= '}';
-    }
+        if ($record_cnt) {
+            $buffer .=  ']';
+        }
+        if (! PMA_exportOutputHandler($buffer)) {
+            return false;
+        }
 
-    if ($record_cnt) {
-        $buffer .=  ']';
-    }
-    if (! PMA_exportOutputHandler($buffer)) {
-        return false;
-    }
+        PMA_DBI_free_result($result);
 
-    PMA_DBI_free_result($result);
-
-    return true;
-}
+        return true;
+    }
 
 }
diff --git a/libraries/export/latex.php b/libraries/export/latex.php
index 080d0acaf9..1c6064aecc 100644
--- a/libraries/export/latex.php
+++ b/libraries/export/latex.php
@@ -82,389 +82,389 @@ if (isset($plugin_list)) {
         array('type' => 'end_group');
 } else {
 
-/**
- * Escapes some special characters for use in TeX/LaTeX
- *
- * @param string      the string to convert
- *
- * @return  string      the converted string with escape codes
- *
- * @access  private
- */
-function PMA_texEscape($string) {
-    $escape = array('$', '%', '{', '}',  '&',  '#', '_', '^');
-    $cnt_escape = count($escape);
-    for ($k=0; $k < $cnt_escape; $k++) {
-        $string = str_replace($escape[$k], '\\' . $escape[$k], $string);
-    }
-    return $string;
-}
-
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    global $crlf;
-    global $cfg;
-
-    $head  =  '% phpMyAdmin LaTeX Dump' . $crlf
-           .  '% version ' . PMA_VERSION . $crlf
-           .  '% http://www.phpmyadmin.net' . $crlf
-           .  '%' . $crlf
-           .  '% ' . __('Host') . ': ' . $cfg['Server']['host'];
-    if (!empty($cfg['Server']['port'])) {
-         $head .= ':' . $cfg['Server']['port'];
-    }
-    $head .= $crlf
-           .  '% ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
-           .  '% ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf
-           .  '% ' . __('PHP Version') . ': ' . phpversion() . $crlf;
-    return PMA_exportOutputHandler($head);
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    global $crlf;
-    $head = '% ' . $crlf
-          . '% ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
-          . '% ' . $crlf;
-    return PMA_exportOutputHandler($head);
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in LaTeX table/sideways table environment
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    $result      = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-
-    $columns_cnt = PMA_DBI_num_fields($result);
-    for ($i = 0; $i < $columns_cnt; $i++) {
-        $columns[$i] = PMA_DBI_field_name($result, $i);
-    }
-    unset($i);
-
-    $buffer      = $crlf . '%' . $crlf . '% ' . __('Data') . ': ' . $table . $crlf . '%' . $crlf
-                 . ' \\begin{longtable}{|';
-
-    for ($index=0;$index<$columns_cnt;$index++) {
-       $buffer .= 'l|';
-    }
-    $buffer .= '} ' . $crlf ;
-
-    $buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf;
-    if (isset($GLOBALS['latex_caption'])) {
-        $buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
-                   . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], NULL, array('table' => $table, 'database' => $db)) . '} \\\\';
-    }
-    if (!PMA_exportOutputHandler($buffer)) {
-        return false;
-    }
-
-    // show column names
-    if (isset($GLOBALS['latex_columns'])) {
-        $buffer = '\\hline ';
-        for ($i = 0; $i < $columns_cnt; $i++) {
-            $buffer .= '\\multicolumn{1}{|c|}{\\textbf{' . PMA_texEscape(stripslashes($columns[$i])) . '}} & ';
-          }
-
-        $buffer = substr($buffer, 0, -2) . '\\\\ \\hline \hline ';
-        if (!PMA_exportOutputHandler($buffer . ' \\endfirsthead ' . $crlf)) {
-            return false;
+    /**
+     * Escapes some special characters for use in TeX/LaTeX
+     *
+     * @param string      the string to convert
+     *
+     * @return  string      the converted string with escape codes
+     *
+     * @access  private
+     */
+    function PMA_texEscape($string) {
+        $escape = array('$', '%', '{', '}',  '&',  '#', '_', '^');
+        $cnt_escape = count($escape);
+        for ($k=0; $k < $cnt_escape; $k++) {
+            $string = str_replace($escape[$k], '\\' . $escape[$k], $string);
         }
+        return $string;
+    }
+
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        return true;
+    }
+
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        global $crlf;
+        global $cfg;
+
+        $head  =  '% phpMyAdmin LaTeX Dump' . $crlf
+               .  '% version ' . PMA_VERSION . $crlf
+               .  '% http://www.phpmyadmin.net' . $crlf
+               .  '%' . $crlf
+               .  '% ' . __('Host') . ': ' . $cfg['Server']['host'];
+        if (!empty($cfg['Server']['port'])) {
+             $head .= ':' . $cfg['Server']['port'];
+        }
+        $head .= $crlf
+               .  '% ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
+               .  '% ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf
+               .  '% ' . __('PHP Version') . ': ' . phpversion() . $crlf;
+        return PMA_exportOutputHandler($head);
+    }
+
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        global $crlf;
+        $head = '% ' . $crlf
+              . '% ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
+              . '% ' . $crlf;
+        return PMA_exportOutputHandler($head);
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in LaTeX table/sideways table environment
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        $result      = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+
+        $columns_cnt = PMA_DBI_num_fields($result);
+        for ($i = 0; $i < $columns_cnt; $i++) {
+            $columns[$i] = PMA_DBI_field_name($result, $i);
+        }
+        unset($i);
+
+        $buffer      = $crlf . '%' . $crlf . '% ' . __('Data') . ': ' . $table . $crlf . '%' . $crlf
+                     . ' \\begin{longtable}{|';
+
+        for ($index=0;$index<$columns_cnt;$index++) {
+           $buffer .= 'l|';
+        }
+        $buffer .= '} ' . $crlf ;
+
+        $buffer .= ' \\hline \\endhead \\hline \\endfoot \\hline ' . $crlf;
         if (isset($GLOBALS['latex_caption'])) {
-            if (!PMA_exportOutputHandler('\\caption{' . PMA_expandUserString($GLOBALS['latex_data_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) . '} \\\\ ')) return false;
+            $buffer .= ' \\caption{' . PMA_expandUserString($GLOBALS['latex_data_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
+                       . '} \\label{' . PMA_expandUserString($GLOBALS['latex_data_label'], NULL, array('table' => $table, 'database' => $db)) . '} \\\\';
         }
-        if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) {
-            return false;
-        }
-    } else {
-        if (!PMA_exportOutputHandler('\\\\ \hline')) {
-            return false;
-        }
-    }
-
-    // print the whole table
-    while ($record = PMA_DBI_fetch_assoc($result)) {
-
-        $buffer = '';
-        // print each row
-        for ($i = 0; $i < $columns_cnt; $i++) {
-            if (isset($record[$columns[$i]])
-             && (! function_exists('is_null') || !is_null($record[$columns[$i]]))) {
-                $column_value = PMA_texEscape(stripslashes($record[$columns[$i]]));
-            } else {
-                $column_value = $GLOBALS['latex_null'];
-            }
-
-            // last column ... no need for & character
-            if ($i == ($columns_cnt - 1)) {
-                $buffer .= $column_value;
-            } else {
-                $buffer .= $column_value . " & ";
-            }
-        }
-        $buffer .= ' \\\\ \\hline ' . $crlf;
         if (!PMA_exportOutputHandler($buffer)) {
             return false;
         }
-    }
 
-    $buffer = ' \\end{longtable}' . $crlf;
-    if (!PMA_exportOutputHandler($buffer)) {
-        return false;
-    }
+        // show column names
+        if (isset($GLOBALS['latex_columns'])) {
+            $buffer = '\\hline ';
+            for ($i = 0; $i < $columns_cnt; $i++) {
+                $buffer .= '\\multicolumn{1}{|c|}{\\textbf{' . PMA_texEscape(stripslashes($columns[$i])) . '}} & ';
+              }
 
-    PMA_DBI_free_result($result);
-    return true;
-
-} // end getTableLaTeX
-
-/**
- * Outputs table's structure
- *
- * @param string  $db           database name
- * @param string  $table        table name
- * @param string  $crlf         the end of line sequence
- * @param string  $error_url    the url to go back in case of error
- * @param bool    $do_relation  whether to include relation comments
- * @param bool    $do_comments  whether to include the pmadb-style column comments
- *                                as comments in the structure; this is deprecated
- *                                but the parameter is left here because export.php
- *                                calls PMA_exportStructure() also for other export
- *                                types which use this parameter
- * @param bool    $do_mime      whether to include mime comments
- * @param bool    $dates        whether to include creation/update/check dates
- * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
- * @param string  $export_type  'server', 'database', 'table'
- * @return  bool      Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
-{
-    global $cfgRelation;
-
-    /**
-     * Get the unique keys in the table
-     */
-    $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
-    $keys_result    = PMA_DBI_query($keys_query);
-    $unique_keys    = array();
-    while ($key = PMA_DBI_fetch_assoc($keys_result)) {
-        if ($key['Non_unique'] == 0) {
-            $unique_keys[] = $key['Column_name'];
-        }
-    }
-    PMA_DBI_free_result($keys_result);
-
-    /**
-     * Gets fields properties
-     */
-    PMA_DBI_select_db($db);
-
-    // Check if we can use Relations
-    if ($do_relation && !empty($cfgRelation['relation'])) {
-        // Find which tables are related with the current one and write it in
-        // an array
-        $res_rel = PMA_getForeigners($db, $table);
-
-        if ($res_rel && count($res_rel) > 0) {
-            $have_rel = true;
-        } else {
-            $have_rel = false;
-        }
-    } else {
-           $have_rel = false;
-    } // end if
-
-    /**
-     * Displays the table structure
-     */
-    $buffer      = $crlf . '%' . $crlf . '% ' . __('Structure') . ': ' . $table  . $crlf . '%' . $crlf
-                 . ' \\begin{longtable}{';
-    if (!PMA_exportOutputHandler($buffer)) {
-        return false;
-    }
-
-    $columns_cnt = 4;
-    $alignment = '|l|c|c|c|';
-    if ($do_relation && $have_rel) {
-        $columns_cnt++;
-        $alignment .= 'l|';
-    }
-    if ($do_comments) {
-        $columns_cnt++;
-        $alignment .= 'l|';
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $columns_cnt++;
-        $alignment .='l|';
-    }
-    $buffer = $alignment . '} ' . $crlf ;
-
-    $header = ' \\hline ';
-    $header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Column') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}';
-    if ($do_relation && $have_rel) {
-        $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Links to') . '}}';
-    }
-    if ($do_comments) {
-        $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Comments') . '}}';
-        $comments = PMA_getComments($db, $table);
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $header .= ' & \\multicolumn{1}{|c|}{\\textbf{MIME}}';
-        $mime_map = PMA_getMIME($db, $table, true);
-    }
-
-    // Table caption for first page and label
-    if (isset($GLOBALS['latex_caption'])) {
-        $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
-                   . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], NULL, array('table' => $table, 'database' => $db))
-                   . '} \\\\' . $crlf;
-    }
-    $buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf;
-    // Table caption on next pages
-    if (isset($GLOBALS['latex_caption'])) {
-        $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
-                   . '} \\\\ ' . $crlf;
-    }
-    $buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf;
-
-    if (!PMA_exportOutputHandler($buffer)) {
-        return false;
-    }
-
-    $fields = PMA_DBI_get_columns($db, $table);
-    foreach ($fields as $row) {
-        $type             = $row['Type'];
-        // reformat mysql query output
-        // set or enum types: slashes single quotes inside options
-        if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
-            $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
-            $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
-            $type_nowrap  = '';
-
-            $binary       = 0;
-            $unsigned     = 0;
-            $zerofill     = 0;
-        } else {
-            $type_nowrap  = ' nowrap="nowrap"';
-            $type         = preg_replace('/BINARY/i', '', $type);
-            $type         = preg_replace('/ZEROFILL/i', '', $type);
-            $type         = preg_replace('/UNSIGNED/i', '', $type);
-            if (empty($type)) {
-                $type     = '&nbsp;';
+            $buffer = substr($buffer, 0, -2) . '\\\\ \\hline \hline ';
+            if (!PMA_exportOutputHandler($buffer . ' \\endfirsthead ' . $crlf)) {
+                return false;
             }
-
-            $binary       = preg_match('/BINARY/i', $row['Type']);
-            $unsigned     = preg_match('/UNSIGNED/i', $row['Type']);
-            $zerofill     = preg_match('/ZEROFILL/i', $row['Type']);
-        }
-        if (!isset($row['Default'])) {
-            if ($row['Null'] != 'NO') {
-                $row['Default'] = 'NULL';
+            if (isset($GLOBALS['latex_caption'])) {
+                if (!PMA_exportOutputHandler('\\caption{' . PMA_expandUserString($GLOBALS['latex_data_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db)) . '} \\\\ ')) return false;
+            }
+            if (!PMA_exportOutputHandler($buffer . '\\endhead \\endfoot' . $crlf)) {
+                return false;
+            }
+        } else {
+            if (!PMA_exportOutputHandler('\\\\ \hline')) {
+                return false;
             }
         }
 
-        $field_name = $row['Field'];
+        // print the whole table
+        while ($record = PMA_DBI_fetch_assoc($result)) {
 
-        $local_buffer = $field_name . "\000" . $type . "\000"
-            . (($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes'))
-            . "\000" . (isset($row['Default']) ? $row['Default'] : '');
+            $buffer = '';
+            // print each row
+            for ($i = 0; $i < $columns_cnt; $i++) {
+                if (isset($record[$columns[$i]])
+                 && (! function_exists('is_null') || !is_null($record[$columns[$i]]))) {
+                    $column_value = PMA_texEscape(stripslashes($record[$columns[$i]]));
+                } else {
+                    $column_value = $GLOBALS['latex_null'];
+                }
 
+                // last column ... no need for & character
+                if ($i == ($columns_cnt - 1)) {
+                    $buffer .= $column_value;
+                } else {
+                    $buffer .= $column_value . " & ";
+                }
+            }
+            $buffer .= ' \\\\ \\hline ' . $crlf;
+            if (!PMA_exportOutputHandler($buffer)) {
+                return false;
+            }
+        }
+
+        $buffer = ' \\end{longtable}' . $crlf;
+        if (!PMA_exportOutputHandler($buffer)) {
+            return false;
+        }
+
+        PMA_DBI_free_result($result);
+        return true;
+
+    } // end getTableLaTeX
+
+    /**
+     * Outputs table's structure
+     *
+     * @param string  $db           database name
+     * @param string  $table        table name
+     * @param string  $crlf         the end of line sequence
+     * @param string  $error_url    the url to go back in case of error
+     * @param bool    $do_relation  whether to include relation comments
+     * @param bool    $do_comments  whether to include the pmadb-style column comments
+     *                                as comments in the structure; this is deprecated
+     *                                but the parameter is left here because export.php
+     *                                calls PMA_exportStructure() also for other export
+     *                                types which use this parameter
+     * @param bool    $do_mime      whether to include mime comments
+     * @param bool    $dates        whether to include creation/update/check dates
+     * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
+     * @param string  $export_type  'server', 'database', 'table'
+     * @return  bool      Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
+    {
+        global $cfgRelation;
+
+        /**
+         * Get the unique keys in the table
+         */
+        $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
+        $keys_result    = PMA_DBI_query($keys_query);
+        $unique_keys    = array();
+        while ($key = PMA_DBI_fetch_assoc($keys_result)) {
+            if ($key['Non_unique'] == 0) {
+                $unique_keys[] = $key['Column_name'];
+            }
+        }
+        PMA_DBI_free_result($keys_result);
+
+        /**
+         * Gets fields properties
+         */
+        PMA_DBI_select_db($db);
+
+        // Check if we can use Relations
+        if ($do_relation && !empty($cfgRelation['relation'])) {
+            // Find which tables are related with the current one and write it in
+            // an array
+            $res_rel = PMA_getForeigners($db, $table);
+
+            if ($res_rel && count($res_rel) > 0) {
+                $have_rel = true;
+            } else {
+                $have_rel = false;
+            }
+        } else {
+               $have_rel = false;
+        } // end if
+
+        /**
+         * Displays the table structure
+         */
+        $buffer      = $crlf . '%' . $crlf . '% ' . __('Structure') . ': ' . $table  . $crlf . '%' . $crlf
+                     . ' \\begin{longtable}{';
+        if (!PMA_exportOutputHandler($buffer)) {
+            return false;
+        }
+
+        $columns_cnt = 4;
+        $alignment = '|l|c|c|c|';
         if ($do_relation && $have_rel) {
-            $local_buffer .= "\000";
-            if (isset($res_rel[$field_name])) {
-                $local_buffer .= $res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')';
-            }
+            $columns_cnt++;
+            $alignment .= 'l|';
         }
-        if ($do_comments && $cfgRelation['commwork']) {
-            $local_buffer .= "\000";
-            if (isset($comments[$field_name])) {
-                $local_buffer .= $comments[$field_name];
-            }
+        if ($do_comments) {
+            $columns_cnt++;
+            $alignment .= 'l|';
         }
         if ($do_mime && $cfgRelation['mimework']) {
-            $local_buffer .= "\000";
-            if (isset($mime_map[$field_name])) {
-                $local_buffer .= str_replace('_', '/', $mime_map[$field_name]['mimetype']);
-            }
+            $columns_cnt++;
+            $alignment .='l|';
         }
-        $local_buffer = PMA_texEscape($local_buffer);
-        if ($row['Key']=='PRI') {
-            $pos=strpos($local_buffer, "\000");
-            $local_buffer = '\\textit{' . substr($local_buffer, 0, $pos) . '}' . substr($local_buffer, $pos);
+        $buffer = $alignment . '} ' . $crlf ;
+
+        $header = ' \\hline ';
+        $header .= '\\multicolumn{1}{|c|}{\\textbf{' . __('Column') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Type') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Null') . '}} & \\multicolumn{1}{|c|}{\\textbf{' . __('Default') . '}}';
+        if ($do_relation && $have_rel) {
+            $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Links to') . '}}';
         }
-        if (in_array($field_name, $unique_keys)) {
-            $pos=strpos($local_buffer, "\000");
-            $local_buffer = '\\textbf{' . substr($local_buffer, 0, $pos) . '}' . substr($local_buffer, $pos);
+        if ($do_comments) {
+            $header .= ' & \\multicolumn{1}{|c|}{\\textbf{' . __('Comments') . '}}';
+            $comments = PMA_getComments($db, $table);
         }
-        $buffer = str_replace("\000", ' & ', $local_buffer);
-        $buffer .= ' \\\\ \\hline ' . $crlf;
+        if ($do_mime && $cfgRelation['mimework']) {
+            $header .= ' & \\multicolumn{1}{|c|}{\\textbf{MIME}}';
+            $mime_map = PMA_getMIME($db, $table, true);
+        }
+
+        // Table caption for first page and label
+        if (isset($GLOBALS['latex_caption'])) {
+            $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
+                       . '} \\label{' . PMA_expandUserString($GLOBALS['latex_structure_label'], NULL, array('table' => $table, 'database' => $db))
+                       . '} \\\\' . $crlf;
+        }
+        $buffer .= $header . ' \\\\ \\hline \\hline' . $crlf . '\\endfirsthead' . $crlf;
+        // Table caption on next pages
+        if (isset($GLOBALS['latex_caption'])) {
+            $buffer .= ' \\caption{'. PMA_expandUserString($GLOBALS['latex_structure_continued_caption'], 'PMA_texEscape', array('table' => $table, 'database' => $db))
+                       . '} \\\\ ' . $crlf;
+        }
+        $buffer .= $header . ' \\\\ \\hline \\hline \\endhead \\endfoot ' . $crlf;
 
         if (!PMA_exportOutputHandler($buffer)) {
             return false;
         }
-    } // end while
 
-    $buffer = ' \\end{longtable}' . $crlf;
-    return PMA_exportOutputHandler($buffer);
-} // end of the 'PMA_exportStructure' function
+        $fields = PMA_DBI_get_columns($db, $table);
+        foreach ($fields as $row) {
+            $type             = $row['Type'];
+            // reformat mysql query output
+            // set or enum types: slashes single quotes inside options
+            if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
+                $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
+                $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
+                $type_nowrap  = '';
+
+                $binary       = 0;
+                $unsigned     = 0;
+                $zerofill     = 0;
+            } else {
+                $type_nowrap  = ' nowrap="nowrap"';
+                $type         = preg_replace('/BINARY/i', '', $type);
+                $type         = preg_replace('/ZEROFILL/i', '', $type);
+                $type         = preg_replace('/UNSIGNED/i', '', $type);
+                if (empty($type)) {
+                    $type     = '&nbsp;';
+                }
+
+                $binary       = preg_match('/BINARY/i', $row['Type']);
+                $unsigned     = preg_match('/UNSIGNED/i', $row['Type']);
+                $zerofill     = preg_match('/ZEROFILL/i', $row['Type']);
+            }
+            if (!isset($row['Default'])) {
+                if ($row['Null'] != 'NO') {
+                    $row['Default'] = 'NULL';
+                }
+            }
+
+            $field_name = $row['Field'];
+
+            $local_buffer = $field_name . "\000" . $type . "\000"
+                . (($row['Null'] == '' || $row['Null'] == 'NO') ? __('No') : __('Yes'))
+                . "\000" . (isset($row['Default']) ? $row['Default'] : '');
+
+            if ($do_relation && $have_rel) {
+                $local_buffer .= "\000";
+                if (isset($res_rel[$field_name])) {
+                    $local_buffer .= $res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')';
+                }
+            }
+            if ($do_comments && $cfgRelation['commwork']) {
+                $local_buffer .= "\000";
+                if (isset($comments[$field_name])) {
+                    $local_buffer .= $comments[$field_name];
+                }
+            }
+            if ($do_mime && $cfgRelation['mimework']) {
+                $local_buffer .= "\000";
+                if (isset($mime_map[$field_name])) {
+                    $local_buffer .= str_replace('_', '/', $mime_map[$field_name]['mimetype']);
+                }
+            }
+            $local_buffer = PMA_texEscape($local_buffer);
+            if ($row['Key']=='PRI') {
+                $pos=strpos($local_buffer, "\000");
+                $local_buffer = '\\textit{' . substr($local_buffer, 0, $pos) . '}' . substr($local_buffer, $pos);
+            }
+            if (in_array($field_name, $unique_keys)) {
+                $pos=strpos($local_buffer, "\000");
+                $local_buffer = '\\textbf{' . substr($local_buffer, 0, $pos) . '}' . substr($local_buffer, $pos);
+            }
+            $buffer = str_replace("\000", ' & ', $local_buffer);
+            $buffer .= ' \\\\ \\hline ' . $crlf;
+
+            if (!PMA_exportOutputHandler($buffer)) {
+                return false;
+            }
+        } // end while
+
+        $buffer = ' \\end{longtable}' . $crlf;
+        return PMA_exportOutputHandler($buffer);
+    } // end of the 'PMA_exportStructure' function
 
 } // end else
 ?>
diff --git a/libraries/export/mediawiki.php b/libraries/export/mediawiki.php
index 8ec37491f1..d03610d836 100644
--- a/libraries/export/mediawiki.php
+++ b/libraries/export/mediawiki.php
@@ -24,136 +24,136 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in MediaWiki format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    $columns = PMA_DBI_get_columns($db, $table);
-    $columns = array_values($columns);
-    $row_cnt = count($columns);
-
-    $output = "{| cellpadding=\"10\" cellspacing=\"0\" border=\"1\" style=\"text-align:center;\"\n";
-    $output .= "|+'''" . $table . "'''\n";
-    $output .= "|- style=\"background:#ffdead;\"\n";
-    $output .= "! style=\"background:#ffffff\" | \n";
-    for ($i = 0; $i < $row_cnt; ++$i) {
-        $output .= " | " . $columns[$i]['Field'];
-        if (($i + 1) != $row_cnt) {
-            $output .= "\n";
-        }
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        return true;
     }
-    $output .= "\n";
 
-    $output .= "|- style=\"background:#f9f9f9;\"\n";
-    $output .= "! style=\"background:#f2f2f2\" | Type\n";
-    for ($i = 0; $i < $row_cnt; ++$i) {
-        $output .= " | " . $columns[$i]['Type'];
-        if (($i + 1) != $row_cnt) {
-            $output .= "\n";
-        }
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        return true;
     }
-    $output .= "\n";
 
-    $output .= "|- style=\"background:#f9f9f9;\"\n";
-    $output .= "! style=\"background:#f2f2f2\" | Null\n";
-    for ($i = 0; $i < $row_cnt; ++$i) {
-        $output .= " | " . $columns[$i]['Null'];
-        if (($i + 1) != $row_cnt) {
-            $output .= "\n";
-        }
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        return true;
     }
-    $output .= "\n";
 
-    $output .= "|- style=\"background:#f9f9f9;\"\n";
-    $output .= "! style=\"background:#f2f2f2\" | Default\n";
-    for ($i = 0; $i < $row_cnt; ++$i) {
-        $output .= " | " . $columns[$i]['Default'];
-        if (($i + 1) != $row_cnt) {
-            $output .= "\n";
-        }
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
     }
-    $output .= "\n";
 
-    $output .= "|- style=\"background:#f9f9f9;\"\n";
-    $output .= "! style=\"background:#f2f2f2\" | Extra\n";
-    for ($i = 0; $i < $row_cnt; ++$i) {
-        $output .= " | " . $columns[$i]['Extra'];
-        if (($i + 1) != $row_cnt) {
-            $output .= "\n";
-        }
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
     }
-    $output .= "\n";
 
-    $output .= "|}\n\n\n\n";
-    return PMA_exportOutputHandler($output);
-}
+    /**
+     * Outputs the content of a table in MediaWiki format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        $columns = PMA_DBI_get_columns($db, $table);
+        $columns = array_values($columns);
+        $row_cnt = count($columns);
+
+        $output = "{| cellpadding=\"10\" cellspacing=\"0\" border=\"1\" style=\"text-align:center;\"\n";
+        $output .= "|+'''" . $table . "'''\n";
+        $output .= "|- style=\"background:#ffdead;\"\n";
+        $output .= "! style=\"background:#ffffff\" | \n";
+        for ($i = 0; $i < $row_cnt; ++$i) {
+            $output .= " | " . $columns[$i]['Field'];
+            if (($i + 1) != $row_cnt) {
+                $output .= "\n";
+            }
+        }
+        $output .= "\n";
+
+        $output .= "|- style=\"background:#f9f9f9;\"\n";
+        $output .= "! style=\"background:#f2f2f2\" | Type\n";
+        for ($i = 0; $i < $row_cnt; ++$i) {
+            $output .= " | " . $columns[$i]['Type'];
+            if (($i + 1) != $row_cnt) {
+                $output .= "\n";
+            }
+        }
+        $output .= "\n";
+
+        $output .= "|- style=\"background:#f9f9f9;\"\n";
+        $output .= "! style=\"background:#f2f2f2\" | Null\n";
+        for ($i = 0; $i < $row_cnt; ++$i) {
+            $output .= " | " . $columns[$i]['Null'];
+            if (($i + 1) != $row_cnt) {
+                $output .= "\n";
+            }
+        }
+        $output .= "\n";
+
+        $output .= "|- style=\"background:#f9f9f9;\"\n";
+        $output .= "! style=\"background:#f2f2f2\" | Default\n";
+        for ($i = 0; $i < $row_cnt; ++$i) {
+            $output .= " | " . $columns[$i]['Default'];
+            if (($i + 1) != $row_cnt) {
+                $output .= "\n";
+            }
+        }
+        $output .= "\n";
+
+        $output .= "|- style=\"background:#f9f9f9;\"\n";
+        $output .= "! style=\"background:#f2f2f2\" | Extra\n";
+        for ($i = 0; $i < $row_cnt; ++$i) {
+            $output .= " | " . $columns[$i]['Extra'];
+            if (($i + 1) != $row_cnt) {
+                $output .= "\n";
+            }
+        }
+        $output .= "\n";
+
+        $output .= "|}\n\n\n\n";
+        return PMA_exportOutputHandler($output);
+    }
 
 }
 ?>
diff --git a/libraries/export/ods.php b/libraries/export/ods.php
index fa62a962a5..0c62878c2f 100644
--- a/libraries/export/ods.php
+++ b/libraries/export/ods.php
@@ -30,192 +30,192 @@ if (isset($plugin_list)) {
         );
 } else {
 
-$GLOBALS['ods_buffer'] = '';
-require_once './libraries/opendocument.lib.php';
+    $GLOBALS['ods_buffer'] = '';
+    require_once './libraries/opendocument.lib.php';
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    $GLOBALS['ods_buffer'] .= '</office:spreadsheet>'
-        . '</office:body>'
-        . '</office:document-content>';
-    if (!PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.spreadsheet', $GLOBALS['ods_buffer']))) {
-        return false;
-    }
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    $GLOBALS['ods_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>'
-        . '<office:document-content '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">'
-        . '<office:automatic-styles>'
-            . '<number:date-style style:name="N37" number:automatic-order="true">'
-            . '<number:month number:style="long"/>'
-            . '<number:text>/</number:text>'
-            . '<number:day number:style="long"/>'
-            . '<number:text>/</number:text>'
-            . '<number:year/>'
-          . '</number:date-style>'
-          . '<number:time-style style:name="N43">'
-            . '<number:hours number:style="long"/>'
-            . '<number:text>:</number:text>'
-            . '<number:minutes number:style="long"/>'
-            . '<number:text>:</number:text>'
-            . '<number:seconds number:style="long"/>'
-            . '<number:text> </number:text>'
-            . '<number:am-pm/>'
-          . '</number:time-style>'
-          . '<number:date-style style:name="N50" number:automatic-order="true" number:format-source="language">'
-            . '<number:month/>'
-            . '<number:text>/</number:text>'
-            . '<number:day/>'
-            . '<number:text>/</number:text>'
-            . '<number:year/>'
-            . '<number:text> </number:text>'
-            . '<number:hours number:style="long"/>'
-            . '<number:text>:</number:text>'
-            . '<number:minutes number:style="long"/>'
-            . '<number:text> </number:text>'
-            . '<number:am-pm/>'
-          . '</number:date-style>'
-          . '<style:style style:name="DateCell" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N37"/>'
-          . '<style:style style:name="TimeCell" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N43"/>'
-          . '<style:style style:name="DateTimeCell" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N50"/>'
-        . '</office:automatic-styles>'
-        . '<office:body>'
-        . '<office:spreadsheet>';
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in ODS format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    global $what;
-
-    // Gets the data from the database
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-    $fields_cnt  = PMA_DBI_num_fields($result);
-    $fields_meta = PMA_DBI_get_fields_meta($result);
-    $field_flags = array();
-    for ($j = 0; $j < $fields_cnt; $j++) {
-        $field_flags[$j] = PMA_DBI_field_flags($result, $j);
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        $GLOBALS['ods_buffer'] .= '</office:spreadsheet>'
+            . '</office:body>'
+            . '</office:document-content>';
+        if (!PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.spreadsheet', $GLOBALS['ods_buffer']))) {
+            return false;
+        }
+        return true;
     }
 
-    $GLOBALS['ods_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '">';
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        $GLOBALS['ods_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>'
+            . '<office:document-content '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">'
+            . '<office:automatic-styles>'
+                . '<number:date-style style:name="N37" number:automatic-order="true">'
+                . '<number:month number:style="long"/>'
+                . '<number:text>/</number:text>'
+                . '<number:day number:style="long"/>'
+                . '<number:text>/</number:text>'
+                . '<number:year/>'
+              . '</number:date-style>'
+              . '<number:time-style style:name="N43">'
+                . '<number:hours number:style="long"/>'
+                . '<number:text>:</number:text>'
+                . '<number:minutes number:style="long"/>'
+                . '<number:text>:</number:text>'
+                . '<number:seconds number:style="long"/>'
+                . '<number:text> </number:text>'
+                . '<number:am-pm/>'
+              . '</number:time-style>'
+              . '<number:date-style style:name="N50" number:automatic-order="true" number:format-source="language">'
+                . '<number:month/>'
+                . '<number:text>/</number:text>'
+                . '<number:day/>'
+                . '<number:text>/</number:text>'
+                . '<number:year/>'
+                . '<number:text> </number:text>'
+                . '<number:hours number:style="long"/>'
+                . '<number:text>:</number:text>'
+                . '<number:minutes number:style="long"/>'
+                . '<number:text> </number:text>'
+                . '<number:am-pm/>'
+              . '</number:date-style>'
+              . '<style:style style:name="DateCell" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N37"/>'
+              . '<style:style style:name="TimeCell" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N43"/>'
+              . '<style:style style:name="DateTimeCell" style:family="table-cell" style:parent-style-name="Default" style:data-style-name="N50"/>'
+            . '</office:automatic-styles>'
+            . '<office:body>'
+            . '<office:spreadsheet>';
+        return true;
+    }
 
-    // If required, get fields name at the first line
-    if (isset($GLOBALS[$what . '_columns'])) {
-        $GLOBALS['ods_buffer'] .= '<table:table-row>';
-        for ($i = 0; $i < $fields_cnt; $i++) {
-            $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
-                . '<text:p>' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i))) . '</text:p>'
-                . '</table:table-cell>';
-        } // end for
-        $GLOBALS['ods_buffer'] .= '</table:table-row>';
-    } // end if
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        return true;
+    }
 
-    // Format the data
-    while ($row = PMA_DBI_fetch_row($result)) {
-        $GLOBALS['ods_buffer'] .= '<table:table-row>';
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in ODS format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        global $what;
+
+        // Gets the data from the database
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+        $fields_cnt  = PMA_DBI_num_fields($result);
+        $fields_meta = PMA_DBI_get_fields_meta($result);
+        $field_flags = array();
         for ($j = 0; $j < $fields_cnt; $j++) {
-            if (!isset($row[$j]) || is_null($row[$j])) {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars($GLOBALS[$what . '_null']) . '</text:p>'
-                    . '</table:table-cell>';
-            // ignore BLOB
-            } elseif (stristr($field_flags[$j], 'BINARY')
-                    && $fields_meta[$j]->blob) {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p></text:p>'
-                    . '</table:table-cell>';
-            } elseif ($fields_meta[$j]->type == "date") {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="date" office:date-value="' . date("Y-m-d", strtotime($row[$j])) . '" table:style-name="DateCell">'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
-                    . '</table:table-cell>';
-            } elseif ($fields_meta[$j]->type == "time") {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="time" office:time-value="' . date("\P\TH\Hi\Ms\S", strtotime($row[$j])) . '" table:style-name="TimeCell">'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
-                    . '</table:table-cell>';
-            } elseif ($fields_meta[$j]->type == "datetime") {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="date" office:date-value="' . date("Y-m-d\TH:i:s", strtotime($row[$j])) . '" table:style-name="DateTimeCell">'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
-                    . '</table:table-cell>';
-            } elseif ($fields_meta[$j]->numeric && $fields_meta[$j]->type != 'timestamp' && ! $fields_meta[$j]->blob) {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="float" office:value="' . $row[$j] . '" >'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
-                    . '</table:table-cell>';
-            } else {
-                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
-                    . '</table:table-cell>';
-            }
-        } // end for
-        $GLOBALS['ods_buffer'] .= '</table:table-row>';
-    } // end while
-    PMA_DBI_free_result($result);
+            $field_flags[$j] = PMA_DBI_field_flags($result, $j);
+        }
 
-    $GLOBALS['ods_buffer'] .= '</table:table>';
+        $GLOBALS['ods_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '">';
 
-    return true;
-}
+        // If required, get fields name at the first line
+        if (isset($GLOBALS[$what . '_columns'])) {
+            $GLOBALS['ods_buffer'] .= '<table:table-row>';
+            for ($i = 0; $i < $fields_cnt; $i++) {
+                $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
+                    . '<text:p>' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i))) . '</text:p>'
+                    . '</table:table-cell>';
+            } // end for
+            $GLOBALS['ods_buffer'] .= '</table:table-row>';
+        } // end if
+
+        // Format the data
+        while ($row = PMA_DBI_fetch_row($result)) {
+            $GLOBALS['ods_buffer'] .= '<table:table-row>';
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                if (!isset($row[$j]) || is_null($row[$j])) {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars($GLOBALS[$what . '_null']) . '</text:p>'
+                        . '</table:table-cell>';
+                // ignore BLOB
+                } elseif (stristr($field_flags[$j], 'BINARY')
+                        && $fields_meta[$j]->blob) {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p></text:p>'
+                        . '</table:table-cell>';
+                } elseif ($fields_meta[$j]->type == "date") {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="date" office:date-value="' . date("Y-m-d", strtotime($row[$j])) . '" table:style-name="DateCell">'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                } elseif ($fields_meta[$j]->type == "time") {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="time" office:time-value="' . date("\P\TH\Hi\Ms\S", strtotime($row[$j])) . '" table:style-name="TimeCell">'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                } elseif ($fields_meta[$j]->type == "datetime") {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="date" office:date-value="' . date("Y-m-d\TH:i:s", strtotime($row[$j])) . '" table:style-name="DateTimeCell">'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                } elseif ($fields_meta[$j]->numeric && $fields_meta[$j]->type != 'timestamp' && ! $fields_meta[$j]->blob) {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="float" office:value="' . $row[$j] . '" >'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                } else {
+                    $GLOBALS['ods_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                }
+            } // end for
+            $GLOBALS['ods_buffer'] .= '</table:table-row>';
+        } // end while
+        PMA_DBI_free_result($result);
+
+        $GLOBALS['ods_buffer'] .= '</table:table>';
+
+        return true;
+    }
 
 }
 ?>
diff --git a/libraries/export/odt.php b/libraries/export/odt.php
index dba6e1c5cc..e02f8a6ea1 100644
--- a/libraries/export/odt.php
+++ b/libraries/export/odt.php
@@ -62,345 +62,345 @@ if (isset($plugin_list)) {
         array('type' => 'end_group');
 } else {
 
-$GLOBALS['odt_buffer'] = '';
-require_once './libraries/opendocument.lib.php';
+    $GLOBALS['odt_buffer'] = '';
+    require_once './libraries/opendocument.lib.php';
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    $GLOBALS['odt_buffer'] .= '</office:text>'
-        . '</office:body>'
-        . '</office:document-content>';
-    if (!PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.text', $GLOBALS['odt_buffer']))) {
-        return false;
-    }
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    $GLOBALS['odt_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>'
-        . '<office:document-content '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">'
-        . '<office:body>'
-        . '<office:text>';
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="1" text:style-name="Heading_1" text:is-list-header="true">' . htmlspecialchars(__('Database') . ' ' . $db) . '</text:h>';
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in ODT format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    global $what;
-
-    // Gets the data from the database
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-    $fields_cnt  = PMA_DBI_num_fields($result);
-    $fields_meta = PMA_DBI_get_fields_meta($result);
-    $field_flags = array();
-    for ($j = 0; $j < $fields_cnt; $j++) {
-        $field_flags[$j] = PMA_DBI_field_flags($result, $j);
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        $GLOBALS['odt_buffer'] .= '</office:text>'
+            . '</office:body>'
+            . '</office:document-content>';
+        if (!PMA_exportOutputHandler(PMA_createOpenDocument('application/vnd.oasis.opendocument.text', $GLOBALS['odt_buffer']))) {
+            return false;
+        }
+        return true;
     }
 
-    $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars(__('Dumping data for table') . ' ' . $table) . '</text:h>';
-    $GLOBALS['odt_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '_structure">';
-    $GLOBALS['odt_buffer'] .= '<table:table-column table:number-columns-repeated="' . $fields_cnt . '"/>';
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        $GLOBALS['odt_buffer'] .= '<?xml version="1.0" encoding="utf-8"?' . '>'
+            . '<office:document-content '. $GLOBALS['OpenDocumentNS'] . 'office:version="1.0">'
+            . '<office:body>'
+            . '<office:text>';
+        return true;
+    }
 
-    // If required, get fields name at the first line
-    if (isset($GLOBALS[$what . '_columns'])) {
-        $GLOBALS['odt_buffer'] .= '<table:table-row>';
-        for ($i = 0; $i < $fields_cnt; $i++) {
-            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                . '<text:p>' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i))) . '</text:p>'
-                . '</table:table-cell>';
-        } // end for
-        $GLOBALS['odt_buffer'] .= '</table:table-row>';
-    } // end if
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="1" text:style-name="Heading_1" text:is-list-header="true">' . htmlspecialchars(__('Database') . ' ' . $db) . '</text:h>';
+        return true;
+    }
 
-    // Format the data
-    while ($row = PMA_DBI_fetch_row($result)) {
-        $GLOBALS['odt_buffer'] .= '<table:table-row>';
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in ODT format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        global $what;
+
+        // Gets the data from the database
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+        $fields_cnt  = PMA_DBI_num_fields($result);
+        $fields_meta = PMA_DBI_get_fields_meta($result);
+        $field_flags = array();
         for ($j = 0; $j < $fields_cnt; $j++) {
-            if (!isset($row[$j]) || is_null($row[$j])) {
+            $field_flags[$j] = PMA_DBI_field_flags($result, $j);
+        }
+
+        $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars(__('Dumping data for table') . ' ' . $table) . '</text:h>';
+        $GLOBALS['odt_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '_structure">';
+        $GLOBALS['odt_buffer'] .= '<table:table-column table:number-columns-repeated="' . $fields_cnt . '"/>';
+
+        // If required, get fields name at the first line
+        if (isset($GLOBALS[$what . '_columns'])) {
+            $GLOBALS['odt_buffer'] .= '<table:table-row>';
+            for ($i = 0; $i < $fields_cnt; $i++) {
                 $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars($GLOBALS[$what . '_null']) . '</text:p>'
-                    . '</table:table-cell>';
-            // ignore BLOB
-            } elseif (stristr($field_flags[$j], 'BINARY')
-                    && $fields_meta[$j]->blob) {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p></text:p>'
-                    . '</table:table-cell>';
-            } elseif ($fields_meta[$j]->numeric && $fields_meta[$j]->type != 'timestamp' && ! $fields_meta[$j]->blob) {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="float" office:value="' . $row[$j] . '" >'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                    . '<text:p>' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i))) . '</text:p>'
                     . '</table:table-cell>';
+            } // end for
+            $GLOBALS['odt_buffer'] .= '</table:table-row>';
+        } // end if
+
+        // Format the data
+        while ($row = PMA_DBI_fetch_row($result)) {
+            $GLOBALS['odt_buffer'] .= '<table:table-row>';
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                if (!isset($row[$j]) || is_null($row[$j])) {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars($GLOBALS[$what . '_null']) . '</text:p>'
+                        . '</table:table-cell>';
+                // ignore BLOB
+                } elseif (stristr($field_flags[$j], 'BINARY')
+                        && $fields_meta[$j]->blob) {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p></text:p>'
+                        . '</table:table-cell>';
+                } elseif ($fields_meta[$j]->numeric && $fields_meta[$j]->type != 'timestamp' && ! $fields_meta[$j]->blob) {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="float" office:value="' . $row[$j] . '" >'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                } else {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
+                        . '</table:table-cell>';
+                }
+            } // end for
+            $GLOBALS['odt_buffer'] .= '</table:table-row>';
+        } // end while
+        PMA_DBI_free_result($result);
+
+        $GLOBALS['odt_buffer'] .= '</table:table>';
+
+        return true;
+    }
+
+    /**
+     * Outputs table's structure
+     *
+     * @param string  $db           database name
+     * @param string  $table        table name
+     * @param string  $crlf         the end of line sequence
+     * @param string  $error_url    the url to go back in case of error
+     * @param bool    $do_relation  whether to include relation comments
+     * @param bool    $do_comments  whether to include the pmadb-style column comments
+     *                                as comments in the structure; this is deprecated
+     *                                but the parameter is left here because export.php
+     *                                calls PMA_exportStructure() also for other export
+     *                                types which use this parameter
+     * @param bool    $do_mime      whether to include mime comments
+     * @param bool    $dates        whether to include creation/update/check dates
+     * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
+     * @param string  $export_type  'server', 'database', 'table'
+     * @return  bool      Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
+    {
+        global $cfgRelation;
+
+        /* Heading */
+        $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars(__('Table structure for table') . ' ' . $table) . '</text:h>';
+
+        /**
+         * Get the unique keys in the table
+         */
+        $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
+        $keys_result    = PMA_DBI_query($keys_query);
+        $unique_keys    = array();
+        while ($key = PMA_DBI_fetch_assoc($keys_result)) {
+            if ($key['Non_unique'] == 0) {
+                $unique_keys[] = $key['Column_name'];
+            }
+        }
+        PMA_DBI_free_result($keys_result);
+
+        /**
+         * Gets fields properties
+         */
+        PMA_DBI_select_db($db);
+
+        // Check if we can use Relations
+        if ($do_relation && !empty($cfgRelation['relation'])) {
+            // Find which tables are related with the current one and write it in
+            // an array
+            $res_rel = PMA_getForeigners($db, $table);
+
+            if ($res_rel && count($res_rel) > 0) {
+                $have_rel = true;
             } else {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars($row[$j]) . '</text:p>'
-                    . '</table:table-cell>';
-            }
-        } // end for
-        $GLOBALS['odt_buffer'] .= '</table:table-row>';
-    } // end while
-    PMA_DBI_free_result($result);
-
-    $GLOBALS['odt_buffer'] .= '</table:table>';
-
-    return true;
-}
-
-/**
- * Outputs table's structure
- *
- * @param string  $db           database name
- * @param string  $table        table name
- * @param string  $crlf         the end of line sequence
- * @param string  $error_url    the url to go back in case of error
- * @param bool    $do_relation  whether to include relation comments
- * @param bool    $do_comments  whether to include the pmadb-style column comments
- *                                as comments in the structure; this is deprecated
- *                                but the parameter is left here because export.php
- *                                calls PMA_exportStructure() also for other export
- *                                types which use this parameter
- * @param bool    $do_mime      whether to include mime comments
- * @param bool    $dates        whether to include creation/update/check dates
- * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
- * @param string  $export_type  'server', 'database', 'table'
- * @return  bool      Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
-{
-    global $cfgRelation;
-
-    /* Heading */
-    $GLOBALS['odt_buffer'] .= '<text:h text:outline-level="2" text:style-name="Heading_2" text:is-list-header="true">' . htmlspecialchars(__('Table structure for table') . ' ' . $table) . '</text:h>';
-
-    /**
-     * Get the unique keys in the table
-     */
-    $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
-    $keys_result    = PMA_DBI_query($keys_query);
-    $unique_keys    = array();
-    while ($key = PMA_DBI_fetch_assoc($keys_result)) {
-        if ($key['Non_unique'] == 0) {
-            $unique_keys[] = $key['Column_name'];
-        }
-    }
-    PMA_DBI_free_result($keys_result);
-
-    /**
-     * Gets fields properties
-     */
-    PMA_DBI_select_db($db);
-
-    // Check if we can use Relations
-    if ($do_relation && !empty($cfgRelation['relation'])) {
-        // Find which tables are related with the current one and write it in
-        // an array
-        $res_rel = PMA_getForeigners($db, $table);
-
-        if ($res_rel && count($res_rel) > 0) {
-            $have_rel = true;
-        } else {
-            $have_rel = false;
-        }
-    } else {
-           $have_rel = false;
-    } // end if
-
-    /**
-     * Displays the table structure
-     */
-    $GLOBALS['odt_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '_data">';
-    $columns_cnt = 4;
-    if ($do_relation && $have_rel) {
-        $columns_cnt++;
-    }
-    if ($do_comments) {
-        $columns_cnt++;
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $columns_cnt++;
-    }
-    $GLOBALS['odt_buffer'] .= '<table:table-column table:number-columns-repeated="' . $columns_cnt . '"/>';
-    /* Header */
-    $GLOBALS['odt_buffer'] .= '<table:table-row>';
-    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-        . '<text:p>' . htmlspecialchars(__('Column')) . '</text:p>'
-        . '</table:table-cell>';
-    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-        . '<text:p>' . htmlspecialchars(__('Type')) . '</text:p>'
-        . '</table:table-cell>';
-    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-        . '<text:p>' . htmlspecialchars(__('Null')) . '</text:p>'
-        . '</table:table-cell>';
-    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-        . '<text:p>' . htmlspecialchars(__('Default')) . '</text:p>'
-        . '</table:table-cell>';
-    if ($do_relation && $have_rel) {
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars(__('Links to')) . '</text:p>'
-            . '</table:table-cell>';
-    }
-    if ($do_comments) {
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars(__('Comments')) . '</text:p>'
-            . '</table:table-cell>';
-        $comments = PMA_getComments($db, $table);
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars(__('MIME type')) . '</text:p>'
-            . '</table:table-cell>';
-        $mime_map = PMA_getMIME($db, $table, true);
-    }
-    $GLOBALS['odt_buffer'] .= '</table:table-row>';
-
-    $columns = PMA_DBI_get_columns($db, $table);
-    foreach ($columns as $column) {
-
-        $field_name = $column['Field'];
-        $GLOBALS['odt_buffer'] .= '<table:table-row>';
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars($field_name) . '</text:p>'
-            . '</table:table-cell>';
-        // reformat mysql query output
-        // set or enum types: slashes single quotes inside options
-        $type = $column['Type'];
-        if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
-            $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
-            $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
-            $type_nowrap  = '';
-
-            $binary       = 0;
-            $unsigned     = 0;
-            $zerofill     = 0;
-        } else {
-            $type_nowrap  = ' nowrap="nowrap"';
-            $type         = preg_replace('/BINARY/i', '', $type);
-            $type         = preg_replace('/ZEROFILL/i', '', $type);
-            $type         = preg_replace('/UNSIGNED/i', '', $type);
-            if (empty($type)) {
-                $type     = '&nbsp;';
-            }
-
-            $binary       = preg_match('/BINARY/i', $column['Type']);
-            $unsigned     = preg_match('/UNSIGNED/i', $column['Type']);
-            $zerofill     = preg_match('/ZEROFILL/i', $column['Type']);
-        }
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars($type) . '</text:p>'
-            . '</table:table-cell>';
-        if (!isset($column['Default'])) {
-            if ($column['Null'] != 'NO') {
-                $column['Default'] = 'NULL';
-            } else {
-                $column['Default'] = '';
+                $have_rel = false;
             }
         } else {
-            $column['Default'] = $column['Default'];
-        }
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes')) . '</text:p>'
-            . '</table:table-cell>';
-        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-            . '<text:p>' . htmlspecialchars($column['Default']) . '</text:p>'
-            . '</table:table-cell>';
+               $have_rel = false;
+        } // end if
 
+        /**
+         * Displays the table structure
+         */
+        $GLOBALS['odt_buffer'] .= '<table:table table:name="' . htmlspecialchars($table) . '_data">';
+        $columns_cnt = 4;
         if ($do_relation && $have_rel) {
-            if (isset($res_rel[$field_name])) {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')') . '</text:p>'
-                    . '</table:table-cell>';
-            }
+            $columns_cnt++;
         }
         if ($do_comments) {
-            if (isset($comments[$field_name])) {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars($comments[$field_name]) . '</text:p>'
-                    . '</table:table-cell>';
-            } else {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p></text:p>'
-                    . '</table:table-cell>';
-            }
+            $columns_cnt++;
         }
         if ($do_mime && $cfgRelation['mimework']) {
-            if (isset($mime_map[$field_name])) {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p>' . htmlspecialchars(str_replace('_', '/', $mime_map[$field_name]['mimetype'])) . '</text:p>'
-                    . '</table:table-cell>';
-            } else {
-                $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
-                    . '<text:p></text:p>'
-                    . '</table:table-cell>';
-            }
+            $columns_cnt++;
+        }
+        $GLOBALS['odt_buffer'] .= '<table:table-column table:number-columns-repeated="' . $columns_cnt . '"/>';
+        /* Header */
+        $GLOBALS['odt_buffer'] .= '<table:table-row>';
+        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+            . '<text:p>' . htmlspecialchars(__('Column')) . '</text:p>'
+            . '</table:table-cell>';
+        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+            . '<text:p>' . htmlspecialchars(__('Type')) . '</text:p>'
+            . '</table:table-cell>';
+        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+            . '<text:p>' . htmlspecialchars(__('Null')) . '</text:p>'
+            . '</table:table-cell>';
+        $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+            . '<text:p>' . htmlspecialchars(__('Default')) . '</text:p>'
+            . '</table:table-cell>';
+        if ($do_relation && $have_rel) {
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars(__('Links to')) . '</text:p>'
+                . '</table:table-cell>';
+        }
+        if ($do_comments) {
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars(__('Comments')) . '</text:p>'
+                . '</table:table-cell>';
+            $comments = PMA_getComments($db, $table);
+        }
+        if ($do_mime && $cfgRelation['mimework']) {
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars(__('MIME type')) . '</text:p>'
+                . '</table:table-cell>';
+            $mime_map = PMA_getMIME($db, $table, true);
         }
         $GLOBALS['odt_buffer'] .= '</table:table-row>';
-    } // end while
 
-    $GLOBALS['odt_buffer'] .= '</table:table>';
-    return true;
-} // end of the 'PMA_exportStructure' function
+        $columns = PMA_DBI_get_columns($db, $table);
+        foreach ($columns as $column) {
+
+            $field_name = $column['Field'];
+            $GLOBALS['odt_buffer'] .= '<table:table-row>';
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars($field_name) . '</text:p>'
+                . '</table:table-cell>';
+            // reformat mysql query output
+            // set or enum types: slashes single quotes inside options
+            $type = $column['Type'];
+            if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
+                $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
+                $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
+                $type_nowrap  = '';
+
+                $binary       = 0;
+                $unsigned     = 0;
+                $zerofill     = 0;
+            } else {
+                $type_nowrap  = ' nowrap="nowrap"';
+                $type         = preg_replace('/BINARY/i', '', $type);
+                $type         = preg_replace('/ZEROFILL/i', '', $type);
+                $type         = preg_replace('/UNSIGNED/i', '', $type);
+                if (empty($type)) {
+                    $type     = '&nbsp;';
+                }
+
+                $binary       = preg_match('/BINARY/i', $column['Type']);
+                $unsigned     = preg_match('/UNSIGNED/i', $column['Type']);
+                $zerofill     = preg_match('/ZEROFILL/i', $column['Type']);
+            }
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars($type) . '</text:p>'
+                . '</table:table-cell>';
+            if (!isset($column['Default'])) {
+                if ($column['Null'] != 'NO') {
+                    $column['Default'] = 'NULL';
+                } else {
+                    $column['Default'] = '';
+                }
+            } else {
+                $column['Default'] = $column['Default'];
+            }
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes')) . '</text:p>'
+                . '</table:table-cell>';
+            $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                . '<text:p>' . htmlspecialchars($column['Default']) . '</text:p>'
+                . '</table:table-cell>';
+
+            if ($do_relation && $have_rel) {
+                if (isset($res_rel[$field_name])) {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')') . '</text:p>'
+                        . '</table:table-cell>';
+                }
+            }
+            if ($do_comments) {
+                if (isset($comments[$field_name])) {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars($comments[$field_name]) . '</text:p>'
+                        . '</table:table-cell>';
+                } else {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p></text:p>'
+                        . '</table:table-cell>';
+                }
+            }
+            if ($do_mime && $cfgRelation['mimework']) {
+                if (isset($mime_map[$field_name])) {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p>' . htmlspecialchars(str_replace('_', '/', $mime_map[$field_name]['mimetype'])) . '</text:p>'
+                        . '</table:table-cell>';
+                } else {
+                    $GLOBALS['odt_buffer'] .= '<table:table-cell office:value-type="string">'
+                        . '<text:p></text:p>'
+                        . '</table:table-cell>';
+                }
+            }
+            $GLOBALS['odt_buffer'] .= '</table:table-row>';
+        } // end while
+
+        $GLOBALS['odt_buffer'] .= '</table:table>';
+        return true;
+    } // end of the 'PMA_exportStructure' function
 
 } // end else
 ?>
diff --git a/libraries/export/pdf.php b/libraries/export/pdf.php
index 01ffc88be1..3cc0acfd24 100644
--- a/libraries/export/pdf.php
+++ b/libraries/export/pdf.php
@@ -30,441 +30,441 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/**
- * Font used in PDF.
- *
- * @todo Make this configuratble (at least Sans/Serif).
- */
-define('PMA_PDF_FONT', 'DejaVuSans');
-require_once './libraries/tcpdf/tcpdf.php';
+    /**
+     * Font used in PDF.
+     *
+     * @todo Make this configuratble (at least Sans/Serif).
+     */
+    define('PMA_PDF_FONT', 'DejaVuSans');
+    require_once './libraries/tcpdf/tcpdf.php';
 
-/**
- * Adapted from a LGPL script by Philip Clarke
- * @package phpMyAdmin-Export
- * @subpackage PDF
- */
-class PMA_PDF extends TCPDF
-{
-    var $tablewidths;
-    var $headerset;
-    var $footerset;
+    /**
+     * Adapted from a LGPL script by Philip Clarke
+     * @package phpMyAdmin-Export
+     * @subpackage PDF
+     */
+    class PMA_PDF extends TCPDF
+    {
+        var $tablewidths;
+        var $headerset;
+        var $footerset;
 
-    function checkPageBreak($h=0, $y='', $addpage=true) {
-        if ($this->empty_string($y)) {
-            $y = $this->y;
-        }
-        $current_page = $this->page;
-        if ((($y + $h) > $this->PageBreakTrigger) AND (!$this->InFooter) AND ($this->AcceptPageBreak())) {
-            if ($addpage) {
-                //Automatic page break
-                $x = $this->x;
-                $this->AddPage($this->CurOrientation);
-                $this->y = $this->dataY;
-                $oldpage = $this->page - 1;
-                if ($this->rtl) {
-                    if ($this->pagedim[$this->page]['orm'] != $this->pagedim[$oldpage]['orm']) {
-                        $this->x = $x - ($this->pagedim[$this->page]['orm'] - $this->pagedim[$oldpage]['orm']);
+        function checkPageBreak($h=0, $y='', $addpage=true) {
+            if ($this->empty_string($y)) {
+                $y = $this->y;
+            }
+            $current_page = $this->page;
+            if ((($y + $h) > $this->PageBreakTrigger) AND (!$this->InFooter) AND ($this->AcceptPageBreak())) {
+                if ($addpage) {
+                    //Automatic page break
+                    $x = $this->x;
+                    $this->AddPage($this->CurOrientation);
+                    $this->y = $this->dataY;
+                    $oldpage = $this->page - 1;
+                    if ($this->rtl) {
+                        if ($this->pagedim[$this->page]['orm'] != $this->pagedim[$oldpage]['orm']) {
+                            $this->x = $x - ($this->pagedim[$this->page]['orm'] - $this->pagedim[$oldpage]['orm']);
+                        } else {
+                            $this->x = $x;
+                        }
                     } else {
-                        $this->x = $x;
-                    }
-                } else {
-                    if ($this->pagedim[$this->page]['olm'] != $this->pagedim[$oldpage]['olm']) {
-                        $this->x = $x + ($this->pagedim[$this->page]['olm'] - $this->pagedim[$oldpage]['olm']);
-                    } else {
-                        $this->x = $x;
+                        if ($this->pagedim[$this->page]['olm'] != $this->pagedim[$oldpage]['olm']) {
+                            $this->x = $x + ($this->pagedim[$this->page]['olm'] - $this->pagedim[$oldpage]['olm']);
+                        } else {
+                            $this->x = $x;
+                        }
                     }
                 }
+                return true;
             }
-            return true;
+            if ($current_page != $this->page) {
+                // account for columns mode
+                return true;
+            }
+            return false;
         }
-        if ($current_page != $this->page) {
-            // account for columns mode
-            return true;
-        }
-        return false;
-    }
 
-    function Header()
-    {
-        global $maxY;
-        // Check if header for this page already exists
-        if (!isset($this->headerset[$this->page])) {
+        function Header()
+        {
+            global $maxY;
+            // Check if header for this page already exists
+            if (!isset($this->headerset[$this->page])) {
+                $fullwidth = 0;
+                foreach ($this->tablewidths as $width) {
+                    $fullwidth += $width;
+                }
+                $this->SetY(($this->tMargin) - ($this->FontSizePt/$this->k)*3);
+                $this->cellFontSize = $this->FontSizePt ;
+                $this->SetFont(PMA_PDF_FONT, '', ($this->titleFontSize ? $this->titleFontSize : $this->FontSizePt));
+                $this->Cell(0, $this->FontSizePt, $this->titleText, 0, 1, 'C');
+                $this->SetFont(PMA_PDF_FONT, '', $this->cellFontSize);
+                $this->SetY(($this->tMargin) - ($this->FontSizePt/$this->k)*1.5);
+                $this->Cell(0, $this->FontSizePt, __('Database') .': ' .$this->currentDb .',  ' .__('Table') .': ' .$this->currentTable, 0, 1, 'L');
+                $l = ($this->lMargin);
+                foreach ($this->colTitles as $col => $txt) {
+                    $this->SetXY($l, ($this->tMargin));
+                    $this->MultiCell($this->tablewidths[$col], $this->FontSizePt, $txt);
+                    $l += $this->tablewidths[$col] ;
+                    $maxY = ($maxY < $this->getY()) ? $this->getY() : $maxY ;
+                }
+                $this->SetXY($this->lMargin, $this->tMargin);
+                $this->setFillColor(200, 200, 200);
+                $l = ($this->lMargin);
+                foreach ($this->colTitles as $col => $txt) {
+                    $this->SetXY($l, $this->tMargin);
+                    $this->cell($this->tablewidths[$col], $maxY-($this->tMargin), '', 1, 0, 'L', 1);
+                    $this->SetXY($l, $this->tMargin);
+                    $this->MultiCell($this->tablewidths[$col], $this->FontSizePt, $txt, 0, 'C');
+                    $l += $this->tablewidths[$col];
+                }
+                $this->setFillColor(255, 255, 255);
+                // set headerset
+                $this->headerset[$this->page] = 1;
+            }
+
+            $this->dataY = $maxY;
+        }
+
+        function Footer()
+        {
+            // Check if footer for this page already exists
+            if (!isset($this->footerset[$this->page])) {
+                $this->SetY(-15);
+                //Page number
+                $this->setFooterFont(PMA_PDF_FONT, '', 14);
+                $this->Cell(0, 6, __('Page number:') . ' ' . $this->getAliasNumPage() . '/' .  $this->getAliasNbPages(), 'T', 0, 'C');
+
+                // set footerset
+                $this->footerset[$this->page] = 1;
+            }
+        }
+
+        function morepagestable($lineheight=8)
+        {
+            // some things to set and 'remember'
+            $l = $this->lMargin;
+            $startheight = $h = $this->dataY;
+            $startpage = $currpage = $this->page;
+
+            // calculate the whole width
             $fullwidth = 0;
             foreach ($this->tablewidths as $width) {
                 $fullwidth += $width;
             }
-            $this->SetY(($this->tMargin) - ($this->FontSizePt/$this->k)*3);
-            $this->cellFontSize = $this->FontSizePt ;
-            $this->SetFont(PMA_PDF_FONT, '', ($this->titleFontSize ? $this->titleFontSize : $this->FontSizePt));
-            $this->Cell(0, $this->FontSizePt, $this->titleText, 0, 1, 'C');
-            $this->SetFont(PMA_PDF_FONT, '', $this->cellFontSize);
-            $this->SetY(($this->tMargin) - ($this->FontSizePt/$this->k)*1.5);
-            $this->Cell(0, $this->FontSizePt, __('Database') .': ' .$this->currentDb .',  ' .__('Table') .': ' .$this->currentTable, 0, 1, 'L');
-            $l = ($this->lMargin);
-            foreach ($this->colTitles as $col => $txt) {
-                $this->SetXY($l, ($this->tMargin));
-                $this->MultiCell($this->tablewidths[$col], $this->FontSizePt, $txt);
-                $l += $this->tablewidths[$col] ;
-                $maxY = ($maxY < $this->getY()) ? $this->getY() : $maxY ;
-            }
-            $this->SetXY($this->lMargin, $this->tMargin);
-            $this->setFillColor(200, 200, 200);
-            $l = ($this->lMargin);
-            foreach ($this->colTitles as $col => $txt) {
-                $this->SetXY($l, $this->tMargin);
-                $this->cell($this->tablewidths[$col], $maxY-($this->tMargin), '', 1, 0, 'L', 1);
-                $this->SetXY($l, $this->tMargin);
-                $this->MultiCell($this->tablewidths[$col], $this->FontSizePt, $txt, 0, 'C');
-                $l += $this->tablewidths[$col];
-            }
-            $this->setFillColor(255, 255, 255);
-            // set headerset
-            $this->headerset[$this->page] = 1;
-        }
 
-        $this->dataY = $maxY;
-    }
+            // Now let's start to write the table
+            $row = 0;
+            $tmpheight = array();
+            $maxpage = $this->page;
 
-    function Footer()
-    {
-        // Check if footer for this page already exists
-        if (!isset($this->footerset[$this->page])) {
-            $this->SetY(-15);
-            //Page number
-            $this->setFooterFont(PMA_PDF_FONT, '', 14);
-            $this->Cell(0, 6, __('Page number:') . ' ' . $this->getAliasNumPage() . '/' .  $this->getAliasNbPages(), 'T', 0, 'C');
-
-            // set footerset
-            $this->footerset[$this->page] = 1;
-        }
-    }
-
-    function morepagestable($lineheight=8)
-    {
-        // some things to set and 'remember'
-        $l = $this->lMargin;
-        $startheight = $h = $this->dataY;
-        $startpage = $currpage = $this->page;
-
-        // calculate the whole width
-        $fullwidth = 0;
-        foreach ($this->tablewidths as $width) {
-            $fullwidth += $width;
-        }
-
-        // Now let's start to write the table
-        $row = 0;
-        $tmpheight = array();
-        $maxpage = $this->page;
-
-        while ($data = PMA_DBI_fetch_row($this->results)) {
-            $this->page = $currpage;
-            // write the horizontal borders
-            $this->Line($l, $h, $fullwidth+$l, $h);
-            // write the content and remember the height of the highest col
-            foreach ($data as $col => $txt) {
+            while ($data = PMA_DBI_fetch_row($this->results)) {
                 $this->page = $currpage;
-                $this->SetXY($l, $h);
-                if ($this->tablewidths[$col] > 0) {
-                    $this->MultiCell($this->tablewidths[$col], $lineheight, $txt, 0, $this->colAlign[$col]);
-                    $l += $this->tablewidths[$col];
+                // write the horizontal borders
+                $this->Line($l, $h, $fullwidth+$l, $h);
+                // write the content and remember the height of the highest col
+                foreach ($data as $col => $txt) {
+                    $this->page = $currpage;
+                    $this->SetXY($l, $h);
+                    if ($this->tablewidths[$col] > 0) {
+                        $this->MultiCell($this->tablewidths[$col], $lineheight, $txt, 0, $this->colAlign[$col]);
+                        $l += $this->tablewidths[$col];
+                    }
+
+                    if (!isset($tmpheight[$row.'-'.$this->page])) {
+                        $tmpheight[$row.'-'.$this->page] = 0;
+                    }
+                    if ($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
+                        $tmpheight[$row.'-'.$this->page] = $this->GetY();
+                    }
+                    if ($this->page > $maxpage) {
+                        $maxpage = $this->page;
+                    }
+                    unset($data[$col]);
                 }
 
-                if (!isset($tmpheight[$row.'-'.$this->page])) {
-                    $tmpheight[$row.'-'.$this->page] = 0;
-                }
-                if ($tmpheight[$row.'-'.$this->page] < $this->GetY()) {
-                    $tmpheight[$row.'-'.$this->page] = $this->GetY();
-                }
-                if ($this->page > $maxpage) {
-                    $maxpage = $this->page;
-                }
-                unset($data[$col]);
+                // get the height we were in the last used page
+                $h = $tmpheight[$row.'-'.$maxpage];
+                // set the "pointer" to the left margin
+                $l = $this->lMargin;
+                // set the $currpage to the last page
+                $currpage = $maxpage;
+                unset($data[$row]);
+                $row++;
             }
-
-            // get the height we were in the last used page
-            $h = $tmpheight[$row.'-'.$maxpage];
-            // set the "pointer" to the left margin
-            $l = $this->lMargin;
-            // set the $currpage to the last page
-            $currpage = $maxpage;
-            unset($data[$row]);
-            $row++;
-        }
-        // draw the borders
-        // we start adding a horizontal line on the last page
-        $this->page = $maxpage;
-        $this->Line($l, $h, $fullwidth+$l, $h);
-        // now we start at the top of the document and walk down
-        for ($i = $startpage; $i <= $maxpage; $i++) {
-            $this->page = $i;
-            $l = $this->lMargin;
-            $t = ($i == $startpage) ? $startheight : $this->tMargin;
-            $lh = ($i == $maxpage) ? $h : $this->h-$this->bMargin;
-            $this->Line($l, $t, $l, $lh);
-            foreach ($this->tablewidths as $width) {
-                $l += $width;
+            // draw the borders
+            // we start adding a horizontal line on the last page
+            $this->page = $maxpage;
+            $this->Line($l, $h, $fullwidth+$l, $h);
+            // now we start at the top of the document and walk down
+            for ($i = $startpage; $i <= $maxpage; $i++) {
+                $this->page = $i;
+                $l = $this->lMargin;
+                $t = ($i == $startpage) ? $startheight : $this->tMargin;
+                $lh = ($i == $maxpage) ? $h : $this->h-$this->bMargin;
                 $this->Line($l, $t, $l, $lh);
-            }
-        }
-        // set it to the last page, if not it'll cause some problems
-        $this->page = $maxpage;
-    }
-
-    function setAttributes($attr = array())
-    {
-        foreach ($attr as $key => $val) {
-            $this->$key = $val ;
-        }
-    }
-
-    function setTopMargin($topMargin)
-    {
-        $this->tMargin = $topMargin;
-    }
-
-    function mysql_report($query)
-    {
-        unset($this->tablewidths);
-        unset($this->colTitles);
-        unset($this->titleWidth);
-        unset($this->colFits);
-        unset($this->display_column);
-        unset($this->colAlign);
-
-        /**
-         * Pass 1 for column widths
-         */
-        $this->results = PMA_DBI_query($query, null, PMA_DBI_QUERY_UNBUFFERED);
-        $this->numFields  = PMA_DBI_num_fields($this->results);
-        $this->fields = PMA_DBI_get_fields_meta($this->results);
-
-        // sColWidth = starting col width (an average size width)
-        $availableWidth = $this->w - $this->lMargin - $this->rMargin;
-        $this->sColWidth = $availableWidth / $this->numFields;
-        $totalTitleWidth = 0;
-
-        // loop through results header and set initial col widths/ titles/ alignment
-        // if a col title is less than the starting col width, reduce that column size
-        for ($i = 0; $i < $this->numFields; $i++) {
-            $stringWidth = $this->getstringwidth($this->fields[$i]->name) + 6 ;
-            // save the real title's width
-            $titleWidth[$i] = $stringWidth;
-            $totalTitleWidth += $stringWidth;
-
-            // set any column titles less than the start width to the column title width
-            if ($stringWidth < $this->sColWidth) {
-                $colFits[$i] = $stringWidth ;
-            }
-            $this->colTitles[$i] = $this->fields[$i]->name;
-            $this->display_column[$i] = true;
-
-            switch ($this->fields[$i]->type) {
-            case 'int':
-                $this->colAlign[$i] = 'R';
-                break;
-            case 'blob':
-            case 'tinyblob':
-            case 'mediumblob':
-            case 'longblob':
-                /**
-                 * @todo do not deactivate completely the display
-                 * but show the field's name and [BLOB]
-                 */
-                if (stristr($this->fields[$i]->flags, 'BINARY')) {
-                    $this->display_column[$i] = false;
-                    unset($this->colTitles[$i]);
+                foreach ($this->tablewidths as $width) {
+                    $l += $width;
+                    $this->Line($l, $t, $l, $lh);
                 }
-                $this->colAlign[$i] = 'L';
-                break;
-            default:
-                $this->colAlign[$i] = 'L';
+            }
+            // set it to the last page, if not it'll cause some problems
+            $this->page = $maxpage;
+        }
+
+        function setAttributes($attr = array())
+        {
+            foreach ($attr as $key => $val) {
+                $this->$key = $val ;
             }
         }
 
-        // title width verification
-        if ($totalTitleWidth > $availableWidth) {
-            $adjustingMode = true;
-        } else {
-            $adjustingMode = false;
-            // we have enough space for all the titles at their
-            // original width so use the true title's width
-            foreach ($titleWidth as $key => $val) {
-                $colFits[$key] = $val;
-            }
+        function setTopMargin($topMargin)
+        {
+            $this->tMargin = $topMargin;
         }
 
-        // loop through the data; any column whose contents
-        // is greater than the column size is resized
-        /**
-          * @todo force here a LIMIT to avoid reading all rows
-          */
-        while ($row = PMA_DBI_fetch_row($this->results)) {
-            foreach ($colFits as $key => $val) {
-                $stringWidth = $this->getstringwidth($row[$key]) + 6 ;
-                if ($adjustingMode && ($stringWidth > $this->sColWidth)) {
-                // any column whose data's width is bigger than the start width is now discarded
-                    unset($colFits[$key]);
-                } else {
-                // if data's width is bigger than the current column width,
-                // enlarge the column (but avoid enlarging it if the
-                // data's width is very big)
-                        if ($stringWidth > $val && $stringWidth < ($this->sColWidth * 3)) {
-                        $colFits[$key] = $stringWidth ;
+        function mysql_report($query)
+        {
+            unset($this->tablewidths);
+            unset($this->colTitles);
+            unset($this->titleWidth);
+            unset($this->colFits);
+            unset($this->display_column);
+            unset($this->colAlign);
+
+            /**
+             * Pass 1 for column widths
+             */
+            $this->results = PMA_DBI_query($query, null, PMA_DBI_QUERY_UNBUFFERED);
+            $this->numFields  = PMA_DBI_num_fields($this->results);
+            $this->fields = PMA_DBI_get_fields_meta($this->results);
+
+            // sColWidth = starting col width (an average size width)
+            $availableWidth = $this->w - $this->lMargin - $this->rMargin;
+            $this->sColWidth = $availableWidth / $this->numFields;
+            $totalTitleWidth = 0;
+
+            // loop through results header and set initial col widths/ titles/ alignment
+            // if a col title is less than the starting col width, reduce that column size
+            for ($i = 0; $i < $this->numFields; $i++) {
+                $stringWidth = $this->getstringwidth($this->fields[$i]->name) + 6 ;
+                // save the real title's width
+                $titleWidth[$i] = $stringWidth;
+                $totalTitleWidth += $stringWidth;
+
+                // set any column titles less than the start width to the column title width
+                if ($stringWidth < $this->sColWidth) {
+                    $colFits[$i] = $stringWidth ;
+                }
+                $this->colTitles[$i] = $this->fields[$i]->name;
+                $this->display_column[$i] = true;
+
+                switch ($this->fields[$i]->type) {
+                case 'int':
+                    $this->colAlign[$i] = 'R';
+                    break;
+                case 'blob':
+                case 'tinyblob':
+                case 'mediumblob':
+                case 'longblob':
+                    /**
+                     * @todo do not deactivate completely the display
+                     * but show the field's name and [BLOB]
+                     */
+                    if (stristr($this->fields[$i]->flags, 'BINARY')) {
+                        $this->display_column[$i] = false;
+                        unset($this->colTitles[$i]);
+                    }
+                    $this->colAlign[$i] = 'L';
+                    break;
+                default:
+                    $this->colAlign[$i] = 'L';
+                }
+            }
+
+            // title width verification
+            if ($totalTitleWidth > $availableWidth) {
+                $adjustingMode = true;
+            } else {
+                $adjustingMode = false;
+                // we have enough space for all the titles at their
+                // original width so use the true title's width
+                foreach ($titleWidth as $key => $val) {
+                    $colFits[$key] = $val;
+                }
+            }
+
+            // loop through the data; any column whose contents
+            // is greater than the column size is resized
+            /**
+              * @todo force here a LIMIT to avoid reading all rows
+              */
+            while ($row = PMA_DBI_fetch_row($this->results)) {
+                foreach ($colFits as $key => $val) {
+                    $stringWidth = $this->getstringwidth($row[$key]) + 6 ;
+                    if ($adjustingMode && ($stringWidth > $this->sColWidth)) {
+                    // any column whose data's width is bigger than the start width is now discarded
+                        unset($colFits[$key]);
+                    } else {
+                    // if data's width is bigger than the current column width,
+                    // enlarge the column (but avoid enlarging it if the
+                    // data's width is very big)
+                            if ($stringWidth > $val && $stringWidth < ($this->sColWidth * 3)) {
+                            $colFits[$key] = $stringWidth ;
+                        }
                     }
                 }
             }
-        }
 
-        $totAlreadyFitted = 0;
-        foreach ($colFits as $key => $val) {
-            // set fitted columns to smallest size
-            $this->tablewidths[$key] = $val;
-            // to work out how much (if any) space has been freed up
-            $totAlreadyFitted += $val;
-        }
-
-        if ($adjustingMode) {
-            $surplus = (sizeof($colFits) * $this->sColWidth) - $totAlreadyFitted;
-            $surplusToAdd = $surplus / ($this->numFields - sizeof($colFits));
-        } else {
-            $surplusToAdd = 0;
-        }
-
-        for ($i=0; $i < $this->numFields; $i++) {
-            if (!in_array($i, array_keys($colFits))) {
-                $this->tablewidths[$i] = $this->sColWidth + $surplusToAdd;
+            $totAlreadyFitted = 0;
+            foreach ($colFits as $key => $val) {
+                // set fitted columns to smallest size
+                $this->tablewidths[$key] = $val;
+                // to work out how much (if any) space has been freed up
+                $totAlreadyFitted += $val;
             }
-            if ($this->display_column[$i] == false) {
-                $this->tablewidths[$i] = 0;
+
+            if ($adjustingMode) {
+                $surplus = (sizeof($colFits) * $this->sColWidth) - $totAlreadyFitted;
+                $surplusToAdd = $surplus / ($this->numFields - sizeof($colFits));
+            } else {
+                $surplusToAdd = 0;
             }
+
+            for ($i=0; $i < $this->numFields; $i++) {
+                if (!in_array($i, array_keys($colFits))) {
+                    $this->tablewidths[$i] = $this->sColWidth + $surplusToAdd;
+                }
+                if ($this->display_column[$i] == false) {
+                    $this->tablewidths[$i] = 0;
+                }
+            }
+
+            ksort($this->tablewidths);
+
+            PMA_DBI_free_result($this->results);
+
+            // Pass 2
+
+            $this->results = PMA_DBI_query($query, null, PMA_DBI_QUERY_UNBUFFERED);
+            $this->setY($this->tMargin);
+            $this->AddPage();
+            $this->morepagestable($this->FontSizePt);
+            PMA_DBI_free_result($this->results);
+
+        } // end of mysql_report function
+
+    } // end of PMA_PDF class
+
+    $pdf = new PMA_PDF('L', 'pt', 'A3');
+
+    /**
+     * Finalize the pdf.
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter()
+    {
+        global $pdf;
+
+        // instead of $pdf->Output():
+        if (!PMA_exportOutputHandler($pdf->getPDFData())) {
+            return false;
         }
 
-        ksort($this->tablewidths);
-
-        PMA_DBI_free_result($this->results);
-
-        // Pass 2
-
-        $this->results = PMA_DBI_query($query, null, PMA_DBI_QUERY_UNBUFFERED);
-        $this->setY($this->tMargin);
-        $this->AddPage();
-        $this->morepagestable($this->FontSizePt);
-        PMA_DBI_free_result($this->results);
-
-    } // end of mysql_report function
-
-} // end of PMA_PDF class
-
-$pdf = new PMA_PDF('L', 'pt', 'A3');
-
-/**
- * Finalize the pdf.
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter()
-{
-    global $pdf;
-
-    // instead of $pdf->Output():
-    if (!PMA_exportOutputHandler($pdf->getPDFData())) {
-        return false;
+        return true;
     }
 
-    return true;
-}
+    /**
+     * Initialize the pdf to export data.
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader()
+    {
+        global $pdf_report_title;
+        global $pdf;
 
-/**
- * Initialize the pdf to export data.
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader()
-{
-    global $pdf_report_title;
-    global $pdf;
+        $pdf->AddFont('DejaVuSans', '', 'dejavusans.php');
+        $pdf->AddFont('DejaVuSans', 'B', 'dejavusansb.php');
+        $pdf->AddFont('DejaVuSerif', '', 'dejavuserif.php');
+        $pdf->AddFont('DejaVuSerif', 'B', 'dejavuserifb.php');
+        $pdf->SetFont(PMA_PDF_FONT, '', 11.5);
+        $pdf->setFooterFont(array(PMA_PDF_FONT, '', 11.5));
+        $pdf->AliasNbPages();
+        $pdf->Open();
 
-    $pdf->AddFont('DejaVuSans', '', 'dejavusans.php');
-    $pdf->AddFont('DejaVuSans', 'B', 'dejavusansb.php');
-    $pdf->AddFont('DejaVuSerif', '', 'dejavuserif.php');
-    $pdf->AddFont('DejaVuSerif', 'B', 'dejavuserifb.php');
-    $pdf->SetFont(PMA_PDF_FONT, '', 11.5);
-    $pdf->setFooterFont(array(PMA_PDF_FONT, '', 11.5));
-    $pdf->AliasNbPages();
-    $pdf->Open();
+        $attr=array('titleFontSize' => 18, 'titleText' => $pdf_report_title);
+        $pdf->setAttributes($attr);
+        $pdf->setTopMargin(45);
 
-    $attr=array('titleFontSize' => 18, 'titleText' => $pdf_report_title);
-    $pdf->setAttributes($attr);
-    $pdf->setTopMargin(45);
+        return true;
+    }
 
-    return true;
-}
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db)
+    {
+        return true;
+    }
 
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db)
-{
-    return true;
-}
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db)
+    {
+        return true;
+    }
 
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db)
-{
-    return true;
-}
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db)
+    {
+        return true;
+    }
 
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db)
-{
-    return true;
-}
+    /**
+     * Outputs the content of a table in PDF format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        global $pdf;
 
-/**
- * Outputs the content of a table in PDF format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    global $pdf;
+        $attr=array('currentDb' => $db, 'currentTable' => $table);
+        $pdf->setAttributes($attr);
+        $pdf->mysql_report($sql_query);
 
-    $attr=array('currentDb' => $db, 'currentTable' => $table);
-    $pdf->setAttributes($attr);
-    $pdf->mysql_report($sql_query);
-
-    return true;
-} // end of the 'PMA_exportData()' function
+        return true;
+    } // end of the 'PMA_exportData()' function
 }
 ?>
diff --git a/libraries/export/php_array.php b/libraries/export/php_array.php
index 783afe0930..642475954a 100644
--- a/libraries/export/php_array.php
+++ b/libraries/export/php_array.php
@@ -30,134 +30,134 @@ if (isset($plugin_list)) {
     );
 } else {
 
-/**
- * Set of functions used to build exports of tables
- */
+    /**
+     * Set of functions used to build exports of tables
+     */
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter()
-{
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader()
-{
-    PMA_exportOutputHandler(
-          '<?php' . $GLOBALS['crlf']
-        . '/**' . $GLOBALS['crlf']
-        . ' * Export to PHP Array plugin for PHPMyAdmin' . $GLOBALS['crlf']
-        . ' * @version 0.2b' . $GLOBALS['crlf']
-        . ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf']
-    );
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db)
-{
-    PMA_exportOutputHandler('//' . $GLOBALS['crlf'] . '// Database "' . $db . '"' . $GLOBALS['crlf'] . '//' . $GLOBALS['crlf']);
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db)
-{
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db)
-{
-    return true;
-}
-
-/**
- * Outputs the content of a table as a fragment of PHP code
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-
-    $columns_cnt = PMA_DBI_num_fields($result);
-    for ($i = 0; $i < $columns_cnt; $i++) {
-        $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter()
+    {
+        return true;
     }
-    unset($i);
 
-    $buffer = '';
-    $record_cnt = 0;
-    while ($record = PMA_DBI_fetch_row($result)) {
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader()
+    {
+        PMA_exportOutputHandler(
+              '<?php' . $GLOBALS['crlf']
+            . '/**' . $GLOBALS['crlf']
+            . ' * Export to PHP Array plugin for PHPMyAdmin' . $GLOBALS['crlf']
+            . ' * @version 0.2b' . $GLOBALS['crlf']
+            . ' */' . $GLOBALS['crlf'] . $GLOBALS['crlf']
+        );
+        return true;
+    }
 
-        $record_cnt++;
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db)
+    {
+        PMA_exportOutputHandler('//' . $GLOBALS['crlf'] . '// Database "' . $db . '"' . $GLOBALS['crlf'] . '//' . $GLOBALS['crlf']);
+        return true;
+    }
 
-        // Output table name as comment if this is the first record of the table
-        if ($record_cnt == 1) {
-            $buffer .= $crlf . '// ' . $db . '.' . $table . $crlf;
-            $buffer .= '$' . $table . ' = array(' . $crlf;
-            $buffer .= '  array(';
-        } else {
-            $buffer .= ',' . $crlf . '  array(';
-        }
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db)
+    {
+        return true;
+    }
 
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db)
+    {
+        return true;
+    }
 
+    /**
+     * Outputs the content of a table as a fragment of PHP code
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+
+        $columns_cnt = PMA_DBI_num_fields($result);
         for ($i = 0; $i < $columns_cnt; $i++) {
-            $buffer .= "'" . $columns[$i]. "'=>" . var_export($record[$i], true) . (($i + 1 >= $columns_cnt) ? '' : ',');
+            $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
+        }
+        unset($i);
+
+        $buffer = '';
+        $record_cnt = 0;
+        while ($record = PMA_DBI_fetch_row($result)) {
+
+            $record_cnt++;
+
+            // Output table name as comment if this is the first record of the table
+            if ($record_cnt == 1) {
+                $buffer .= $crlf . '// ' . $db . '.' . $table . $crlf;
+                $buffer .= '$' . $table . ' = array(' . $crlf;
+                $buffer .= '  array(';
+            } else {
+                $buffer .= ',' . $crlf . '  array(';
+            }
+
+
+            for ($i = 0; $i < $columns_cnt; $i++) {
+                $buffer .= "'" . $columns[$i]. "'=>" . var_export($record[$i], true) . (($i + 1 >= $columns_cnt) ? '' : ',');
+            }
+
+            $buffer .= ')';
         }
 
-        $buffer .= ')';
+        $buffer .= $crlf . ');' . $crlf;
+        if (! PMA_exportOutputHandler($buffer)) {
+            return false;
+        }
+
+        PMA_DBI_free_result($result);
+
+        return true;
     }
 
-    $buffer .= $crlf . ');' . $crlf;
-    if (! PMA_exportOutputHandler($buffer)) {
-        return false;
-    }
-
-    PMA_DBI_free_result($result);
-
-    return true;
-}
-
 }
diff --git a/libraries/export/sql.php b/libraries/export/sql.php
index 0781db428a..f0f6f15fb1 100644
--- a/libraries/export/sql.php
+++ b/libraries/export/sql.php
@@ -294,956 +294,956 @@ if (isset($plugin_list)) {
     }
 } else {
 
-/**
- * Avoids undefined variables, use NULL so isset() returns false
- */
-if (! isset($sql_backquotes)) {
-    $sql_backquotes = null;
-}
-
-/**
- * Exports routines (procedures and functions)
- *
- * @param string  $db
- * @return  bool  Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportRoutines($db) {
-    global $crlf;
-
-    $text = '';
-    $delimiter = '$$';
-
-    $procedure_names = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE');
-    $function_names = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION');
-
-    if ($procedure_names || $function_names) {
-        $text .= $crlf
-            . 'DELIMITER ' . $delimiter . $crlf;
+    /**
+     * Avoids undefined variables, use NULL so isset() returns false
+     */
+    if (! isset($sql_backquotes)) {
+        $sql_backquotes = null;
     }
 
-    if ($procedure_names) {
-        $text .=
-            PMA_exportComment()
-          . PMA_exportComment(__('Procedures'))
-          . PMA_exportComment();
+    /**
+     * Exports routines (procedures and functions)
+     *
+     * @param string  $db
+     * @return  bool  Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportRoutines($db) {
+        global $crlf;
 
-        foreach ($procedure_names as $procedure_name) {
-            if (! empty($GLOBALS['sql_drop_table'])) {
-                $text .= 'DROP PROCEDURE IF EXISTS '
-                    . PMA_backquote($procedure_name)
-                    . $delimiter . $crlf;
-            }
-            $text .= PMA_DBI_get_definition($db, 'PROCEDURE', $procedure_name)
-                . $delimiter . $crlf . $crlf;
-        }
-    }
-
-    if ($function_names) {
-        $text .=
-            PMA_exportComment()
-          . PMA_exportComment(__('Functions'))
-          . PMA_exportComment();
-
-        foreach ($function_names as $function_name) {
-            if (! empty($GLOBALS['sql_drop_table'])) {
-                $text .= 'DROP FUNCTION IF EXISTS '
-                    . PMA_backquote($function_name)
-                    . $delimiter . $crlf;
-            }
-            $text .= PMA_DBI_get_definition($db, 'FUNCTION', $function_name)
-                . $delimiter . $crlf . $crlf;
-        }
-    }
-
-    if ($procedure_names || $function_names) {
-        $text .= 'DELIMITER ;' . $crlf;
-    }
-
-    if (! empty($text)) {
-        return PMA_exportOutputHandler($text);
-    } else {
-        return false;
-    }
-}
-
-/**
- * Possibly outputs comment
- *
- * @param string  $text  Text of comment
- * @return  string      The formatted comment
- *
- * @access  private
- */
-function PMA_exportComment($text = '')
-{
-    if (isset($GLOBALS['sql_include_comments']) && $GLOBALS['sql_include_comments']) {
-        // see http://dev.mysql.com/doc/refman/5.0/en/ansi-diff-comments.html
-        return '--' . (empty($text) ? '' : ' ') . $text . $GLOBALS['crlf'];
-    } else {
-        return '';
-    }
-}
-
-/**
- * Possibly outputs CRLF
- *
- * @return  string  $crlf or nothing
- *
- * @access private
- */
-function PMA_possibleCRLF()
-{
-    if (isset($GLOBALS['sql_include_comments']) && $GLOBALS['sql_include_comments']) {
-        return $GLOBALS['crlf'];
-    } else {
-        return '';
-    }
-}
-
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter()
-{
-    global $crlf;
-    global $mysql_charset_map;
-
-    $foot = '';
-
-    if (isset($GLOBALS['sql_disable_fk'])) {
-        $foot .=  'SET FOREIGN_KEY_CHECKS=1;' . $crlf;
-    }
-
-    if (isset($GLOBALS['sql_use_transaction'])) {
-        $foot .=  'COMMIT;' . $crlf;
-    }
-
-    // restore connection settings
-    $charset_of_file = isset($GLOBALS['charset_of_file']) ? $GLOBALS['charset_of_file'] : '';
-    if (!empty($GLOBALS['asfile']) && isset($mysql_charset_map[$charset_of_file])) {
-        $foot .=  $crlf
-                . '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . $crlf
-                . '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;' . $crlf
-                . '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;' . $crlf;
-    }
-
-    /* Restore timezone */
-    if ($GLOBALS['sql_utc_time']) {
-        PMA_DBI_query('SET time_zone = "' . $GLOBALS['old_tz'] . '"');
-    }
-
-    return PMA_exportOutputHandler($foot);
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader()
-{
-    global $crlf;
-    global $cfg;
-    global $mysql_charset_map;
-
-    if (isset($GLOBALS['sql_compatibility'])) {
-        $tmp_compat = $GLOBALS['sql_compatibility'];
-        if ($tmp_compat == 'NONE') {
-            $tmp_compat = '';
-        }
-        PMA_DBI_try_query('SET SQL_MODE="' . $tmp_compat . '"');
-        unset($tmp_compat);
-    }
-    $head  =  PMA_exportComment('phpMyAdmin SQL Dump')
-           .  PMA_exportComment('version ' . PMA_VERSION)
-           .  PMA_exportComment('http://www.phpmyadmin.net')
-           .  PMA_exportComment();
-    $host_string = __('Host') . ': ' .  $cfg['Server']['host'];
-    if (!empty($cfg['Server']['port'])) {
-        $host_string .= ':' . $cfg['Server']['port'];
-    }
-    $head .= PMA_exportComment($host_string);
-    $head .= PMA_exportComment(__('Generation Time')
-          . ': ' .  PMA_localisedDate())
-          .  PMA_exportComment(__('Server version') . ': ' . PMA_MYSQL_STR_VERSION)
-          .  PMA_exportComment(__('PHP Version') . ': ' . phpversion())
-          .  PMA_possibleCRLF();
-
-    if (isset($GLOBALS['sql_header_comment']) && !empty($GLOBALS['sql_header_comment'])) {
-        // '\n' is not a newline (like "\n" would be), it's the characters
-        // backslash and n, as explained on the export interface
-        $lines = explode('\n', $GLOBALS['sql_header_comment']);
-        $head .= PMA_exportComment();
-        foreach ($lines as $one_line) {
-            $head .= PMA_exportComment($one_line);
-        }
-        $head .= PMA_exportComment();
-    }
-
-    if (isset($GLOBALS['sql_disable_fk'])) {
-        $head .= 'SET FOREIGN_KEY_CHECKS=0;' . $crlf;
-    }
-
-    /* We want exported AUTO_INCREMENT fields to have still same value, do this only for recent MySQL exports */
-    if (!isset($GLOBALS['sql_compatibility']) || $GLOBALS['sql_compatibility'] == 'NONE') {
-        $head .= 'SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";' . $crlf;
-    }
-
-    if (isset($GLOBALS['sql_use_transaction'])) {
-        $head .= 'SET AUTOCOMMIT=0;' . $crlf
-               . 'START TRANSACTION;' . $crlf;
-    }
-
-
-    /* Change timezone if we should export timestamps in UTC */
-    if ($GLOBALS['sql_utc_time']) {
-        $head .= 'SET time_zone = "+00:00";' . $crlf;
-        $GLOBALS['old_tz'] = PMA_DBI_fetch_value('SELECT @@session.time_zone');
-        PMA_DBI_query('SET time_zone = "+00:00"');
-    }
-
-    $head .= PMA_possibleCRLF();
-
-    if (! empty($GLOBALS['asfile'])) {
-        // we are saving as file, therefore we provide charset information
-        // so that a utility like the mysql client can interpret
-        // the file correctly
-        if (isset($GLOBALS['charset_of_file']) && isset($mysql_charset_map[$GLOBALS['charset_of_file']])) {
-            // we got a charset from the export dialog
-            $set_names = $mysql_charset_map[$GLOBALS['charset_of_file']];
-        } else {
-            // by default we use the connection charset
-            $set_names = $mysql_charset_map['utf-8'];
-        }
-        $head .=  $crlf
-               . '/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;' . $crlf
-               . '/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;' . $crlf
-               . '/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;' . $crlf
-               . '/*!40101 SET NAMES ' . $set_names . ' */;' . $crlf . $crlf;
-    }
-
-    return PMA_exportOutputHandler($head);
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db)
-{
-    global $crlf;
-    if (isset($GLOBALS['sql_drop_database'])) {
-        if (!PMA_exportOutputHandler('DROP DATABASE ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : $db) . ';' . $crlf)) {
-            return false;
-        }
-    }
-    $create_query = 'CREATE DATABASE ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : $db);
-    $collation = PMA_getDbCollation($db);
-    if (strpos($collation, '_')) {
-        $create_query .= ' DEFAULT CHARACTER SET ' . substr($collation, 0, strpos($collation, '_')) . ' COLLATE ' . $collation;
-    } else {
-        $create_query .= ' DEFAULT CHARACTER SET ' . $collation;
-    }
-    $create_query .= ';' . $crlf;
-    if (!PMA_exportOutputHandler($create_query)) {
-        return false;
-    }
-    if (isset($GLOBALS['sql_backquotes']) && isset($GLOBALS['sql_compatibility']) && $GLOBALS['sql_compatibility'] == 'NONE') {
-        $result = PMA_exportOutputHandler('USE ' . PMA_backquote($db) . ';' . $crlf);
-    } else {
-        $result = PMA_exportOutputHandler('USE ' . $db . ';' . $crlf);
-    }
-
-    return $result;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db)
-{
-    $head = PMA_exportComment()
-          . PMA_exportComment(__('Database') . ': ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''))
-          . PMA_exportComment();
-    return PMA_exportOutputHandler($head);
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db)
-{
-    global $crlf;
-
-    $result = true;
-    if (isset($GLOBALS['sql_constraints'])) {
-        $result = PMA_exportOutputHandler($GLOBALS['sql_constraints']);
-        unset($GLOBALS['sql_constraints']);
-    }
-
-    if (($GLOBALS['sql_structure_or_data'] == 'structure' || $GLOBALS['sql_structure_or_data'] == 'structure_and_data') && isset($GLOBALS['sql_procedure_function'])) {
         $text = '';
         $delimiter = '$$';
 
-        if (PMA_MYSQL_INT_VERSION > 50100) {
-            $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db,true) . '\';');
-        } else {
-            $event_names = array();
+        $procedure_names = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE');
+        $function_names = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION');
+
+        if ($procedure_names || $function_names) {
+            $text .= $crlf
+                . 'DELIMITER ' . $delimiter . $crlf;
         }
 
-        if ($event_names) {
-            $text .= $crlf
-              . 'DELIMITER ' . $delimiter . $crlf;
-
+        if ($procedure_names) {
             $text .=
                 PMA_exportComment()
-              . PMA_exportComment(__('Events'))
+              . PMA_exportComment(__('Procedures'))
               . PMA_exportComment();
 
-            foreach ($event_names as $event_name) {
+            foreach ($procedure_names as $procedure_name) {
                 if (! empty($GLOBALS['sql_drop_table'])) {
-            $text .= 'DROP EVENT ' . PMA_backquote($event_name) . $delimiter . $crlf;
+                    $text .= 'DROP PROCEDURE IF EXISTS '
+                        . PMA_backquote($procedure_name)
+                        . $delimiter . $crlf;
                 }
-                $text .= PMA_DBI_get_definition($db, 'EVENT', $event_name) . $delimiter . $crlf . $crlf;
+                $text .= PMA_DBI_get_definition($db, 'PROCEDURE', $procedure_name)
+                    . $delimiter . $crlf . $crlf;
             }
+        }
 
+        if ($function_names) {
+            $text .=
+                PMA_exportComment()
+              . PMA_exportComment(__('Functions'))
+              . PMA_exportComment();
+
+            foreach ($function_names as $function_name) {
+                if (! empty($GLOBALS['sql_drop_table'])) {
+                    $text .= 'DROP FUNCTION IF EXISTS '
+                        . PMA_backquote($function_name)
+                        . $delimiter . $crlf;
+                }
+                $text .= PMA_DBI_get_definition($db, 'FUNCTION', $function_name)
+                    . $delimiter . $crlf . $crlf;
+            }
+        }
+
+        if ($procedure_names || $function_names) {
             $text .= 'DELIMITER ;' . $crlf;
         }
 
         if (! empty($text)) {
-            $result = PMA_exportOutputHandler($text);
+            return PMA_exportOutputHandler($text);
+        } else {
+            return false;
         }
     }
-    return $result;
-}
 
-/**
- * Returns a stand-in CREATE definition to resolve view dependencies
- *
- * @param string  $db    the database name
- * @param string  $view  the view name
- * @param string  $crlf  the end of line sequence
- * @return  string         resulting definition
- *
- * @access  public
- */
-function PMA_getTableDefStandIn($db, $view, $crlf) {
-    $create_query = '';
-    if (! empty($GLOBALS['sql_drop_table'])) {
-        $create_query .= 'DROP VIEW IF EXISTS ' . PMA_backquote($view) . ';' . $crlf;
-    }
-
-    $create_query .= 'CREATE TABLE ';
-
-    if (isset($GLOBALS['sql_if_not_exists']) && $GLOBALS['sql_if_not_exists']) {
-        $create_query .= 'IF NOT EXISTS ';
-    }
-    $create_query .= PMA_backquote($view) . ' (' . $crlf;
-    $tmp = array();
-    $columns = PMA_DBI_get_columns_full($db, $view);
-    foreach ($columns as $column_name => $definition) {
-        $tmp[] = PMA_backquote($column_name) . ' ' . $definition['Type'] . $crlf;
-    }
-    $create_query .= implode(',', $tmp) . ');';
-    return($create_query);
-}
-
-/**
- * Returns $table's CREATE definition
- *
- * @param string  $db             the database name
- * @param string  $table          the table name
- * @param string  $crlf           the end of line sequence
- * @param string  $error_url      the url to go back in case of error
- * @param bool    $show_dates     whether to include creation/update/check dates
- * @param bool    $add_semicolon  whether to add semicolon and end-of-line at the end
- * @param bool    $view           whether we're handling a view
- * @return  string   resulting schema
- *
- * @access  public
- */
-function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $add_semicolon = true, $view = false)
-{
-    global $sql_drop_table;
-    global $sql_backquotes;
-    global $sql_constraints_query; // just the text of the query
-    global $sql_drop_foreign_keys;
-
-    $schema_create = '';
-    $auto_increment = '';
-    $new_crlf = $crlf;
-
-    // need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli
-    $result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddSlashes($table, true) . '\'', null, PMA_DBI_QUERY_STORE);
-    if ($result != false) {
-        if (PMA_DBI_num_rows($result) > 0) {
-            $tmpres        = PMA_DBI_fetch_assoc($result);
-            // Here we optionally add the AUTO_INCREMENT next value,
-            // but starting with MySQL 5.0.24, the clause is already included
-            // in SHOW CREATE TABLE so we'll remove it below
-            if (isset($GLOBALS['sql_auto_increment']) && !empty($tmpres['Auto_increment'])) {
-                $auto_increment .= ' AUTO_INCREMENT=' . $tmpres['Auto_increment'] . ' ';
-            }
-
-            if ($show_dates && isset($tmpres['Create_time']) && !empty($tmpres['Create_time'])) {
-                $schema_create .= PMA_exportComment(__('Creation') . ': ' . PMA_localisedDate(strtotime($tmpres['Create_time'])));
-                $new_crlf = PMA_exportComment() . $crlf;
-            }
-
-            if ($show_dates && isset($tmpres['Update_time']) && !empty($tmpres['Update_time'])) {
-                $schema_create .= PMA_exportComment(__('Last update') . ': ' . PMA_localisedDate(strtotime($tmpres['Update_time'])));
-                $new_crlf = PMA_exportComment() . $crlf;
-            }
-
-            if ($show_dates && isset($tmpres['Check_time']) && !empty($tmpres['Check_time'])) {
-                $schema_create .= PMA_exportComment(__('Last check') . ': ' . PMA_localisedDate(strtotime($tmpres['Check_time'])));
-                $new_crlf = PMA_exportComment() . $crlf;
-            }
+    /**
+     * Possibly outputs comment
+     *
+     * @param string  $text  Text of comment
+     * @return  string      The formatted comment
+     *
+     * @access  private
+     */
+    function PMA_exportComment($text = '')
+    {
+        if (isset($GLOBALS['sql_include_comments']) && $GLOBALS['sql_include_comments']) {
+            // see http://dev.mysql.com/doc/refman/5.0/en/ansi-diff-comments.html
+            return '--' . (empty($text) ? '' : ' ') . $text . $GLOBALS['crlf'];
+        } else {
+            return '';
         }
-        PMA_DBI_free_result($result);
     }
 
-    $schema_create .= $new_crlf;
-
-    // no need to generate a DROP VIEW here, it was done earlier
-    if (! empty($sql_drop_table) && ! PMA_Table::isView($db,$table)) {
-        $schema_create .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table, $sql_backquotes) . ';' . $crlf;
+    /**
+     * Possibly outputs CRLF
+     *
+     * @return  string  $crlf or nothing
+     *
+     * @access private
+     */
+    function PMA_possibleCRLF()
+    {
+        if (isset($GLOBALS['sql_include_comments']) && $GLOBALS['sql_include_comments']) {
+            return $GLOBALS['crlf'];
+        } else {
+            return '';
+        }
     }
 
-    // Complete table dump,
-    // Whether to quote table and fields names or not
-    if ($sql_backquotes) {
-        PMA_DBI_query('SET SQL_QUOTE_SHOW_CREATE = 1');
-    } else {
-        PMA_DBI_query('SET SQL_QUOTE_SHOW_CREATE = 0');
-    }
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter()
+    {
+        global $crlf;
+        global $mysql_charset_map;
 
-    // I don't see the reason why this unbuffered query could cause problems,
-    // because SHOW CREATE TABLE returns only one row, and we free the
-    // results below. Nonetheless, we got 2 user reports about this
-    // (see bug 1562533) so I remove the unbuffered mode.
-    //$result = PMA_DBI_query('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), null, PMA_DBI_QUERY_UNBUFFERED);
-    //
-    // Note: SHOW CREATE TABLE, at least in MySQL 5.1.23, does not
-    // produce a displayable result for the default value of a BIT
-    // field, nor does the mysqldump command. See MySQL bug 35796
-    $result = PMA_DBI_try_query('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table));
-    // an error can happen, for example the table is crashed
-    $tmp_error = PMA_DBI_getError();
-    if ($tmp_error) {
-        return PMA_exportComment(__('in use') . '(' . $tmp_error . ')');
-    }
+        $foot = '';
 
-    if ($result != false && ($row = PMA_DBI_fetch_row($result))) {
-        $create_query = $row[1];
-        unset($row);
-
-        // Convert end of line chars to one that we want (note that MySQL doesn't return query it will accept in all cases)
-        if (strpos($create_query, "(\r\n ")) {
-            $create_query = str_replace("\r\n", $crlf, $create_query);
-        } elseif (strpos($create_query, "(\n ")) {
-            $create_query = str_replace("\n", $crlf, $create_query);
-        } elseif (strpos($create_query, "(\r ")) {
-            $create_query = str_replace("\r", $crlf, $create_query);
+        if (isset($GLOBALS['sql_disable_fk'])) {
+            $foot .=  'SET FOREIGN_KEY_CHECKS=1;' . $crlf;
         }
 
-        /*
-         * Drop database name from VIEW creation.
-         *
-         * This is a bit tricky, but we need to issue SHOW CREATE TABLE with
-         * database name, but we don't want name to show up in CREATE VIEW
-         * statement.
-         */
-        if ($view) {
-            $create_query = preg_replace('/' . PMA_backquote($db) . '\./', '', $create_query);
+        if (isset($GLOBALS['sql_use_transaction'])) {
+            $foot .=  'COMMIT;' . $crlf;
         }
 
-        // Should we use IF NOT EXISTS?
-        if (isset($GLOBALS['sql_if_not_exists'])) {
-            $create_query     = preg_replace('/^CREATE TABLE/', 'CREATE TABLE IF NOT EXISTS', $create_query);
+        // restore connection settings
+        $charset_of_file = isset($GLOBALS['charset_of_file']) ? $GLOBALS['charset_of_file'] : '';
+        if (!empty($GLOBALS['asfile']) && isset($mysql_charset_map[$charset_of_file])) {
+            $foot .=  $crlf
+                    . '/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;' . $crlf
+                    . '/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;' . $crlf
+                    . '/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;' . $crlf;
         }
 
-        // are there any constraints to cut out?
-        if (preg_match('@CONSTRAINT|FOREIGN[\s]+KEY@', $create_query)) {
+        /* Restore timezone */
+        if ($GLOBALS['sql_utc_time']) {
+            PMA_DBI_query('SET time_zone = "' . $GLOBALS['old_tz'] . '"');
+        }
 
-            // Split the query into lines, so we can easily handle it. We know lines are separated by $crlf (done few lines above).
-            $sql_lines = explode($crlf, $create_query);
-            $sql_count = count($sql_lines);
+        return PMA_exportOutputHandler($foot);
+    }
 
-            // lets find first line with constraints
-            for ($i = 0; $i < $sql_count; $i++) {
-                if (preg_match('@^[\s]*(CONSTRAINT|FOREIGN[\s]+KEY)@', $sql_lines[$i])) {
-                    break;
-                }
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader()
+    {
+        global $crlf;
+        global $cfg;
+        global $mysql_charset_map;
+
+        if (isset($GLOBALS['sql_compatibility'])) {
+            $tmp_compat = $GLOBALS['sql_compatibility'];
+            if ($tmp_compat == 'NONE') {
+                $tmp_compat = '';
+            }
+            PMA_DBI_try_query('SET SQL_MODE="' . $tmp_compat . '"');
+            unset($tmp_compat);
+        }
+        $head  =  PMA_exportComment('phpMyAdmin SQL Dump')
+               .  PMA_exportComment('version ' . PMA_VERSION)
+               .  PMA_exportComment('http://www.phpmyadmin.net')
+               .  PMA_exportComment();
+        $host_string = __('Host') . ': ' .  $cfg['Server']['host'];
+        if (!empty($cfg['Server']['port'])) {
+            $host_string .= ':' . $cfg['Server']['port'];
+        }
+        $head .= PMA_exportComment($host_string);
+        $head .= PMA_exportComment(__('Generation Time')
+              . ': ' .  PMA_localisedDate())
+              .  PMA_exportComment(__('Server version') . ': ' . PMA_MYSQL_STR_VERSION)
+              .  PMA_exportComment(__('PHP Version') . ': ' . phpversion())
+              .  PMA_possibleCRLF();
+
+        if (isset($GLOBALS['sql_header_comment']) && !empty($GLOBALS['sql_header_comment'])) {
+            // '\n' is not a newline (like "\n" would be), it's the characters
+            // backslash and n, as explained on the export interface
+            $lines = explode('\n', $GLOBALS['sql_header_comment']);
+            $head .= PMA_exportComment();
+            foreach ($lines as $one_line) {
+                $head .= PMA_exportComment($one_line);
+            }
+            $head .= PMA_exportComment();
+        }
+
+        if (isset($GLOBALS['sql_disable_fk'])) {
+            $head .= 'SET FOREIGN_KEY_CHECKS=0;' . $crlf;
+        }
+
+        /* We want exported AUTO_INCREMENT fields to have still same value, do this only for recent MySQL exports */
+        if (!isset($GLOBALS['sql_compatibility']) || $GLOBALS['sql_compatibility'] == 'NONE') {
+            $head .= 'SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";' . $crlf;
+        }
+
+        if (isset($GLOBALS['sql_use_transaction'])) {
+            $head .= 'SET AUTOCOMMIT=0;' . $crlf
+                   . 'START TRANSACTION;' . $crlf;
+        }
+
+
+        /* Change timezone if we should export timestamps in UTC */
+        if ($GLOBALS['sql_utc_time']) {
+            $head .= 'SET time_zone = "+00:00";' . $crlf;
+            $GLOBALS['old_tz'] = PMA_DBI_fetch_value('SELECT @@session.time_zone');
+            PMA_DBI_query('SET time_zone = "+00:00"');
+        }
+
+        $head .= PMA_possibleCRLF();
+
+        if (! empty($GLOBALS['asfile'])) {
+            // we are saving as file, therefore we provide charset information
+            // so that a utility like the mysql client can interpret
+            // the file correctly
+            if (isset($GLOBALS['charset_of_file']) && isset($mysql_charset_map[$GLOBALS['charset_of_file']])) {
+                // we got a charset from the export dialog
+                $set_names = $mysql_charset_map[$GLOBALS['charset_of_file']];
+            } else {
+                // by default we use the connection charset
+                $set_names = $mysql_charset_map['utf-8'];
+            }
+            $head .=  $crlf
+                   . '/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;' . $crlf
+                   . '/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;' . $crlf
+                   . '/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;' . $crlf
+                   . '/*!40101 SET NAMES ' . $set_names . ' */;' . $crlf . $crlf;
+        }
+
+        return PMA_exportOutputHandler($head);
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db)
+    {
+        global $crlf;
+        if (isset($GLOBALS['sql_drop_database'])) {
+            if (!PMA_exportOutputHandler('DROP DATABASE ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : $db) . ';' . $crlf)) {
+                return false;
+            }
+        }
+        $create_query = 'CREATE DATABASE ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : $db);
+        $collation = PMA_getDbCollation($db);
+        if (strpos($collation, '_')) {
+            $create_query .= ' DEFAULT CHARACTER SET ' . substr($collation, 0, strpos($collation, '_')) . ' COLLATE ' . $collation;
+        } else {
+            $create_query .= ' DEFAULT CHARACTER SET ' . $collation;
+        }
+        $create_query .= ';' . $crlf;
+        if (!PMA_exportOutputHandler($create_query)) {
+            return false;
+        }
+        if (isset($GLOBALS['sql_backquotes']) && isset($GLOBALS['sql_compatibility']) && $GLOBALS['sql_compatibility'] == 'NONE') {
+            $result = PMA_exportOutputHandler('USE ' . PMA_backquote($db) . ';' . $crlf);
+        } else {
+            $result = PMA_exportOutputHandler('USE ' . $db . ';' . $crlf);
+        }
+
+        return $result;
+    }
+
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db)
+    {
+        $head = PMA_exportComment()
+              . PMA_exportComment(__('Database') . ': ' . (isset($GLOBALS['sql_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''))
+              . PMA_exportComment();
+        return PMA_exportOutputHandler($head);
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db)
+    {
+        global $crlf;
+
+        $result = true;
+        if (isset($GLOBALS['sql_constraints'])) {
+            $result = PMA_exportOutputHandler($GLOBALS['sql_constraints']);
+            unset($GLOBALS['sql_constraints']);
+        }
+
+        if (($GLOBALS['sql_structure_or_data'] == 'structure' || $GLOBALS['sql_structure_or_data'] == 'structure_and_data') && isset($GLOBALS['sql_procedure_function'])) {
+            $text = '';
+            $delimiter = '$$';
+
+            if (PMA_MYSQL_INT_VERSION > 50100) {
+                $event_names = PMA_DBI_fetch_result('SELECT EVENT_NAME FROM information_schema.EVENTS WHERE EVENT_SCHEMA= \'' . PMA_sqlAddSlashes($db,true) . '\';');
+            } else {
+                $event_names = array();
             }
 
-            // If we really found a constraint
-            if ($i != $sql_count) {
+            if ($event_names) {
+                $text .= $crlf
+                  . 'DELIMITER ' . $delimiter . $crlf;
 
-                // remove , from the end of create statement
-                $sql_lines[$i - 1] = preg_replace('@,$@', '', $sql_lines[$i - 1]);
+                $text .=
+                    PMA_exportComment()
+                  . PMA_exportComment(__('Events'))
+                  . PMA_exportComment();
 
-                // prepare variable for constraints
-                if (!isset($sql_constraints)) {
-                    if (isset($GLOBALS['no_constraints_comments'])) {
-                        $sql_constraints = '';
-                    } else {
-                        $sql_constraints = $crlf
-                                         . PMA_exportComment()
-                                         . PMA_exportComment(__('Constraints for dumped tables'))
-                                         . PMA_exportComment();
+                foreach ($event_names as $event_name) {
+                    if (! empty($GLOBALS['sql_drop_table'])) {
+                $text .= 'DROP EVENT ' . PMA_backquote($event_name) . $delimiter . $crlf;
                     }
+                    $text .= PMA_DBI_get_definition($db, 'EVENT', $event_name) . $delimiter . $crlf . $crlf;
                 }
 
-                // comments for current table
-                if (!isset($GLOBALS['no_constraints_comments'])) {
-                    $sql_constraints .= $crlf
-                                      . PMA_exportComment()
-                                      . PMA_exportComment(__('Constraints for table') . ' ' . PMA_backquote($table))
-                                      . PMA_exportComment();
+                $text .= 'DELIMITER ;' . $crlf;
+            }
+
+            if (! empty($text)) {
+                $result = PMA_exportOutputHandler($text);
+            }
+        }
+        return $result;
+    }
+
+    /**
+     * Returns a stand-in CREATE definition to resolve view dependencies
+     *
+     * @param string  $db    the database name
+     * @param string  $view  the view name
+     * @param string  $crlf  the end of line sequence
+     * @return  string         resulting definition
+     *
+     * @access  public
+     */
+    function PMA_getTableDefStandIn($db, $view, $crlf) {
+        $create_query = '';
+        if (! empty($GLOBALS['sql_drop_table'])) {
+            $create_query .= 'DROP VIEW IF EXISTS ' . PMA_backquote($view) . ';' . $crlf;
+        }
+
+        $create_query .= 'CREATE TABLE ';
+
+        if (isset($GLOBALS['sql_if_not_exists']) && $GLOBALS['sql_if_not_exists']) {
+            $create_query .= 'IF NOT EXISTS ';
+        }
+        $create_query .= PMA_backquote($view) . ' (' . $crlf;
+        $tmp = array();
+        $columns = PMA_DBI_get_columns_full($db, $view);
+        foreach ($columns as $column_name => $definition) {
+            $tmp[] = PMA_backquote($column_name) . ' ' . $definition['Type'] . $crlf;
+        }
+        $create_query .= implode(',', $tmp) . ');';
+        return($create_query);
+    }
+
+    /**
+     * Returns $table's CREATE definition
+     *
+     * @param string  $db             the database name
+     * @param string  $table          the table name
+     * @param string  $crlf           the end of line sequence
+     * @param string  $error_url      the url to go back in case of error
+     * @param bool    $show_dates     whether to include creation/update/check dates
+     * @param bool    $add_semicolon  whether to add semicolon and end-of-line at the end
+     * @param bool    $view           whether we're handling a view
+     * @return  string   resulting schema
+     *
+     * @access  public
+     */
+    function PMA_getTableDef($db, $table, $crlf, $error_url, $show_dates = false, $add_semicolon = true, $view = false)
+    {
+        global $sql_drop_table;
+        global $sql_backquotes;
+        global $sql_constraints_query; // just the text of the query
+        global $sql_drop_foreign_keys;
+
+        $schema_create = '';
+        $auto_increment = '';
+        $new_crlf = $crlf;
+
+        // need to use PMA_DBI_QUERY_STORE with PMA_DBI_num_rows() in mysqli
+        $result = PMA_DBI_query('SHOW TABLE STATUS FROM ' . PMA_backquote($db) . ' LIKE \'' . PMA_sqlAddSlashes($table, true) . '\'', null, PMA_DBI_QUERY_STORE);
+        if ($result != false) {
+            if (PMA_DBI_num_rows($result) > 0) {
+                $tmpres        = PMA_DBI_fetch_assoc($result);
+                // Here we optionally add the AUTO_INCREMENT next value,
+                // but starting with MySQL 5.0.24, the clause is already included
+                // in SHOW CREATE TABLE so we'll remove it below
+                if (isset($GLOBALS['sql_auto_increment']) && !empty($tmpres['Auto_increment'])) {
+                    $auto_increment .= ' AUTO_INCREMENT=' . $tmpres['Auto_increment'] . ' ';
                 }
 
-                // let's do the work
-                $sql_constraints_query .= 'ALTER TABLE ' . PMA_backquote($table) . $crlf;
-                $sql_constraints .= 'ALTER TABLE ' . PMA_backquote($table) . $crlf;
-                $sql_drop_foreign_keys .= 'ALTER TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $crlf;
+                if ($show_dates && isset($tmpres['Create_time']) && !empty($tmpres['Create_time'])) {
+                    $schema_create .= PMA_exportComment(__('Creation') . ': ' . PMA_localisedDate(strtotime($tmpres['Create_time'])));
+                    $new_crlf = PMA_exportComment() . $crlf;
+                }
 
-                $first = true;
-                for ($j = $i; $j < $sql_count; $j++) {
-                    if (preg_match('@CONSTRAINT|FOREIGN[\s]+KEY@', $sql_lines[$j])) {
-                        if (!$first) {
-                            $sql_constraints .= $crlf;
-                        }
-                        if (strpos($sql_lines[$j], 'CONSTRAINT') === false) {
-                            $tmp_str = preg_replace('/(FOREIGN[\s]+KEY)/', 'ADD \1', $sql_lines[$j]);
-                            $sql_constraints_query .= $tmp_str;
-                            $sql_constraints .= $tmp_str;
-                        } else {
-                            $tmp_str = preg_replace('/(CONSTRAINT)/', 'ADD \1', $sql_lines[$j]);
-                            $sql_constraints_query .= $tmp_str;
-                            $sql_constraints .= $tmp_str;
-                            preg_match('/(CONSTRAINT)([\s])([\S]*)([\s])/', $sql_lines[$j], $matches);
-                            if (! $first) {
-                                $sql_drop_foreign_keys .= ', ';
-                            }
-                            $sql_drop_foreign_keys .= 'DROP FOREIGN KEY ' . $matches[3];
-                        }
-                        $first = false;
-                    } else {
+                if ($show_dates && isset($tmpres['Update_time']) && !empty($tmpres['Update_time'])) {
+                    $schema_create .= PMA_exportComment(__('Last update') . ': ' . PMA_localisedDate(strtotime($tmpres['Update_time'])));
+                    $new_crlf = PMA_exportComment() . $crlf;
+                }
+
+                if ($show_dates && isset($tmpres['Check_time']) && !empty($tmpres['Check_time'])) {
+                    $schema_create .= PMA_exportComment(__('Last check') . ': ' . PMA_localisedDate(strtotime($tmpres['Check_time'])));
+                    $new_crlf = PMA_exportComment() . $crlf;
+                }
+            }
+            PMA_DBI_free_result($result);
+        }
+
+        $schema_create .= $new_crlf;
+
+        // no need to generate a DROP VIEW here, it was done earlier
+        if (! empty($sql_drop_table) && ! PMA_Table::isView($db,$table)) {
+            $schema_create .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table, $sql_backquotes) . ';' . $crlf;
+        }
+
+        // Complete table dump,
+        // Whether to quote table and fields names or not
+        if ($sql_backquotes) {
+            PMA_DBI_query('SET SQL_QUOTE_SHOW_CREATE = 1');
+        } else {
+            PMA_DBI_query('SET SQL_QUOTE_SHOW_CREATE = 0');
+        }
+
+        // I don't see the reason why this unbuffered query could cause problems,
+        // because SHOW CREATE TABLE returns only one row, and we free the
+        // results below. Nonetheless, we got 2 user reports about this
+        // (see bug 1562533) so I remove the unbuffered mode.
+        //$result = PMA_DBI_query('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), null, PMA_DBI_QUERY_UNBUFFERED);
+        //
+        // Note: SHOW CREATE TABLE, at least in MySQL 5.1.23, does not
+        // produce a displayable result for the default value of a BIT
+        // field, nor does the mysqldump command. See MySQL bug 35796
+        $result = PMA_DBI_try_query('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table));
+        // an error can happen, for example the table is crashed
+        $tmp_error = PMA_DBI_getError();
+        if ($tmp_error) {
+            return PMA_exportComment(__('in use') . '(' . $tmp_error . ')');
+        }
+
+        if ($result != false && ($row = PMA_DBI_fetch_row($result))) {
+            $create_query = $row[1];
+            unset($row);
+
+            // Convert end of line chars to one that we want (note that MySQL doesn't return query it will accept in all cases)
+            if (strpos($create_query, "(\r\n ")) {
+                $create_query = str_replace("\r\n", $crlf, $create_query);
+            } elseif (strpos($create_query, "(\n ")) {
+                $create_query = str_replace("\n", $crlf, $create_query);
+            } elseif (strpos($create_query, "(\r ")) {
+                $create_query = str_replace("\r", $crlf, $create_query);
+            }
+
+            /*
+             * Drop database name from VIEW creation.
+             *
+             * This is a bit tricky, but we need to issue SHOW CREATE TABLE with
+             * database name, but we don't want name to show up in CREATE VIEW
+             * statement.
+             */
+            if ($view) {
+                $create_query = preg_replace('/' . PMA_backquote($db) . '\./', '', $create_query);
+            }
+
+            // Should we use IF NOT EXISTS?
+            if (isset($GLOBALS['sql_if_not_exists'])) {
+                $create_query     = preg_replace('/^CREATE TABLE/', 'CREATE TABLE IF NOT EXISTS', $create_query);
+            }
+
+            // are there any constraints to cut out?
+            if (preg_match('@CONSTRAINT|FOREIGN[\s]+KEY@', $create_query)) {
+
+                // Split the query into lines, so we can easily handle it. We know lines are separated by $crlf (done few lines above).
+                $sql_lines = explode($crlf, $create_query);
+                $sql_count = count($sql_lines);
+
+                // lets find first line with constraints
+                for ($i = 0; $i < $sql_count; $i++) {
+                    if (preg_match('@^[\s]*(CONSTRAINT|FOREIGN[\s]+KEY)@', $sql_lines[$i])) {
                         break;
                     }
                 }
-                $sql_constraints .= ';' . $crlf;
-                $sql_constraints_query .= ';';
 
-                $create_query = implode($crlf, array_slice($sql_lines, 0, $i)) . $crlf . implode($crlf, array_slice($sql_lines, $j, $sql_count - 1));
-                unset($sql_lines);
-            }
-        }
-        $schema_create .= $create_query;
-    }
+                // If we really found a constraint
+                if ($i != $sql_count) {
 
-    // remove a possible "AUTO_INCREMENT = value" clause
-    // that could be there starting with MySQL 5.0.24
-    $schema_create = preg_replace('/AUTO_INCREMENT\s*=\s*([0-9])+/', '', $schema_create);
+                    // remove , from the end of create statement
+                    $sql_lines[$i - 1] = preg_replace('@,$@', '', $sql_lines[$i - 1]);
 
-    $schema_create .= $auto_increment;
+                    // prepare variable for constraints
+                    if (!isset($sql_constraints)) {
+                        if (isset($GLOBALS['no_constraints_comments'])) {
+                            $sql_constraints = '';
+                        } else {
+                            $sql_constraints = $crlf
+                                             . PMA_exportComment()
+                                             . PMA_exportComment(__('Constraints for dumped tables'))
+                                             . PMA_exportComment();
+                        }
+                    }
 
-    PMA_DBI_free_result($result);
-    return $schema_create . ($add_semicolon ? ';' . $crlf : '');
-} // end of the 'PMA_getTableDef()' function
+                    // comments for current table
+                    if (!isset($GLOBALS['no_constraints_comments'])) {
+                        $sql_constraints .= $crlf
+                                          . PMA_exportComment()
+                                          . PMA_exportComment(__('Constraints for table') . ' ' . PMA_backquote($table))
+                                          . PMA_exportComment();
+                    }
 
-/**
- * Returns $table's comments, relations etc.
- *
- * @param string  $db           database name
- * @param string  $table        table name
- * @param string  $crlf         end of line sequence
- * @param bool    $do_relation  whether to include relation comments
- * @param bool    $do_mime      whether to include mime comments
- * @return  string   resulting comments
- *
- * @access  private
- */
-function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mime = false)
-{
-    global $cfgRelation;
-    global $sql_backquotes;
-    global $sql_constraints;
+                    // let's do the work
+                    $sql_constraints_query .= 'ALTER TABLE ' . PMA_backquote($table) . $crlf;
+                    $sql_constraints .= 'ALTER TABLE ' . PMA_backquote($table) . $crlf;
+                    $sql_drop_foreign_keys .= 'ALTER TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table) . $crlf;
 
-    $schema_create = '';
+                    $first = true;
+                    for ($j = $i; $j < $sql_count; $j++) {
+                        if (preg_match('@CONSTRAINT|FOREIGN[\s]+KEY@', $sql_lines[$j])) {
+                            if (!$first) {
+                                $sql_constraints .= $crlf;
+                            }
+                            if (strpos($sql_lines[$j], 'CONSTRAINT') === false) {
+                                $tmp_str = preg_replace('/(FOREIGN[\s]+KEY)/', 'ADD \1', $sql_lines[$j]);
+                                $sql_constraints_query .= $tmp_str;
+                                $sql_constraints .= $tmp_str;
+                            } else {
+                                $tmp_str = preg_replace('/(CONSTRAINT)/', 'ADD \1', $sql_lines[$j]);
+                                $sql_constraints_query .= $tmp_str;
+                                $sql_constraints .= $tmp_str;
+                                preg_match('/(CONSTRAINT)([\s])([\S]*)([\s])/', $sql_lines[$j], $matches);
+                                if (! $first) {
+                                    $sql_drop_foreign_keys .= ', ';
+                                }
+                                $sql_drop_foreign_keys .= 'DROP FOREIGN KEY ' . $matches[3];
+                            }
+                            $first = false;
+                        } else {
+                            break;
+                        }
+                    }
+                    $sql_constraints .= ';' . $crlf;
+                    $sql_constraints_query .= ';';
 
-    // Check if we can use Relations
-    if ($do_relation && !empty($cfgRelation['relation'])) {
-        // Find which tables are related with the current one and write it in
-        // an array
-        $res_rel = PMA_getForeigners($db, $table);
-
-        if ($res_rel && count($res_rel) > 0) {
-            $have_rel = true;
-        } else {
-            $have_rel = false;
-        }
-    } else {
-           $have_rel = false;
-    } // end if
-
-    if ($do_mime && $cfgRelation['mimework']) {
-        if (!($mime_map = PMA_getMIME($db, $table, true))) {
-            unset($mime_map);
-        }
-    }
-
-    if (isset($mime_map) && count($mime_map) > 0) {
-        $schema_create .= PMA_possibleCRLF()
-                       . PMA_exportComment()
-                       . PMA_exportComment(__('MIME TYPES FOR TABLE'). ' ' . PMA_backquote($table, $sql_backquotes) . ':');
-        @reset($mime_map);
-        foreach ($mime_map AS $mime_field => $mime) {
-            $schema_create .= PMA_exportComment('  ' . PMA_backquote($mime_field, $sql_backquotes))
-                            . PMA_exportComment('      ' . PMA_backquote($mime['mimetype'], $sql_backquotes));
-        }
-        $schema_create .= PMA_exportComment();
-    }
-
-    if ($have_rel) {
-        $schema_create .= PMA_possibleCRLF()
-                       . PMA_exportComment()
-                       . PMA_exportComment(__('RELATIONS FOR TABLE'). ' ' . PMA_backquote($table, $sql_backquotes) . ':');
-        foreach ($res_rel AS $rel_field => $rel) {
-            $schema_create .= PMA_exportComment('  ' . PMA_backquote($rel_field, $sql_backquotes))
-                            . PMA_exportComment('      ' . PMA_backquote($rel['foreign_table'], $sql_backquotes)
-                            . ' -> ' . PMA_backquote($rel['foreign_field'], $sql_backquotes));
-        }
-        $schema_create .= PMA_exportComment();
-    }
-
-    return $schema_create;
-
-} // end of the 'PMA_getTableComments()' function
-
-/**
- * Outputs table's structure
- *
- * @param string  $db           database name
- * @param string  $table        table name
- * @param string  $crlf         the end of line sequence
- * @param string  $error_url    the url to go back in case of error
- * @param bool    $relation     whether to include relation comments
- * @param bool    $comments     whether to include the pmadb-style column comments
- *                                as comments in the structure; this is deprecated
- *                                but the parameter is left here because export.php
- *                                calls PMA_exportStructure() also for other export
- *                                types which use this parameter
- * @param bool    $mime         whether to include mime comments
- * @param bool    $dates        whether to include creation/update/check dates
- * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
- * @param string  $export_type  'server', 'database', 'table'
- * @return  bool      Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false, $comments = false, $mime = false, $dates = false, $export_mode, $export_type)
-{
-    $formatted_table_name = (isset($GLOBALS['sql_backquotes']))
-                          ? PMA_backquote($table)
-                          : '\'' . $table . '\'';
-    $dump = PMA_possibleCRLF()
-          . PMA_exportComment(str_repeat('-', 56))
-          . PMA_possibleCRLF()
-          . PMA_exportComment();
-
-    switch($export_mode) {
-        case 'create_table':
-            $dump .= PMA_exportComment(__('Table structure for table') . ' ' . $formatted_table_name);
-            $dump .= PMA_exportComment();
-            $dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates);
-            $dump .= PMA_getTableComments($db, $table, $crlf, $relation, $mime);
-            break;
-        case 'triggers':
-            $dump = '';
-            $triggers = PMA_DBI_get_triggers($db, $table);
-            if ($triggers) {
-                $dump .=  PMA_possibleCRLF()
-                        . PMA_exportComment()
-                        . PMA_exportComment(__('Triggers') . ' ' . $formatted_table_name)
-                        . PMA_exportComment();
-                $delimiter = '//';
-                foreach ($triggers as $trigger) {
-                    $dump .= $trigger['drop'] . ';' . $crlf;
-                    $dump .= 'DELIMITER ' . $delimiter . $crlf;
-                    $dump .= $trigger['create'];
-                    $dump .= 'DELIMITER ;' . $crlf;
+                    $create_query = implode($crlf, array_slice($sql_lines, 0, $i)) . $crlf . implode($crlf, array_slice($sql_lines, $j, $sql_count - 1));
+                    unset($sql_lines);
                 }
             }
-            break;
-        case 'create_view':
-            $dump .= PMA_exportComment(__('Structure for view') . ' ' . $formatted_table_name)
-                   . PMA_exportComment();
-            // delete the stand-in table previously created (if any)
-            if ($export_type != 'table') {
-                $dump .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table) . ';' . $crlf;
-            }
-            $dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates, true, true);
-            break;
-        case 'stand_in':
-            $dump .=  PMA_exportComment(__('Stand-in structure for view') . ' ' . $formatted_table_name)
-                    . PMA_exportComment();
-            // export a stand-in definition to resolve view dependencies
-            $dump .= PMA_getTableDefStandIn($db, $table, $crlf);
-    } // end switch
-
-    // this one is built by PMA_getTableDef() to use in table copy/move
-    // but not in the case of export
-    unset($GLOBALS['sql_constraints_query']);
-
-    return PMA_exportOutputHandler($dump);
-}
-
-/**
- * Outputs the content of a table in SQL format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    global $sql_backquotes;
-    global $current_row;
-
-    $formatted_table_name = (isset($GLOBALS['sql_backquotes']))
-                          ? PMA_backquote($table)
-                          : '\'' . $table . '\'';
-
-    // Do not export data for a VIEW
-    // (For a VIEW, this is called only when exporting a single VIEW)
-    if (PMA_Table::isView($db, $table)) {
-        $head = PMA_possibleCRLF()
-          . PMA_exportComment()
-          . PMA_exportComment('VIEW ' . ' ' . $formatted_table_name)
-          . PMA_exportComment(__('Data') . ': ' . __('None'))
-          . PMA_exportComment()
-          . PMA_possibleCRLF();
-
-        if (! PMA_exportOutputHandler($head)) {
-            return false;
+            $schema_create .= $create_query;
         }
-        return true;
+
+        // remove a possible "AUTO_INCREMENT = value" clause
+        // that could be there starting with MySQL 5.0.24
+        $schema_create = preg_replace('/AUTO_INCREMENT\s*=\s*([0-9])+/', '', $schema_create);
+
+        $schema_create .= $auto_increment;
+
+        PMA_DBI_free_result($result);
+        return $schema_create . ($add_semicolon ? ';' . $crlf : '');
+    } // end of the 'PMA_getTableDef()' function
+
+    /**
+     * Returns $table's comments, relations etc.
+     *
+     * @param string  $db           database name
+     * @param string  $table        table name
+     * @param string  $crlf         end of line sequence
+     * @param bool    $do_relation  whether to include relation comments
+     * @param bool    $do_mime      whether to include mime comments
+     * @return  string   resulting comments
+     *
+     * @access  private
+     */
+    function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mime = false)
+    {
+        global $cfgRelation;
+        global $sql_backquotes;
+        global $sql_constraints;
+
+        $schema_create = '';
+
+        // Check if we can use Relations
+        if ($do_relation && !empty($cfgRelation['relation'])) {
+            // Find which tables are related with the current one and write it in
+            // an array
+            $res_rel = PMA_getForeigners($db, $table);
+
+            if ($res_rel && count($res_rel) > 0) {
+                $have_rel = true;
+            } else {
+                $have_rel = false;
+            }
+        } else {
+               $have_rel = false;
+        } // end if
+
+        if ($do_mime && $cfgRelation['mimework']) {
+            if (!($mime_map = PMA_getMIME($db, $table, true))) {
+                unset($mime_map);
+            }
+        }
+
+        if (isset($mime_map) && count($mime_map) > 0) {
+            $schema_create .= PMA_possibleCRLF()
+                           . PMA_exportComment()
+                           . PMA_exportComment(__('MIME TYPES FOR TABLE'). ' ' . PMA_backquote($table, $sql_backquotes) . ':');
+            @reset($mime_map);
+            foreach ($mime_map AS $mime_field => $mime) {
+                $schema_create .= PMA_exportComment('  ' . PMA_backquote($mime_field, $sql_backquotes))
+                                . PMA_exportComment('      ' . PMA_backquote($mime['mimetype'], $sql_backquotes));
+            }
+            $schema_create .= PMA_exportComment();
+        }
+
+        if ($have_rel) {
+            $schema_create .= PMA_possibleCRLF()
+                           . PMA_exportComment()
+                           . PMA_exportComment(__('RELATIONS FOR TABLE'). ' ' . PMA_backquote($table, $sql_backquotes) . ':');
+            foreach ($res_rel AS $rel_field => $rel) {
+                $schema_create .= PMA_exportComment('  ' . PMA_backquote($rel_field, $sql_backquotes))
+                                . PMA_exportComment('      ' . PMA_backquote($rel['foreign_table'], $sql_backquotes)
+                                . ' -> ' . PMA_backquote($rel['foreign_field'], $sql_backquotes));
+            }
+            $schema_create .= PMA_exportComment();
+        }
+
+        return $schema_create;
+
+    } // end of the 'PMA_getTableComments()' function
+
+    /**
+     * Outputs table's structure
+     *
+     * @param string  $db           database name
+     * @param string  $table        table name
+     * @param string  $crlf         the end of line sequence
+     * @param string  $error_url    the url to go back in case of error
+     * @param bool    $relation     whether to include relation comments
+     * @param bool    $comments     whether to include the pmadb-style column comments
+     *                                as comments in the structure; this is deprecated
+     *                                but the parameter is left here because export.php
+     *                                calls PMA_exportStructure() also for other export
+     *                                types which use this parameter
+     * @param bool    $mime         whether to include mime comments
+     * @param bool    $dates        whether to include creation/update/check dates
+     * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
+     * @param string  $export_type  'server', 'database', 'table'
+     * @return  bool      Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = false, $comments = false, $mime = false, $dates = false, $export_mode, $export_type)
+    {
+        $formatted_table_name = (isset($GLOBALS['sql_backquotes']))
+                              ? PMA_backquote($table)
+                              : '\'' . $table . '\'';
+        $dump = PMA_possibleCRLF()
+              . PMA_exportComment(str_repeat('-', 56))
+              . PMA_possibleCRLF()
+              . PMA_exportComment();
+
+        switch($export_mode) {
+            case 'create_table':
+                $dump .= PMA_exportComment(__('Table structure for table') . ' ' . $formatted_table_name);
+                $dump .= PMA_exportComment();
+                $dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates);
+                $dump .= PMA_getTableComments($db, $table, $crlf, $relation, $mime);
+                break;
+            case 'triggers':
+                $dump = '';
+                $triggers = PMA_DBI_get_triggers($db, $table);
+                if ($triggers) {
+                    $dump .=  PMA_possibleCRLF()
+                            . PMA_exportComment()
+                            . PMA_exportComment(__('Triggers') . ' ' . $formatted_table_name)
+                            . PMA_exportComment();
+                    $delimiter = '//';
+                    foreach ($triggers as $trigger) {
+                        $dump .= $trigger['drop'] . ';' . $crlf;
+                        $dump .= 'DELIMITER ' . $delimiter . $crlf;
+                        $dump .= $trigger['create'];
+                        $dump .= 'DELIMITER ;' . $crlf;
+                    }
+                }
+                break;
+            case 'create_view':
+                $dump .= PMA_exportComment(__('Structure for view') . ' ' . $formatted_table_name)
+                       . PMA_exportComment();
+                // delete the stand-in table previously created (if any)
+                if ($export_type != 'table') {
+                    $dump .= 'DROP TABLE IF EXISTS ' . PMA_backquote($table) . ';' . $crlf;
+                }
+                $dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates, true, true);
+                break;
+            case 'stand_in':
+                $dump .=  PMA_exportComment(__('Stand-in structure for view') . ' ' . $formatted_table_name)
+                        . PMA_exportComment();
+                // export a stand-in definition to resolve view dependencies
+                $dump .= PMA_getTableDefStandIn($db, $table, $crlf);
+        } // end switch
+
+        // this one is built by PMA_getTableDef() to use in table copy/move
+        // but not in the case of export
+        unset($GLOBALS['sql_constraints_query']);
+
+        return PMA_exportOutputHandler($dump);
     }
 
-    // analyze the query to get the true column names, not the aliases
-    // (this fixes an undefined index, also if Complete inserts
-    //  are used, we did not get the true column name in case of aliases)
-    $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($sql_query));
+    /**
+     * Outputs the content of a table in SQL format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        global $sql_backquotes;
+        global $current_row;
 
-    $result = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-    // a possible error: the table has crashed
-    $tmp_error = PMA_DBI_getError();
-    if ($tmp_error) {
-        return PMA_exportOutputHandler(PMA_exportComment(__('in use') . ' (' . $tmp_error . ')'));
-    }
+        $formatted_table_name = (isset($GLOBALS['sql_backquotes']))
+                              ? PMA_backquote($table)
+                              : '\'' . $table . '\'';
 
-    if ($result != false) {
-        $fields_cnt = PMA_DBI_num_fields($result);
+        // Do not export data for a VIEW
+        // (For a VIEW, this is called only when exporting a single VIEW)
+        if (PMA_Table::isView($db, $table)) {
+            $head = PMA_possibleCRLF()
+              . PMA_exportComment()
+              . PMA_exportComment('VIEW ' . ' ' . $formatted_table_name)
+              . PMA_exportComment(__('Data') . ': ' . __('None'))
+              . PMA_exportComment()
+              . PMA_possibleCRLF();
 
-        // Get field information
-        $fields_meta = PMA_DBI_get_fields_meta($result);
-        $field_flags = array();
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            $field_flags[$j] = PMA_DBI_field_flags($result, $j);
+            if (! PMA_exportOutputHandler($head)) {
+                return false;
+            }
+            return true;
         }
 
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            if (isset($analyzed_sql[0]['select_expr'][$j]['column'])) {
-                $field_set[$j] = PMA_backquote($analyzed_sql[0]['select_expr'][$j]['column'], $sql_backquotes);
-            } else {
-                $field_set[$j] = PMA_backquote($fields_meta[$j]->name, $sql_backquotes);
-            }
+        // analyze the query to get the true column names, not the aliases
+        // (this fixes an undefined index, also if Complete inserts
+        //  are used, we did not get the true column name in case of aliases)
+        $analyzed_sql = PMA_SQP_analyze(PMA_SQP_parse($sql_query));
+
+        $result = PMA_DBI_try_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+        // a possible error: the table has crashed
+        $tmp_error = PMA_DBI_getError();
+        if ($tmp_error) {
+            return PMA_exportOutputHandler(PMA_exportComment(__('in use') . ' (' . $tmp_error . ')'));
         }
 
-        if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'UPDATE') {
-            // update
-            $schema_insert  = 'UPDATE ';
-            if (isset($GLOBALS['sql_ignore'])) {
-                $schema_insert .= 'IGNORE ';
+        if ($result != false) {
+            $fields_cnt = PMA_DBI_num_fields($result);
+
+            // Get field information
+            $fields_meta = PMA_DBI_get_fields_meta($result);
+            $field_flags = array();
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                $field_flags[$j] = PMA_DBI_field_flags($result, $j);
             }
-            // avoid EOL blank
-            $schema_insert .= PMA_backquote($table, $sql_backquotes) . ' SET';
-        } else {
-            // insert or replace
-            if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'REPLACE') {
-                $sql_command = 'REPLACE';
+
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                if (isset($analyzed_sql[0]['select_expr'][$j]['column'])) {
+                    $field_set[$j] = PMA_backquote($analyzed_sql[0]['select_expr'][$j]['column'], $sql_backquotes);
+                } else {
+                    $field_set[$j] = PMA_backquote($fields_meta[$j]->name, $sql_backquotes);
+                }
+            }
+
+            if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'UPDATE') {
+                // update
+                $schema_insert  = 'UPDATE ';
+                if (isset($GLOBALS['sql_ignore'])) {
+                    $schema_insert .= 'IGNORE ';
+                }
+                // avoid EOL blank
+                $schema_insert .= PMA_backquote($table, $sql_backquotes) . ' SET';
             } else {
-                $sql_command = 'INSERT';
+                // insert or replace
+                if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'REPLACE') {
+                    $sql_command = 'REPLACE';
+                } else {
+                    $sql_command = 'INSERT';
+                }
+
+                // delayed inserts?
+                if (isset($GLOBALS['sql_delayed'])) {
+                    $insert_delayed = ' DELAYED';
+                } else {
+                    $insert_delayed = '';
+                }
+
+                // insert ignore?
+                if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'INSERT' && isset($GLOBALS['sql_ignore'])) {
+                    $insert_delayed .= ' IGNORE';
+                }
+
+                // scheme for inserting fields
+                if ($GLOBALS['sql_insert_syntax'] == 'complete' || $GLOBALS['sql_insert_syntax'] == 'both') {
+                    $fields        = implode(', ', $field_set);
+                    $schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $sql_backquotes)
+                // avoid EOL blank
+                                   . ' (' . $fields . ') VALUES';
+                } else {
+                    $schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $sql_backquotes)
+                                   . ' VALUES';
+                }
             }
 
-            // delayed inserts?
-            if (isset($GLOBALS['sql_delayed'])) {
-                $insert_delayed = ' DELAYED';
+            $search      = array("\x00", "\x0a", "\x0d", "\x1a"); //\x08\\x09, not required
+            $replace     = array('\0', '\n', '\r', '\Z');
+            $current_row = 0;
+            $query_size  = 0;
+            if (($GLOBALS['sql_insert_syntax'] == 'extended' || $GLOBALS['sql_insert_syntax'] == 'both') && (!isset($GLOBALS['sql_type']) || $GLOBALS['sql_type'] != 'UPDATE')) {
+                $separator    = ',';
+                $schema_insert .= $crlf;
             } else {
-                $insert_delayed = '';
+                $separator    = ';';
             }
 
-            // insert ignore?
-            if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'INSERT' && isset($GLOBALS['sql_ignore'])) {
-                $insert_delayed .= ' IGNORE';
-            }
+            while ($row = PMA_DBI_fetch_row($result)) {
+                if ($current_row == 0) {
+                    $head = PMA_possibleCRLF()
+                          . PMA_exportComment()
+                          . PMA_exportComment(__('Dumping data for table') . ' ' . $formatted_table_name)
+                          . PMA_exportComment()
+                          . $crlf;
+                    if (! PMA_exportOutputHandler($head)) {
+                        return false;
+                    }
+                }
+                $current_row++;
+                for ($j = 0; $j < $fields_cnt; $j++) {
+                    // NULL
+                    if (!isset($row[$j]) || is_null($row[$j])) {
+                        $values[] = 'NULL';
+                    // a number
+                    // timestamp is numeric on some MySQL 4.1, BLOBs are sometimes numeric
+                    } elseif ($fields_meta[$j]->numeric && $fields_meta[$j]->type != 'timestamp'
+                            && ! $fields_meta[$j]->blob) {
+                        $values[] = $row[$j];
+                    // a true BLOB
+                    // - mysqldump only generates hex data when the --hex-blob
+                    //   option is used, for fields having the binary attribute
+                    //   no hex is generated
+                    // - a TEXT field returns type blob but a real blob
+                    //   returns also the 'binary' flag
+                    } elseif (stristr($field_flags[$j], 'BINARY')
+                            && $fields_meta[$j]->blob
+                            && isset($GLOBALS['sql_hex_for_blob'])) {
+                        // empty blobs need to be different, but '0' is also empty :-(
+                        if (empty($row[$j]) && $row[$j] != '0') {
+                            $values[] = '\'\'';
+                        } else {
+                            $values[] = '0x' . bin2hex($row[$j]);
+                        }
+                    // detection of 'bit' works only on mysqli extension
+                    } elseif ($fields_meta[$j]->type == 'bit') {
+                        $values[] = "b'" . PMA_sqlAddSlashes(PMA_printable_bit_value($row[$j], $fields_meta[$j]->length)) . "'";
+                    // something else -> treat as a string
+                    } else {
+                        $values[] = '\'' . str_replace($search, $replace, PMA_sqlAddSlashes($row[$j])) . '\'';
+                    } // end if
+                } // end for
 
-            // scheme for inserting fields
-            if ($GLOBALS['sql_insert_syntax'] == 'complete' || $GLOBALS['sql_insert_syntax'] == 'both') {
-                $fields        = implode(', ', $field_set);
-                $schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $sql_backquotes)
-            // avoid EOL blank
-                               . ' (' . $fields . ') VALUES';
-            } else {
-                $schema_insert = $sql_command . $insert_delayed .' INTO ' . PMA_backquote($table, $sql_backquotes)
-                               . ' VALUES';
-            }
-        }
+                // should we make update?
+                if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'UPDATE') {
 
-        $search      = array("\x00", "\x0a", "\x0d", "\x1a"); //\x08\\x09, not required
-        $replace     = array('\0', '\n', '\r', '\Z');
-        $current_row = 0;
-        $query_size  = 0;
-        if (($GLOBALS['sql_insert_syntax'] == 'extended' || $GLOBALS['sql_insert_syntax'] == 'both') && (!isset($GLOBALS['sql_type']) || $GLOBALS['sql_type'] != 'UPDATE')) {
-            $separator    = ',';
-            $schema_insert .= $crlf;
-        } else {
-            $separator    = ';';
-        }
+                    $insert_line = $schema_insert;
+                    for ($i = 0; $i < $fields_cnt; $i++) {
+                        if (0 == $i) {
+                            $insert_line .= ' ';
+                        }
+                        if ($i > 0) {
+                            // avoid EOL blank
+                            $insert_line .= ',';
+                        }
+                        $insert_line .= $field_set[$i] . ' = ' . $values[$i];
+                    }
 
-        while ($row = PMA_DBI_fetch_row($result)) {
-            if ($current_row == 0) {
-                $head = PMA_possibleCRLF()
-                      . PMA_exportComment()
-                      . PMA_exportComment(__('Dumping data for table') . ' ' . $formatted_table_name)
-                      . PMA_exportComment()
-                      . $crlf;
-                if (! PMA_exportOutputHandler($head)) {
+                    list($tmp_unique_condition, $tmp_clause_is_unique) = PMA_getUniqueCondition($result, $fields_cnt, $fields_meta, $row);
+                    $insert_line .= ' WHERE ' . $tmp_unique_condition;
+                    unset($tmp_unique_condition, $tmp_clause_is_unique);
+
+                } else {
+
+                    // Extended inserts case
+                    if ($GLOBALS['sql_insert_syntax'] == 'extended' || $GLOBALS['sql_insert_syntax'] == 'both') {
+                        if ($current_row == 1) {
+                            $insert_line  = $schema_insert . '(' . implode(', ', $values) . ')';
+                        } else {
+                            $insert_line  = '(' . implode(', ', $values) . ')';
+                            if (isset($GLOBALS['sql_max_query_size']) && $GLOBALS['sql_max_query_size'] > 0 && $query_size + strlen($insert_line) > $GLOBALS['sql_max_query_size']) {
+                                if (!PMA_exportOutputHandler(';' . $crlf)) {
+                                    return false;
+                                }
+                                $query_size = 0;
+                                $current_row = 1;
+                                $insert_line = $schema_insert . $insert_line;
+                            }
+                        }
+                        $query_size += strlen($insert_line);
+                    }
+                    // Other inserts case
+                    else {
+                        $insert_line = $schema_insert . '(' . implode(', ', $values) . ')';
+                    }
+                }
+                unset($values);
+
+                if (!PMA_exportOutputHandler(($current_row == 1 ? '' : $separator . $crlf) . $insert_line)) {
+                    return false;
+                }
+
+            } // end while
+            if ($current_row > 0) {
+                if (!PMA_exportOutputHandler(';' . $crlf)) {
                     return false;
                 }
             }
-            $current_row++;
-            for ($j = 0; $j < $fields_cnt; $j++) {
-                // NULL
-                if (!isset($row[$j]) || is_null($row[$j])) {
-                    $values[] = 'NULL';
-                // a number
-                // timestamp is numeric on some MySQL 4.1, BLOBs are sometimes numeric
-                } elseif ($fields_meta[$j]->numeric && $fields_meta[$j]->type != 'timestamp'
-                        && ! $fields_meta[$j]->blob) {
-                    $values[] = $row[$j];
-                // a true BLOB
-                // - mysqldump only generates hex data when the --hex-blob
-                //   option is used, for fields having the binary attribute
-                //   no hex is generated
-                // - a TEXT field returns type blob but a real blob
-                //   returns also the 'binary' flag
-                } elseif (stristr($field_flags[$j], 'BINARY')
-                        && $fields_meta[$j]->blob
-                        && isset($GLOBALS['sql_hex_for_blob'])) {
-                    // empty blobs need to be different, but '0' is also empty :-(
-                    if (empty($row[$j]) && $row[$j] != '0') {
-                        $values[] = '\'\'';
-                    } else {
-                        $values[] = '0x' . bin2hex($row[$j]);
-                    }
-                // detection of 'bit' works only on mysqli extension
-                } elseif ($fields_meta[$j]->type == 'bit') {
-                    $values[] = "b'" . PMA_sqlAddSlashes(PMA_printable_bit_value($row[$j], $fields_meta[$j]->length)) . "'";
-                // something else -> treat as a string
-                } else {
-                    $values[] = '\'' . str_replace($search, $replace, PMA_sqlAddSlashes($row[$j])) . '\'';
-                } // end if
-            } // end for
+        } // end if ($result != false)
+        PMA_DBI_free_result($result);
 
-            // should we make update?
-            if (isset($GLOBALS['sql_type']) && $GLOBALS['sql_type'] == 'UPDATE') {
-
-                $insert_line = $schema_insert;
-                for ($i = 0; $i < $fields_cnt; $i++) {
-                    if (0 == $i) {
-                        $insert_line .= ' ';
-                    }
-                    if ($i > 0) {
-                        // avoid EOL blank
-                        $insert_line .= ',';
-                    }
-                    $insert_line .= $field_set[$i] . ' = ' . $values[$i];
-                }
-
-                list($tmp_unique_condition, $tmp_clause_is_unique) = PMA_getUniqueCondition($result, $fields_cnt, $fields_meta, $row);
-                $insert_line .= ' WHERE ' . $tmp_unique_condition;
-                unset($tmp_unique_condition, $tmp_clause_is_unique);
-
-            } else {
-
-                // Extended inserts case
-                if ($GLOBALS['sql_insert_syntax'] == 'extended' || $GLOBALS['sql_insert_syntax'] == 'both') {
-                    if ($current_row == 1) {
-                        $insert_line  = $schema_insert . '(' . implode(', ', $values) . ')';
-                    } else {
-                        $insert_line  = '(' . implode(', ', $values) . ')';
-                        if (isset($GLOBALS['sql_max_query_size']) && $GLOBALS['sql_max_query_size'] > 0 && $query_size + strlen($insert_line) > $GLOBALS['sql_max_query_size']) {
-                            if (!PMA_exportOutputHandler(';' . $crlf)) {
-                                return false;
-                            }
-                            $query_size = 0;
-                            $current_row = 1;
-                            $insert_line = $schema_insert . $insert_line;
-                        }
-                    }
-                    $query_size += strlen($insert_line);
-                }
-                // Other inserts case
-                else {
-                    $insert_line = $schema_insert . '(' . implode(', ', $values) . ')';
-                }
-            }
-            unset($values);
-
-            if (!PMA_exportOutputHandler(($current_row == 1 ? '' : $separator . $crlf) . $insert_line)) {
-                return false;
-            }
-
-        } // end while
-        if ($current_row > 0) {
-            if (!PMA_exportOutputHandler(';' . $crlf)) {
-                return false;
-            }
-        }
-    } // end if ($result != false)
-    PMA_DBI_free_result($result);
-
-    return true;
-} // end of the 'PMA_exportData()' function
+        return true;
+    } // end of the 'PMA_exportData()' function
 }
 ?>
diff --git a/libraries/export/texytext.php b/libraries/export/texytext.php
index 06de740778..d248c1b605 100644
--- a/libraries/export/texytext.php
+++ b/libraries/export/texytext.php
@@ -32,302 +32,302 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    return PMA_exportOutputHandler('===' . __('Database') . ' ' . $db . "\n\n");
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in Texy format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    global $what;
-
-    if (! PMA_exportOutputHandler('== ' . __('Dumping data for table') . ' ' . $table . "\n\n")) {
-        return false;
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        return true;
     }
 
-    // Gets the data from the database
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-    $fields_cnt  = PMA_DBI_num_fields($result);
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        return true;
+    }
 
-    // If required, get fields name at the first line
-    if (isset($GLOBALS[$what . '_columns'])) {
-        $text_output = "|------\n";
-        for ($i = 0; $i < $fields_cnt; $i++) {
-            $text_output .= '|' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i)));
-        } // end for
-        $text_output .= "\n|------\n";
-        if (! PMA_exportOutputHandler($text_output)) {
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        return PMA_exportOutputHandler('===' . __('Database') . ' ' . $db . "\n\n");
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in Texy format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        global $what;
+
+        if (! PMA_exportOutputHandler('== ' . __('Dumping data for table') . ' ' . $table . "\n\n")) {
             return false;
         }
-    } // end if
 
-    // Format the data
-    while ($row = PMA_DBI_fetch_row($result)) {
-        $text_output = '';
-        for ($j = 0; $j < $fields_cnt; $j++) {
-            if (! isset($row[$j]) || is_null($row[$j])) {
-                $value = $GLOBALS[$what . '_null'];
-            } elseif ($row[$j] == '0' || $row[$j] != '') {
-                $value = $row[$j];
+        // Gets the data from the database
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+        $fields_cnt  = PMA_DBI_num_fields($result);
+
+        // If required, get fields name at the first line
+        if (isset($GLOBALS[$what . '_columns'])) {
+            $text_output = "|------\n";
+            for ($i = 0; $i < $fields_cnt; $i++) {
+                $text_output .= '|' . htmlspecialchars(stripslashes(PMA_DBI_field_name($result, $i)));
+            } // end for
+            $text_output .= "\n|------\n";
+            if (! PMA_exportOutputHandler($text_output)) {
+                return false;
+            }
+        } // end if
+
+        // Format the data
+        while ($row = PMA_DBI_fetch_row($result)) {
+            $text_output = '';
+            for ($j = 0; $j < $fields_cnt; $j++) {
+                if (! isset($row[$j]) || is_null($row[$j])) {
+                    $value = $GLOBALS[$what . '_null'];
+                } elseif ($row[$j] == '0' || $row[$j] != '') {
+                    $value = $row[$j];
+                } else {
+                    $value = ' ';
+                }
+                $text_output .= '|' . htmlspecialchars($value);
+            } // end for
+            $text_output .= "\n";
+            if (! PMA_exportOutputHandler($text_output)) {
+                return false;
+            }
+        } // end while
+        PMA_DBI_free_result($result);
+
+        return true;
+    }
+
+    /**
+     * Outputs table's structure
+     *
+     * @param string  $db           database name
+     * @param string  $table        table name
+     * @param string  $crlf         the end of line sequence
+     * @param string  $error_url    the url to go back in case of error
+     * @param bool    $do_relation  whether to include relation comments
+     * @param bool    $do_comments  whether to include the pmadb-style column comments
+     *                                as comments in the structure; this is deprecated
+     *                                but the parameter is left here because export.php
+     *                                calls PMA_exportStructure() also for other export
+     *                                types which use this parameter
+     * @param bool    $do_mime      whether to include mime comments
+     * @param bool    $dates        whether to include creation/update/check dates
+     * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
+     * @param string  $export_type  'server', 'database', 'table'
+     * @return  bool      Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
+    {
+        global $cfgRelation;
+
+        if (! PMA_exportOutputHandler('== ' . __('Table structure for table') . ' ' .$table . "\n\n")) {
+            return false;
+        }
+
+        /**
+         * Get the unique keys in the table
+         */
+        $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
+        $keys_result    = PMA_DBI_query($keys_query);
+        $unique_keys    = array();
+        while ($key = PMA_DBI_fetch_assoc($keys_result)) {
+            if ($key['Non_unique'] == 0) {
+                $unique_keys[] = $key['Column_name'];
+            }
+        }
+        PMA_DBI_free_result($keys_result);
+
+        /**
+         * Gets fields properties
+         */
+        PMA_DBI_select_db($db);
+
+        // Check if we can use Relations
+        if ($do_relation && ! empty($cfgRelation['relation'])) {
+            // Find which tables are related with the current one and write it in
+            // an array
+            $res_rel = PMA_getForeigners($db, $table);
+
+            if ($res_rel && count($res_rel) > 0) {
+                $have_rel = true;
             } else {
-                $value = ' ';
+                $have_rel = false;
             }
-            $text_output .= '|' . htmlspecialchars($value);
-        } // end for
-        $text_output .= "\n";
-        if (! PMA_exportOutputHandler($text_output)) {
-            return false;
-        }
-    } // end while
-    PMA_DBI_free_result($result);
-
-    return true;
-}
-
-/**
- * Outputs table's structure
- *
- * @param string  $db           database name
- * @param string  $table        table name
- * @param string  $crlf         the end of line sequence
- * @param string  $error_url    the url to go back in case of error
- * @param bool    $do_relation  whether to include relation comments
- * @param bool    $do_comments  whether to include the pmadb-style column comments
- *                                as comments in the structure; this is deprecated
- *                                but the parameter is left here because export.php
- *                                calls PMA_exportStructure() also for other export
- *                                types which use this parameter
- * @param bool    $do_mime      whether to include mime comments
- * @param bool    $dates        whether to include creation/update/check dates
- * @param string  $export_mode  'create_table', 'triggers', 'create_view', 'stand_in'
- * @param string  $export_type  'server', 'database', 'table'
- * @return  bool      Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = false, $do_comments = false, $do_mime = false, $dates = false, $export_mode, $export_type)
-{
-    global $cfgRelation;
-
-    if (! PMA_exportOutputHandler('== ' . __('Table structure for table') . ' ' .$table . "\n\n")) {
-        return false;
-    }
-
-    /**
-     * Get the unique keys in the table
-     */
-    $keys_query     = 'SHOW KEYS FROM ' . PMA_backquote($table) . ' FROM '. PMA_backquote($db);
-    $keys_result    = PMA_DBI_query($keys_query);
-    $unique_keys    = array();
-    while ($key = PMA_DBI_fetch_assoc($keys_result)) {
-        if ($key['Non_unique'] == 0) {
-            $unique_keys[] = $key['Column_name'];
-        }
-    }
-    PMA_DBI_free_result($keys_result);
-
-    /**
-     * Gets fields properties
-     */
-    PMA_DBI_select_db($db);
-
-    // Check if we can use Relations
-    if ($do_relation && ! empty($cfgRelation['relation'])) {
-        // Find which tables are related with the current one and write it in
-        // an array
-        $res_rel = PMA_getForeigners($db, $table);
-
-        if ($res_rel && count($res_rel) > 0) {
-            $have_rel = true;
         } else {
-            $have_rel = false;
-        }
-    } else {
-           $have_rel = false;
-    } // end if
+               $have_rel = false;
+        } // end if
 
-    /**
-     * Displays the table structure
-     */
-
-    $columns_cnt = 4;
-    if ($do_relation && $have_rel) {
-        $columns_cnt++;
-    }
-    if ($do_comments && $cfgRelation['commwork']) {
-        $columns_cnt++;
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $columns_cnt++;
-    }
-
-    $text_output = "|------\n";
-    $text_output .= '|' . htmlspecialchars(__('Column'));
-    $text_output .= '|' . htmlspecialchars(__('Type'));
-    $text_output .= '|' . htmlspecialchars(__('Null'));
-    $text_output .= '|' . htmlspecialchars(__('Default'));
-    if ($do_relation && $have_rel) {
-        $text_output .= '|' . htmlspecialchars(__('Links to'));
-    }
-    if ($do_comments) {
-        $text_output .= '|' . htmlspecialchars(__('Comments'));
-        $comments = PMA_getComments($db, $table);
-    }
-    if ($do_mime && $cfgRelation['mimework']) {
-        $text_output .= '|' . htmlspecialchars('MIME');
-        $mime_map = PMA_getMIME($db, $table, true);
-    }
-    $text_output .= "\n|------\n";
-
-    if (! PMA_exportOutputHandler($text_output)) {
-        return false;
-    }
-
-    $columns = PMA_DBI_get_columns($db, $table);
-    foreach ($columns as $column) {
-
-        $text_output = '';
-        $type             = $column['Type'];
-        // reformat mysql query output
-        // set or enum types: slashes single quotes inside options
-        if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
-            $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
-            $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
-            $type_nowrap  = '';
-
-            $binary       = 0;
-            $unsigned     = 0;
-            $zerofill     = 0;
-        } else {
-            $type_nowrap  = ' nowrap="nowrap"';
-            $type         = preg_replace('/BINARY/i', '', $type);
-            $type         = preg_replace('/ZEROFILL/i', '', $type);
-            $type         = preg_replace('/UNSIGNED/i', '', $type);
-            if (empty($type)) {
-                $type     = '&nbsp;';
-            }
-
-            $binary       = preg_match('/BINARY/i', $column['Type']);
-            $unsigned     = preg_match('/UNSIGNED/i', $column['Type']);
-            $zerofill     = preg_match('/ZEROFILL/i', $column['Type']);
-        }
-        $attribute     = '&nbsp;';
-        if ($binary) {
-            $attribute = 'BINARY';
-        }
-        if ($unsigned) {
-            $attribute = 'UNSIGNED';
-        }
-        if ($zerofill) {
-            $attribute = 'UNSIGNED ZEROFILL';
-        }
-        if (! isset($column['Default'])) {
-            if ($column['Null'] != 'NO') {
-                $column['Default'] = 'NULL';
-            }
-        }
-
-        $fmt_pre = '';
-        $fmt_post = '';
-        if (in_array($column['Field'], $unique_keys)) {
-            $fmt_pre = '**' . $fmt_pre;
-            $fmt_post = $fmt_post . '**';
-        }
-        if ($column['Key']=='PRI') {
-            $fmt_pre = '//' . $fmt_pre;
-            $fmt_post = $fmt_post . '//';
-        }
-        $text_output .= '|' . $fmt_pre . htmlspecialchars($column['Field']) . $fmt_post;
-        $text_output .= '|' . htmlspecialchars($type);
-        $text_output .= '|' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes'));
-        $text_output .= '|' . htmlspecialchars(isset($column['Default']) ? $column['Default'] : '');
-
-        $field_name = $column['Field'];
+        /**
+         * Displays the table structure
+         */
 
+        $columns_cnt = 4;
         if ($do_relation && $have_rel) {
-            $text_output .= '|' . (isset($res_rel[$field_name]) ? htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')') : '');
+            $columns_cnt++;
         }
         if ($do_comments && $cfgRelation['commwork']) {
-            $text_output .= '|' . (isset($comments[$field_name]) ? htmlspecialchars($comments[$field_name]) : '');
+            $columns_cnt++;
         }
         if ($do_mime && $cfgRelation['mimework']) {
-            $text_output .= '|' . (isset($mime_map[$field_name]) ? htmlspecialchars(str_replace('_', '/', $mime_map[$field_name]['mimetype'])) : '');
+            $columns_cnt++;
         }
 
-        $text_output .= "\n";
+        $text_output = "|------\n";
+        $text_output .= '|' . htmlspecialchars(__('Column'));
+        $text_output .= '|' . htmlspecialchars(__('Type'));
+        $text_output .= '|' . htmlspecialchars(__('Null'));
+        $text_output .= '|' . htmlspecialchars(__('Default'));
+        if ($do_relation && $have_rel) {
+            $text_output .= '|' . htmlspecialchars(__('Links to'));
+        }
+        if ($do_comments) {
+            $text_output .= '|' . htmlspecialchars(__('Comments'));
+            $comments = PMA_getComments($db, $table);
+        }
+        if ($do_mime && $cfgRelation['mimework']) {
+            $text_output .= '|' . htmlspecialchars('MIME');
+            $mime_map = PMA_getMIME($db, $table, true);
+        }
+        $text_output .= "\n|------\n";
 
         if (! PMA_exportOutputHandler($text_output)) {
             return false;
         }
-    } // end while
 
-    return true;
-}
+        $columns = PMA_DBI_get_columns($db, $table);
+        foreach ($columns as $column) {
+
+            $text_output = '';
+            $type             = $column['Type'];
+            // reformat mysql query output
+            // set or enum types: slashes single quotes inside options
+            if (preg_match('/^(set|enum)\((.+)\)$/i', $type, $tmp)) {
+                $tmp[2]       = substr(preg_replace('/([^,])\'\'/', '\\1\\\'', ',' . $tmp[2]), 1);
+                $type         = $tmp[1] . '(' . str_replace(',', ', ', $tmp[2]) . ')';
+                $type_nowrap  = '';
+
+                $binary       = 0;
+                $unsigned     = 0;
+                $zerofill     = 0;
+            } else {
+                $type_nowrap  = ' nowrap="nowrap"';
+                $type         = preg_replace('/BINARY/i', '', $type);
+                $type         = preg_replace('/ZEROFILL/i', '', $type);
+                $type         = preg_replace('/UNSIGNED/i', '', $type);
+                if (empty($type)) {
+                    $type     = '&nbsp;';
+                }
+
+                $binary       = preg_match('/BINARY/i', $column['Type']);
+                $unsigned     = preg_match('/UNSIGNED/i', $column['Type']);
+                $zerofill     = preg_match('/ZEROFILL/i', $column['Type']);
+            }
+            $attribute     = '&nbsp;';
+            if ($binary) {
+                $attribute = 'BINARY';
+            }
+            if ($unsigned) {
+                $attribute = 'UNSIGNED';
+            }
+            if ($zerofill) {
+                $attribute = 'UNSIGNED ZEROFILL';
+            }
+            if (! isset($column['Default'])) {
+                if ($column['Null'] != 'NO') {
+                    $column['Default'] = 'NULL';
+                }
+            }
+
+            $fmt_pre = '';
+            $fmt_post = '';
+            if (in_array($column['Field'], $unique_keys)) {
+                $fmt_pre = '**' . $fmt_pre;
+                $fmt_post = $fmt_post . '**';
+            }
+            if ($column['Key']=='PRI') {
+                $fmt_pre = '//' . $fmt_pre;
+                $fmt_post = $fmt_post . '//';
+            }
+            $text_output .= '|' . $fmt_pre . htmlspecialchars($column['Field']) . $fmt_post;
+            $text_output .= '|' . htmlspecialchars($type);
+            $text_output .= '|' . htmlspecialchars(($column['Null'] == '' || $column['Null'] == 'NO') ? __('No') : __('Yes'));
+            $text_output .= '|' . htmlspecialchars(isset($column['Default']) ? $column['Default'] : '');
+
+            $field_name = $column['Field'];
+
+            if ($do_relation && $have_rel) {
+                $text_output .= '|' . (isset($res_rel[$field_name]) ? htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')') : '');
+            }
+            if ($do_comments && $cfgRelation['commwork']) {
+                $text_output .= '|' . (isset($comments[$field_name]) ? htmlspecialchars($comments[$field_name]) : '');
+            }
+            if ($do_mime && $cfgRelation['mimework']) {
+                $text_output .= '|' . (isset($mime_map[$field_name]) ? htmlspecialchars(str_replace('_', '/', $mime_map[$field_name]['mimetype'])) : '');
+            }
+
+            $text_output .= "\n";
+
+            if (! PMA_exportOutputHandler($text_output)) {
+                return false;
+            }
+        } // end while
+
+        return true;
+    }
 
 }
 ?>
diff --git a/libraries/export/xls.php b/libraries/export/xls.php
index 5747f086a0..3ff6f6a920 100644
--- a/libraries/export/xls.php
+++ b/libraries/export/xls.php
@@ -30,164 +30,164 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/* Append the PHPExcel directory to the include path variable */
-set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/');
+    /* Append the PHPExcel directory to the include path variable */
+    set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/');
 
-require_once './libraries/PHPExcel/PHPExcel.php';
-require_once './libraries/PHPExcel/PHPExcel/Writer/Excel5.php';
-
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    global $workbook;
-    global $tmp_filename;
-
-    $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xls_');
-
-    $workbookWriter = new PHPExcel_Writer_Excel5($workbook);
-    $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir']));
-    $workbookWriter->save($tmp_filename);
-
-    if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) {
-        return false;
-    }
-
-    unlink($tmp_filename);
-
-    unset($GLOBALS['workbook']);
-    unset($GLOBALS['sheet_index']);
-
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    global $db;
-
-    /* Initialize the workbook */
-    $GLOBALS['workbook'] = new PHPExcel();
-    $GLOBALS['sheet_index'] = 0;
-    global $workbook;
-
-    $workbook->getProperties()->setCreator('phpMyAdmin ' . PMA_VERSION);
-    $workbook->getProperties()->setLastModifiedBy('phpMyAdmin ' . PMA_VERSION);
-    $workbook->getProperties()->setTitle($db);
-    $workbook->getProperties()->setSubject('phpMyAdmin ' . PMA_VERSION . ' XLS Dump');
-
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-
-
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in XLS format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    global $workbook;
-    global $sheet_index;
+    require_once './libraries/PHPExcel/PHPExcel.php';
+    require_once './libraries/PHPExcel/PHPExcel/Writer/Excel5.php';
 
     /**
-     * Get the data from the database using the original query
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
      */
-    $result      = PMA_DBI_fetch_result($sql_query);
-    $row_cnt     = count($result);
+    function PMA_exportFooter() {
+        global $workbook;
+        global $tmp_filename;
 
-    if ($row_cnt > 0) {
-        $col_names = array_keys($result[0]);
-        $fields_cnt = count($result[0]);
-        $row_offset = 1;
+        $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xls_');
 
-        /* Only one sheet is created on workbook initialization */
-        if ($sheet_index > 0) {
-            $workbook->createSheet();
+        $workbookWriter = new PHPExcel_Writer_Excel5($workbook);
+        $workbookWriter->setTempDir(realpath($GLOBALS['cfg']['TempDir']));
+        $workbookWriter->save($tmp_filename);
+
+        if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) {
+            return false;
         }
 
-        $workbook->setActiveSheetIndex($sheet_index);
-        $workbook->getActiveSheet()->setTitle(substr($table, 0, 31));
+        unlink($tmp_filename);
 
-        if (isset($GLOBALS['xls_columns']) && $GLOBALS['xls_columns']) {
-            for ($i = 0; $i < $fields_cnt; ++$i) {
-                $workbook->getActiveSheet()->setCellValueByColumnAndRow($i, $row_offset, $col_names[$i]);
-            }
-            $row_offset++;
-        }
+        unset($GLOBALS['workbook']);
+        unset($GLOBALS['sheet_index']);
 
-        for ($r = 0; ($r < 65536) && ($r < $row_cnt); ++$r) {
-            for ($c = 0; $c < $fields_cnt; ++$c) {
-                if (!isset($result[$r][$col_names[$c]]) || is_null($result[$r][$col_names[$c]])) {
-                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $GLOBALS['xls_null']);
-                } elseif ($result[$r][$col_names[$c]] == '0' || $result[$r][$col_names[$c]] != '') {
-                    /**
-                     * @todo we should somehow handle character set here!
-                     */
-                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $result[$r][$col_names[$c]]);
-                } else {
-                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), '');
-                }
-            }
-        }
-
-        $sheet_index++;
+        return true;
     }
 
-    return true;
-}
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        global $db;
+
+        /* Initialize the workbook */
+        $GLOBALS['workbook'] = new PHPExcel();
+        $GLOBALS['sheet_index'] = 0;
+        global $workbook;
+
+        $workbook->getProperties()->setCreator('phpMyAdmin ' . PMA_VERSION);
+        $workbook->getProperties()->setLastModifiedBy('phpMyAdmin ' . PMA_VERSION);
+        $workbook->getProperties()->setTitle($db);
+        $workbook->getProperties()->setSubject('phpMyAdmin ' . PMA_VERSION . ' XLS Dump');
+
+        return true;
+    }
+
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+
+
+        return true;
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in XLS format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        global $workbook;
+        global $sheet_index;
+
+        /**
+         * Get the data from the database using the original query
+         */
+        $result      = PMA_DBI_fetch_result($sql_query);
+        $row_cnt     = count($result);
+
+        if ($row_cnt > 0) {
+            $col_names = array_keys($result[0]);
+            $fields_cnt = count($result[0]);
+            $row_offset = 1;
+
+            /* Only one sheet is created on workbook initialization */
+            if ($sheet_index > 0) {
+                $workbook->createSheet();
+            }
+
+            $workbook->setActiveSheetIndex($sheet_index);
+            $workbook->getActiveSheet()->setTitle(substr($table, 0, 31));
+
+            if (isset($GLOBALS['xls_columns']) && $GLOBALS['xls_columns']) {
+                for ($i = 0; $i < $fields_cnt; ++$i) {
+                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($i, $row_offset, $col_names[$i]);
+                }
+                $row_offset++;
+            }
+
+            for ($r = 0; ($r < 65536) && ($r < $row_cnt); ++$r) {
+                for ($c = 0; $c < $fields_cnt; ++$c) {
+                    if (!isset($result[$r][$col_names[$c]]) || is_null($result[$r][$col_names[$c]])) {
+                        $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $GLOBALS['xls_null']);
+                    } elseif ($result[$r][$col_names[$c]] == '0' || $result[$r][$col_names[$c]] != '') {
+                        /**
+                         * @todo we should somehow handle character set here!
+                         */
+                        $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $result[$r][$col_names[$c]]);
+                    } else {
+                        $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), '');
+                    }
+                }
+            }
+
+            $sheet_index++;
+        }
+
+        return true;
+    }
 
 }
 ?>
diff --git a/libraries/export/xlsx.php b/libraries/export/xlsx.php
index 8f5cb19866..b06a615acf 100644
--- a/libraries/export/xlsx.php
+++ b/libraries/export/xlsx.php
@@ -30,163 +30,163 @@ if (isset($plugin_list)) {
         );
 } else {
 
-/* Append the PHPExcel directory to the include path variable */
-set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/');
+    /* Append the PHPExcel directory to the include path variable */
+    set_include_path(get_include_path() . PATH_SEPARATOR . getcwd() . '/libraries/PHPExcel/');
 
-require_once './libraries/PHPExcel/PHPExcel.php';
-require_once './libraries/PHPExcel/PHPExcel/Writer/Excel2007.php';
-
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    global $workbook;
-    global $tmp_filename;
-
-    $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xlsx_');
-
-    $workbookWriter = new PHPExcel_Writer_Excel2007($workbook);
-    $workbookWriter->save($tmp_filename);
-
-    if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) {
-        return false;
-    }
-
-    unlink($tmp_filename);
-
-    unset($GLOBALS['workbook']);
-    unset($GLOBALS['sheet_index']);
-
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    global $db;
-
-    /* Initialize the workbook */
-    $GLOBALS['workbook'] = new PHPExcel();
-    $GLOBALS['sheet_index'] = 0;
-    global $workbook;
-
-    $workbook->getProperties()->setCreator('phpMyAdmin ' . PMA_VERSION);
-    $workbook->getProperties()->setLastModifiedBy('phpMyAdmin ' . PMA_VERSION);
-    $workbook->getProperties()->setTitle($db);
-    $workbook->getProperties()->setSubject('phpMyAdmin ' . PMA_VERSION . ' XLSX Dump');
-
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-
-
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
-
-/**
- * Outputs the content of a table in XLSX format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-    global $workbook;
-    global $sheet_index;
+    require_once './libraries/PHPExcel/PHPExcel.php';
+    require_once './libraries/PHPExcel/PHPExcel/Writer/Excel2007.php';
 
     /**
-     * Get the data from the database using the original query
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
      */
-    $result      = PMA_DBI_fetch_result($sql_query);
-    $row_cnt     = count($result);
+    function PMA_exportFooter() {
+        global $workbook;
+        global $tmp_filename;
 
-    if ($row_cnt > 0) {
-        $col_names = array_keys($result[0]);
-        $fields_cnt = count($result[0]);
-        $row_offset = 1;
+        $tmp_filename = tempnam(realpath($GLOBALS['cfg']['TempDir']), 'pma_xlsx_');
 
-        /* Only one sheet is created on workbook initialization */
-        if ($sheet_index > 0) {
-            $workbook->createSheet();
+        $workbookWriter = new PHPExcel_Writer_Excel2007($workbook);
+        $workbookWriter->save($tmp_filename);
+
+        if (!PMA_exportOutputHandler(file_get_contents($tmp_filename))) {
+            return false;
         }
 
-        $workbook->setActiveSheetIndex($sheet_index);
-        $workbook->getActiveSheet()->setTitle(substr($table, 0, 31));
+        unlink($tmp_filename);
 
-        if (isset($GLOBALS['xlsx_columns']) && $GLOBALS['xlsx_columns']) {
-            for ($i = 0; $i < $fields_cnt; ++$i) {
-                $workbook->getActiveSheet()->setCellValueByColumnAndRow($i, $row_offset, $col_names[$i]);
-            }
-            $row_offset++;
-        }
+        unset($GLOBALS['workbook']);
+        unset($GLOBALS['sheet_index']);
 
-        for ($r = 0; ($r < 65536) && ($r < $row_cnt); ++$r) {
-            for ($c = 0; $c < $fields_cnt; ++$c) {
-                if (!isset($result[$r][$col_names[$c]]) || is_null($result[$r][$col_names[$c]])) {
-                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $GLOBALS['xlsx_null']);
-                } elseif ($result[$r][$col_names[$c]] == '0' || $result[$r][$col_names[$c]] != '') {
-                    /**
-                     * @todo we should somehow handle character set here!
-                     */
-                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $result[$r][$col_names[$c]]);
-                } else {
-                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), '');
-                }
-            }
-        }
-
-        $sheet_index++;
+        return true;
     }
 
-    return true;
-}
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        global $db;
+
+        /* Initialize the workbook */
+        $GLOBALS['workbook'] = new PHPExcel();
+        $GLOBALS['sheet_index'] = 0;
+        global $workbook;
+
+        $workbook->getProperties()->setCreator('phpMyAdmin ' . PMA_VERSION);
+        $workbook->getProperties()->setLastModifiedBy('phpMyAdmin ' . PMA_VERSION);
+        $workbook->getProperties()->setTitle($db);
+        $workbook->getProperties()->setSubject('phpMyAdmin ' . PMA_VERSION . ' XLSX Dump');
+
+        return true;
+    }
+
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+
+
+        return true;
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in XLSX format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
+        global $workbook;
+        global $sheet_index;
+
+        /**
+         * Get the data from the database using the original query
+         */
+        $result      = PMA_DBI_fetch_result($sql_query);
+        $row_cnt     = count($result);
+
+        if ($row_cnt > 0) {
+            $col_names = array_keys($result[0]);
+            $fields_cnt = count($result[0]);
+            $row_offset = 1;
+
+            /* Only one sheet is created on workbook initialization */
+            if ($sheet_index > 0) {
+                $workbook->createSheet();
+            }
+
+            $workbook->setActiveSheetIndex($sheet_index);
+            $workbook->getActiveSheet()->setTitle(substr($table, 0, 31));
+
+            if (isset($GLOBALS['xlsx_columns']) && $GLOBALS['xlsx_columns']) {
+                for ($i = 0; $i < $fields_cnt; ++$i) {
+                    $workbook->getActiveSheet()->setCellValueByColumnAndRow($i, $row_offset, $col_names[$i]);
+                }
+                $row_offset++;
+            }
+
+            for ($r = 0; ($r < 65536) && ($r < $row_cnt); ++$r) {
+                for ($c = 0; $c < $fields_cnt; ++$c) {
+                    if (!isset($result[$r][$col_names[$c]]) || is_null($result[$r][$col_names[$c]])) {
+                        $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $GLOBALS['xlsx_null']);
+                    } elseif ($result[$r][$col_names[$c]] == '0' || $result[$r][$col_names[$c]] != '') {
+                        /**
+                         * @todo we should somehow handle character set here!
+                         */
+                        $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), $result[$r][$col_names[$c]]);
+                    } else {
+                        $workbook->getActiveSheet()->setCellValueByColumnAndRow($c, ($r + $row_offset), '');
+                    }
+                }
+            }
+
+            $sheet_index++;
+        }
+
+        return true;
+    }
 
 }
 ?>
diff --git a/libraries/export/xml.php b/libraries/export/xml.php
index 26953af925..b55d1e9186 100644
--- a/libraries/export/xml.php
+++ b/libraries/export/xml.php
@@ -48,295 +48,295 @@ if (isset($plugin_list)) {
     $plugin_list['xml']['options'][] = array('type' => 'end_group');
 } else {
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter() {
-    $foot = '</pma_xml_export>';
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter() {
+        $foot = '</pma_xml_export>';
 
-    return PMA_exportOutputHandler($foot);
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader() {
-    global $crlf;
-    global $cfg;
-    global $db;
-    global $table;
-    global $tables;
-    
-    $export_struct = isset($GLOBALS['xml_export_functions']) || isset($GLOBALS['xml_export_procedures'])
-        || isset($GLOBALS['xml_export_tables']) || isset($GLOBALS['xml_export_triggers'])
-        || isset($GLOBALS['xml_export_views']);
-    $export_data = isset($GLOBALS['xml_export_contents']) ? true : false;
-
-    if ($GLOBALS['output_charset_conversion']) {
-        $charset = $GLOBALS['charset_of_file'];
-    } else {
-        $charset = 'utf-8';
+        return PMA_exportOutputHandler($foot);
     }
 
-    $head  =  '<?xml version="1.0" encoding="' . $charset . '"?>' . $crlf
-           .  '<!--' . $crlf
-           .  '- phpMyAdmin XML Dump' . $crlf
-           .  '- version ' . PMA_VERSION . $crlf
-           .  '- http://www.phpmyadmin.net' . $crlf
-           .  '-' . $crlf
-           .  '- ' . __('Host') . ': ' . $cfg['Server']['host'];
-    if (!empty($cfg['Server']['port'])) {
-         $head .= ':' . $cfg['Server']['port'];
-    }
-    $head .= $crlf
-           .  '- ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
-           .  '- ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf
-           .  '- ' . __('PHP Version') . ': ' . phpversion() . $crlf
-           .  '-->' . $crlf . $crlf;
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader() {
+        global $crlf;
+        global $cfg;
+        global $db;
+        global $table;
+        global $tables;
 
-    $head .= '<pma_xml_export version="1.0"' . (($export_struct) ? ' xmlns:pma="http://www.phpmyadmin.net/some_doc_url/"' : '') . '>' . $crlf;
+        $export_struct = isset($GLOBALS['xml_export_functions']) || isset($GLOBALS['xml_export_procedures'])
+            || isset($GLOBALS['xml_export_tables']) || isset($GLOBALS['xml_export_triggers'])
+            || isset($GLOBALS['xml_export_views']);
+        $export_data = isset($GLOBALS['xml_export_contents']) ? true : false;
 
-    if ($export_struct) {
-        $result = PMA_DBI_fetch_result('SELECT `DEFAULT_CHARACTER_SET_NAME`, `DEFAULT_COLLATION_NAME` FROM `information_schema`.`SCHEMATA` WHERE `SCHEMA_NAME` = \''.PMA_sqlAddSlashes($db).'\' LIMIT 1');
-        $db_collation = $result[0]['DEFAULT_COLLATION_NAME'];
-        $db_charset = $result[0]['DEFAULT_CHARACTER_SET_NAME'];
-
-        $head .= '    <!--' . $crlf;
-        $head .= '    - Structure schemas' . $crlf;
-        $head .= '    -->' . $crlf;
-        $head .= '    <pma:structure_schemas>' . $crlf;
-        $head .= '        <pma:database name="' . htmlspecialchars($db) . '" collation="' . $db_collation . '" charset="' . $db_charset . '">' . $crlf;
-        
-        if (count($tables) == 0) {
-            $tables[] = $table;
+        if ($GLOBALS['output_charset_conversion']) {
+            $charset = $GLOBALS['charset_of_file'];
+        } else {
+            $charset = 'utf-8';
         }
 
-        foreach ($tables as $table) {
-            // Export tables and views
-            $result = PMA_DBI_fetch_result('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), 0);
-            $tbl =  $result[$table][1];
+        $head  =  '<?xml version="1.0" encoding="' . $charset . '"?>' . $crlf
+               .  '<!--' . $crlf
+               .  '- phpMyAdmin XML Dump' . $crlf
+               .  '- version ' . PMA_VERSION . $crlf
+               .  '- http://www.phpmyadmin.net' . $crlf
+               .  '-' . $crlf
+               .  '- ' . __('Host') . ': ' . $cfg['Server']['host'];
+        if (!empty($cfg['Server']['port'])) {
+             $head .= ':' . $cfg['Server']['port'];
+        }
+        $head .= $crlf
+               .  '- ' . __('Generation Time') . ': ' . PMA_localisedDate() . $crlf
+               .  '- ' . __('Server version') . ': ' . PMA_MYSQL_STR_VERSION . $crlf
+               .  '- ' . __('PHP Version') . ': ' . phpversion() . $crlf
+               .  '-->' . $crlf . $crlf;
 
-            $is_view = PMA_isView($db, $table);
+        $head .= '<pma_xml_export version="1.0"' . (($export_struct) ? ' xmlns:pma="http://www.phpmyadmin.net/some_doc_url/"' : '') . '>' . $crlf;
 
-            if ($is_view) {
-                $type = 'view';
-            } else {
-                $type = 'table';
-            }
-            
-            if ($is_view && ! isset($GLOBALS['xml_export_views'])) {
-                continue;
-            }
-            
-            if (! $is_view && ! isset($GLOBALS['xml_export_tables'])) {
-                continue;
+        if ($export_struct) {
+            $result = PMA_DBI_fetch_result('SELECT `DEFAULT_CHARACTER_SET_NAME`, `DEFAULT_COLLATION_NAME` FROM `information_schema`.`SCHEMATA` WHERE `SCHEMA_NAME` = \''.PMA_sqlAddSlashes($db).'\' LIMIT 1');
+            $db_collation = $result[0]['DEFAULT_COLLATION_NAME'];
+            $db_charset = $result[0]['DEFAULT_CHARACTER_SET_NAME'];
+
+            $head .= '    <!--' . $crlf;
+            $head .= '    - Structure schemas' . $crlf;
+            $head .= '    -->' . $crlf;
+            $head .= '    <pma:structure_schemas>' . $crlf;
+            $head .= '        <pma:database name="' . htmlspecialchars($db) . '" collation="' . $db_collation . '" charset="' . $db_charset . '">' . $crlf;
+
+            if (count($tables) == 0) {
+                $tables[] = $table;
             }
 
-            $head .= '            <pma:' . $type . ' name="' . $table . '">' . $crlf;
-            
-            $tbl = "                " . htmlspecialchars($tbl);
-            $tbl = str_replace("\n", "\n                ", $tbl);
+            foreach ($tables as $table) {
+                // Export tables and views
+                $result = PMA_DBI_fetch_result('SHOW CREATE TABLE ' . PMA_backquote($db) . '.' . PMA_backquote($table), 0);
+                $tbl =  $result[$table][1];
 
-            $head .= $tbl . ';' . $crlf;
-            $head .= '            </pma:' . $type . '>' . $crlf;
-            
-            if (isset($GLOBALS['xml_export_triggers']) && $GLOBALS['xml_export_triggers']) {
-                // Export triggers
-                $triggers = PMA_DBI_get_triggers($db, $table);
-                if ($triggers) {
-                    foreach ($triggers as $trigger) {
-                        $code = $trigger['create'];
-                        $head .= '            <pma:trigger name="' . $trigger['name'] . '">' . $crlf;
+                $is_view = PMA_isView($db, $table);
+
+                if ($is_view) {
+                    $type = 'view';
+                } else {
+                    $type = 'table';
+                }
+
+                if ($is_view && ! isset($GLOBALS['xml_export_views'])) {
+                    continue;
+                }
+
+                if (! $is_view && ! isset($GLOBALS['xml_export_tables'])) {
+                    continue;
+                }
+
+                $head .= '            <pma:' . $type . ' name="' . $table . '">' . $crlf;
+
+                $tbl = "                " . htmlspecialchars($tbl);
+                $tbl = str_replace("\n", "\n                ", $tbl);
+
+                $head .= $tbl . ';' . $crlf;
+                $head .= '            </pma:' . $type . '>' . $crlf;
+
+                if (isset($GLOBALS['xml_export_triggers']) && $GLOBALS['xml_export_triggers']) {
+                    // Export triggers
+                    $triggers = PMA_DBI_get_triggers($db, $table);
+                    if ($triggers) {
+                        foreach ($triggers as $trigger) {
+                            $code = $trigger['create'];
+                            $head .= '            <pma:trigger name="' . $trigger['name'] . '">' . $crlf;
+
+                            // Do some formatting
+                            $code = substr(rtrim($code), 0, -3);
+                            $code = "                " . htmlspecialchars($code);
+                            $code = str_replace("\n", "\n                ", $code);
+
+                            $head .= $code . $crlf;
+                            $head .= '            </pma:trigger>' . $crlf;
+                        }
+
+                        unset($trigger);
+                        unset($triggers);
+                    }
+                }
+            }
+
+            if (isset($GLOBALS['xml_export_functions']) && $GLOBALS['xml_export_functions']) {
+                // Export functions
+                $functions = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION');
+                if ($functions) {
+                    foreach ($functions as $function) {
+                        $head .= '            <pma:function name="' . $function . '">' . $crlf;
 
                         // Do some formatting
-                        $code = substr(rtrim($code), 0, -3);
-                        $code = "                " . htmlspecialchars($code);
-                        $code = str_replace("\n", "\n                ", $code);
+                        $sql = PMA_DBI_get_definition($db, 'FUNCTION', $function);
+                        $sql = rtrim($sql);
+                        $sql = "                " . htmlspecialchars($sql);
+                        $sql = str_replace("\n", "\n                ", $sql);
 
-                        $head .= $code . $crlf;
-                        $head .= '            </pma:trigger>' . $crlf;
+                        $head .= $sql . $crlf;
+                        $head .= '            </pma:function>' . $crlf;
                     }
 
-                    unset($trigger);
-                    unset($triggers);
+                    unset($create_func);
+                    unset($function);
+                    unset($functions);
                 }
             }
-        }
-        
-        if (isset($GLOBALS['xml_export_functions']) && $GLOBALS['xml_export_functions']) {
-            // Export functions
-            $functions = PMA_DBI_get_procedures_or_functions($db, 'FUNCTION');
-            if ($functions) {
-                foreach ($functions as $function) {
-                    $head .= '            <pma:function name="' . $function . '">' . $crlf;
 
-                    // Do some formatting
-                    $sql = PMA_DBI_get_definition($db, 'FUNCTION', $function);
-                    $sql = rtrim($sql);
-                    $sql = "                " . htmlspecialchars($sql);
-                    $sql = str_replace("\n", "\n                ", $sql);
+            if (isset($GLOBALS['xml_export_procedures']) && $GLOBALS['xml_export_procedures']) {
+                // Export procedures
+                $procedures = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE');
+                if ($procedures) {
+                    foreach ($procedures as $procedure) {
+                        $head .= '            <pma:procedure name="' . $procedure . '">' . $crlf;
 
-                    $head .= $sql . $crlf;
-                    $head .= '            </pma:function>' . $crlf;
+                        // Do some formatting
+                        $sql = PMA_DBI_get_definition($db, 'PROCEDURE', $procedure);
+                        $sql = rtrim($sql);
+                        $sql = "                " . htmlspecialchars($sql);
+                        $sql = str_replace("\n", "\n                ", $sql);
+
+                        $head .= $sql . $crlf;
+                        $head .= '            </pma:procedure>' . $crlf;
+                    }
+
+                    unset($create_proc);
+                    unset($procedure);
+                    unset($procedures);
                 }
-
-                unset($create_func);
-                unset($function);
-                unset($functions);
             }
-        }
-        
-        if (isset($GLOBALS['xml_export_procedures']) && $GLOBALS['xml_export_procedures']) {
-            // Export procedures
-            $procedures = PMA_DBI_get_procedures_or_functions($db, 'PROCEDURE');
-            if ($procedures) {
-                foreach ($procedures as $procedure) {
-                    $head .= '            <pma:procedure name="' . $procedure . '">' . $crlf;
 
-                    // Do some formatting
-                    $sql = PMA_DBI_get_definition($db, 'PROCEDURE', $procedure);
-                    $sql = rtrim($sql);
-                    $sql = "                " . htmlspecialchars($sql);
-                    $sql = str_replace("\n", "\n                ", $sql);
+            unset($result);
 
-                    $head .= $sql . $crlf;
-                    $head .= '            </pma:procedure>' . $crlf;
-                }
+            $head .= '        </pma:database>' . $crlf;
+            $head .= '    </pma:structure_schemas>' . $crlf;
 
-                unset($create_proc);
-                unset($procedure);
-                unset($procedures);
+            if ($export_data) {
+                $head .= $crlf;
             }
         }
 
-        unset($result);
-
-        $head .= '        </pma:database>' . $crlf;
-        $head .= '    </pma:structure_schemas>' . $crlf;
-
-        if ($export_data) {
-            $head .= $crlf;
-        }
-    }
-
-    return PMA_exportOutputHandler($head);
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db) {
-    global $crlf;
-    
-    if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
-        $head = '    <!--' . $crlf
-              . '    - ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
-              . '    -->' . $crlf
-              . '    <database name="' . htmlspecialchars($db) . '">' . $crlf;
-        
         return PMA_exportOutputHandler($head);
     }
-    else
-    {
+
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db) {
+        global $crlf;
+
+        if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
+            $head = '    <!--' . $crlf
+                  . '    - ' . __('Database') . ': ' . (isset($GLOBALS['use_backquotes']) ? PMA_backquote($db) : '\'' . $db . '\''). $crlf
+                  . '    -->' . $crlf
+                  . '    <database name="' . htmlspecialchars($db) . '">' . $crlf;
+
+            return PMA_exportOutputHandler($head);
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db) {
+        global $crlf;
+
+        if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
+            return PMA_exportOutputHandler('    </database>' . $crlf);
+        }
+        else
+        {
+            return true;
+        }
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db) {
         return true;
     }
-}
 
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db) {
-    global $crlf;
-    
-    if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
-        return PMA_exportOutputHandler('    </database>' . $crlf);
-    }
-    else
-    {
-        return true;
-    }
-}
+    /**
+     * Outputs the content of a table in XML format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
 
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db) {
-    return true;
-}
+        if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
+            $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
 
-/**
- * Outputs the content of a table in XML format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) {
-
-    if (isset($GLOBALS['xml_export_contents']) && $GLOBALS['xml_export_contents']) {
-        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-
-        $columns_cnt = PMA_DBI_num_fields($result);
-        $columns = array();
-        for ($i = 0; $i < $columns_cnt; $i++) {
-            $columns[$i] = stripslashes(str_replace(' ', '_', PMA_DBI_field_name($result, $i)));
-        }
-        unset($i);
-
-        $buffer      = '        <!-- ' . __('Table') . ' ' . $table . ' -->' . $crlf;
-        if (!PMA_exportOutputHandler($buffer)) {
-            return false;
-        }
-
-        while ($record = PMA_DBI_fetch_row($result)) {
-            $buffer         = '        <table name="' . htmlspecialchars($table) . '">' . $crlf;
+            $columns_cnt = PMA_DBI_num_fields($result);
+            $columns = array();
             for ($i = 0; $i < $columns_cnt; $i++) {
-                // If a cell is NULL, still export it to preserve the XML structure
-                if (!isset($record[$i]) || is_null($record[$i])) {
-                    $record[$i] = 'NULL';
-                }
-                $buffer .= '            <column name="' . htmlspecialchars($columns[$i]) . '">' . htmlspecialchars((string)$record[$i])
-                        .  '</column>' . $crlf;
+                $columns[$i] = stripslashes(str_replace(' ', '_', PMA_DBI_field_name($result, $i)));
             }
-            $buffer         .= '        </table>' . $crlf;
+            unset($i);
 
+            $buffer      = '        <!-- ' . __('Table') . ' ' . $table . ' -->' . $crlf;
             if (!PMA_exportOutputHandler($buffer)) {
                 return false;
             }
-        }
-        PMA_DBI_free_result($result);
-    }
 
-    return true;
-} // end of the 'PMA_getTableXML()' function
-}
+            while ($record = PMA_DBI_fetch_row($result)) {
+                $buffer         = '        <table name="' . htmlspecialchars($table) . '">' . $crlf;
+                for ($i = 0; $i < $columns_cnt; $i++) {
+                    // If a cell is NULL, still export it to preserve the XML structure
+                    if (!isset($record[$i]) || is_null($record[$i])) {
+                        $record[$i] = 'NULL';
+                    }
+                    $buffer .= '            <column name="' . htmlspecialchars($columns[$i]) . '">' . htmlspecialchars((string)$record[$i])
+                            .  '</column>' . $crlf;
+                }
+                $buffer         .= '        </table>' . $crlf;
+
+                if (!PMA_exportOutputHandler($buffer)) {
+                    return false;
+                }
+            }
+            PMA_DBI_free_result($result);
+        }
+
+        return true;
+    } // end of the 'PMA_getTableXML()' function
+    }
 }
 ?>
diff --git a/libraries/export/yaml.php b/libraries/export/yaml.php
index 26b19a9401..0ec1551208 100644
--- a/libraries/export/yaml.php
+++ b/libraries/export/yaml.php
@@ -31,139 +31,139 @@ if (isset($plugin_list)) {
     );
 } else {
 
-/**
- * Set of functions used to build exports of tables
- */
+    /**
+     * Set of functions used to build exports of tables
+     */
 
-/**
- * Outputs export footer
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportFooter()
-{
-    PMA_exportOutputHandler('...' . $GLOBALS['crlf']);
-    return true;
-}
-
-/**
- * Outputs export header
- *
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportHeader()
-{
-    PMA_exportOutputHandler('%YAML 1.1' . $GLOBALS['crlf'] . '---' . $GLOBALS['crlf']);
-    return true;
-}
-
-/**
- * Outputs database header
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBHeader($db)
-{
-    return true;
-}
-
-/**
- * Outputs database footer
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBFooter($db)
-{
-    return true;
-}
-
-/**
- * Outputs CREATE DATABASE statement
- *
- * @param string  $db Database name
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportDBCreate($db)
-{
-    return true;
-}
-
-/**
- * Outputs the content of a table in YAML format
- *
- * @param string  $db         database name
- * @param string  $table      table name
- * @param string  $crlf       the end of line sequence
- * @param string  $error_url  the url to go back in case of error
- * @param string  $sql_query  SQL query for obtaining data
- * @return  bool        Whether it suceeded
- *
- * @access  public
- */
-function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
-{
-    $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
-
-    $columns_cnt = PMA_DBI_num_fields($result);
-    for ($i = 0; $i < $columns_cnt; $i++) {
-        $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
+    /**
+     * Outputs export footer
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportFooter()
+    {
+        PMA_exportOutputHandler('...' . $GLOBALS['crlf']);
+        return true;
     }
-    unset($i);
 
-    $buffer = '';
-    $record_cnt = 0;
-    while ($record = PMA_DBI_fetch_row($result)) {
-        $record_cnt++;
+    /**
+     * Outputs export header
+     *
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportHeader()
+    {
+        PMA_exportOutputHandler('%YAML 1.1' . $GLOBALS['crlf'] . '---' . $GLOBALS['crlf']);
+        return true;
+    }
 
-        // Output table name as comment if this is the first record of the table
-        if ($record_cnt == 1) {
-            $buffer = '# ' . $db . '.' . $table . $crlf;
-            $buffer .= '-' . $crlf;
-        } else {
-            $buffer = '-' . $crlf;
-        }
+    /**
+     * Outputs database header
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBHeader($db)
+    {
+        return true;
+    }
 
+    /**
+     * Outputs database footer
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBFooter($db)
+    {
+        return true;
+    }
+
+    /**
+     * Outputs CREATE DATABASE statement
+     *
+     * @param string  $db Database name
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportDBCreate($db)
+    {
+        return true;
+    }
+
+    /**
+     * Outputs the content of a table in YAML format
+     *
+     * @param string  $db         database name
+     * @param string  $table      table name
+     * @param string  $crlf       the end of line sequence
+     * @param string  $error_url  the url to go back in case of error
+     * @param string  $sql_query  SQL query for obtaining data
+     * @return  bool        Whether it suceeded
+     *
+     * @access  public
+     */
+    function PMA_exportData($db, $table, $crlf, $error_url, $sql_query)
+    {
+        $result      = PMA_DBI_query($sql_query, null, PMA_DBI_QUERY_UNBUFFERED);
+
+        $columns_cnt = PMA_DBI_num_fields($result);
         for ($i = 0; $i < $columns_cnt; $i++) {
-            if (! isset($record[$i])) {
-                continue;
-            }
-
-            $column = $columns[$i];
-
-            if (is_null($record[$i])) {
-                $buffer .= '  ' . $column . ': null' . $crlf;
-                continue;
-            }
-
-            if (is_numeric($record[$i])) {
-                $buffer .= '  ' . $column . ': '  . $record[$i] . $crlf;
-                continue;
-            }
-
-            $record[$i] = str_replace(array('\\', '"', "\n", "\r"), array('\\\\', '\"', '\n', '\r'), $record[$i]);
-            $buffer .= '  ' . $column . ': "' . $record[$i] . '"' . $crlf;
+            $columns[$i] = stripslashes(PMA_DBI_field_name($result, $i));
         }
+        unset($i);
 
-        if (! PMA_exportOutputHandler($buffer)) {
-            return false;
+        $buffer = '';
+        $record_cnt = 0;
+        while ($record = PMA_DBI_fetch_row($result)) {
+            $record_cnt++;
+
+            // Output table name as comment if this is the first record of the table
+            if ($record_cnt == 1) {
+                $buffer = '# ' . $db . '.' . $table . $crlf;
+                $buffer .= '-' . $crlf;
+            } else {
+                $buffer = '-' . $crlf;
+            }
+
+            for ($i = 0; $i < $columns_cnt; $i++) {
+                if (! isset($record[$i])) {
+                    continue;
+                }
+
+                $column = $columns[$i];
+
+                if (is_null($record[$i])) {
+                    $buffer .= '  ' . $column . ': null' . $crlf;
+                    continue;
+                }
+
+                if (is_numeric($record[$i])) {
+                    $buffer .= '  ' . $column . ': '  . $record[$i] . $crlf;
+                    continue;
+                }
+
+                $record[$i] = str_replace(array('\\', '"', "\n", "\r"), array('\\\\', '\"', '\n', '\r'), $record[$i]);
+                $buffer .= '  ' . $column . ': "' . $record[$i] . '"' . $crlf;
+            }
+
+            if (! PMA_exportOutputHandler($buffer)) {
+                return false;
+            }
         }
+        PMA_DBI_free_result($result);
+
+        return true;
     }
-    PMA_DBI_free_result($result);
-
-    return true;
-}
 
 }
 ?>
diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php
index 6d9c4bfec0..e92015027f 100644
--- a/libraries/sanitizing.lib.php
+++ b/libraries/sanitizing.lib.php
@@ -9,9 +9,8 @@
 /**
  * Checks whether given link is valid
  *
- * @param string $url URL to check.
- *
- * @return boolean True if string can be used as link.
+ * @param string $url URL to check
+ * @return boolean True if string can be used as link
  */
 function PMA_checkLink($url)
 {
@@ -21,6 +20,7 @@ function PMA_checkLink($url)
     );
     if (defined('PMA_SETUP')) {
         $valid_starts[] = '../Documentation.html';
+        $valid_starts[] = '?page=form&';
     } else {
         $valid_starts[] = './Documentation.html';
     }
@@ -36,7 +36,6 @@ function PMA_checkLink($url)
  * Callback function for replacing [a@link@target] links in bb code.
  *
  * @param array $found Array of preg matches
- *
  * @return string Replaced string
  */
 function PMA_replaceBBLink($found)
@@ -81,10 +80,7 @@ function PMA_replaceBBLink($found)
  * @param string  $message the message
  * @param boolean $escape  whether to escape html in result
  * @param boolean $safe    whether string is safe (can keep < and > chars)
- *
  * @return  string   the sanitized message
- *
- * @access  public
  */
 function PMA_sanitize($message, $escape = false, $safe = false)
 {
diff --git a/libraries/server_synchronize.lib.php b/libraries/server_synchronize.lib.php
index 12cea2a70e..b7b332c2bf 100644
--- a/libraries/server_synchronize.lib.php
+++ b/libraries/server_synchronize.lib.php
@@ -1287,66 +1287,75 @@ function PMA_displayQuery($query) {
 }
 
 /**
- * PMA_syncDisplayHeaderSource() shows the header for source database
+ * PMA_syncDisplayHeaderCompare() shows the header for source database
  *
- * @param string $src_db          source db name
+ * @param string $src_db  source db name
+ * @param string $trg_db  target db name
  * @return nothing
  */
-function PMA_syncDisplayHeaderSource($src_db) {
-    echo '<div id="serverstatus" style = "overflow: auto; width: 1020px; height: 220px; border-left: 1px gray solid; border-bottom: 1px gray solid; padding:0; margin-bottom: 1em "> ';
+function PMA_syncDisplayHeaderCompare($src_db, $trg_db) {
+    echo '<fieldset style="padding:0"><div style="padding:1.5em; overflow:auto; height:220px">';
 
-    echo '<table id="serverstatusconnections" class="data" width="55%">';
+    echo '<table class="data">';
     echo '<tr>';
-    echo '<th>' . __('Source database') . ':  ' . $src_db . '<br />(';
+    echo '<th>' . __('Source database') . ':  ' . htmlspecialchars($src_db) . '<br />(';
     if ('cur' == $_SESSION['src_type']) {
         echo __('Current server');
     } else {
-        echo __('Remote server') . ' ' . $_SESSION['src_server']['host'];
+        echo __('Remote server') . ' ' . htmlspecialchars($_SESSION['src_server']['host']);
     }
     echo ')</th>';
     echo '<th>' . __('Difference') . '</th>';
-    echo '</tr>';
-}
-
-/**
- * PMA_syncDisplayHeaderTargetAndMatchingTables() shows the header for target database and the matching tables
- *
- * @param string  $trg_db          target db name
- * @param array   $matching_tables
- * @return  boolean $odd_row         current value of this toggle
- */
-function PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables) {
-    echo '<table id="serverstatusconnections" class="data" width="43%">';
-    echo '<tr>';
-    echo '<th>' . __('Target database') . ':  '. $trg_db . '<br />(';
+    echo '<th>' . __('Target database') . ':  '. htmlspecialchars($trg_db) . '<br />(';
     if ('cur' == $_SESSION['trg_type']) {
         echo __('Current server');
     } else {
-        echo __('Remote server') . ' ' . $_SESSION['trg_server']['host'];
+        echo __('Remote server') . ' ' . htmlspecialchars($_SESSION['trg_server']['host']);
     }
     echo ')</th>';
     echo '</tr>';
-    $odd_row = false;
-    foreach ($matching_tables as $tbl_name) {
-        $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-        echo '<td>  ' . htmlspecialchars($tbl_name) . '</td>';
-        echo '</tr>';
-    }
-    return $odd_row;
 }
 
 /**
- * PMA_syncDisplayBeginTableRow() displays the TR tag for alternating colors
+ * Prints table row
  *
- * @param boolean $odd_row        current status of the toggle
- * @return  boolean $odd_row        final status of the toggle
+ * $rows contains following keys:
+ * - src_table_name - source server table name
+ * - dst_table_name - target server table name
+ * - btn_type - 'M' or 'U'
+ * - btn_structure - null or arguments for showDetails in server_synchronize.js (without img_obj and table_name):
+ *                       i, update_size, insert_size, remove_size, insert_index, remove_index
+ *
+ * @param array $rows
  */
-function PMA_syncDisplayBeginTableRow($odd_row) {
-    $odd_row = ! $odd_row;
-    echo '<tr height="32" class=" ';
-    echo $odd_row ? 'odd' : 'even';
-    echo '">';
-    return $odd_row;
+function PMA_syncDisplayDataCompare($rows) {
+    global $pmaThemeImage;
+
+    $odd_row = true;
+    foreach ($rows as $row) {
+        echo '<tr class=" ' . ($odd_row ? 'odd' : 'even') . '">';
+        echo '<td>' . htmlspecialchars($row['src_table_name']) . '</td><td style="text-align:center">';
+        if (isset($row['btn_structure']) && $row['btn_structure']) {
+            // parameters: i, update_size, insert_size, remove_size, insert_index, remove_index
+            $p = $row['btn_structure'];
+            $p[0] = $row['btn_type'] . 'S' . $p[0];
+            echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.png" width="16" height="16"
+                 alt="Structure" title="' . __('Click to select') . '" style="cursor:pointer" onclick="showDetails('
+                 . "'" . implode($p, "','") . "'"
+                 . ', this, ' . "'" . PMA_escapeJsString(htmlspecialchars($row['src_table_name'])) . "'" . ')" /> ';
+        }
+        if (isset($row['btn_data']) && $row['btn_data']) {
+            // parameters: i, update_size, insert_size, remove_size, insert_index, remove_index
+            $p = $row['btn_data'];
+            $p[0] = $row['btn_type'] . 'D' . $p[0];
+            echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.png" width="16" height="16"
+                alt="Data" title="' . __('Click to select') . '" style="cursor:pointer" onclick="showDetails('
+                . "'" . implode($p, "','") . "'"
+                . ', this, ' . "'" . PMA_escapeJsString(htmlspecialchars($row['src_table_name'])) . "'" . ')" />';
+        }
+        echo '</td><td>' . htmlspecialchars($row['dst_table_name']) . '</td></tr>';
+        $odd_row = !$odd_row;
+    }
 }
 
 /**
diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php
index fa77136674..b7b0455431 100644
--- a/libraries/sqlparser.lib.php
+++ b/libraries/sqlparser.lib.php
@@ -2629,12 +2629,12 @@ if (! defined('PMA_MINIMUM_COMMON')) {
                     break;
             } // end switch ($typearr[2])
 
-/*
+            /*
             if ($typearr[3] != 'punct_qualifier') {
                 $after             .= ' ';
             }
             $after                 .= "\n";
-*/
+            */
             $str .= $before;
             if ($mode=='color') {
                 $str .= PMA_SQP_formatHTML_colorize($arr[$i]);
@@ -2650,7 +2650,7 @@ if (! defined('PMA_MINIMUM_COMMON')) {
             $indent--;
             $str .= ($mode != 'query_only' ? '</div>' : ' ');
         }
-       /* End possibly unclosed documentation link */
+        /* End possibly unclosed documentation link */
         if ($close_docu_link) {
             $str .= '</a>';
             $close_docu_link = false;
diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php
index f4ade94bc8..7208ea37db 100644
--- a/libraries/tbl_properties.inc.php
+++ b/libraries/tbl_properties.inc.php
@@ -622,7 +622,7 @@ if (is_array($content_cells) && is_array($header_cells)) {
     // last row is for javascript insert
     //$empty_row = array_pop($content_cells);
 
-    echo '<table id="table_columns">';
+    echo '<table id="table_columns" class="noclick">';
     echo '<caption class="tblHeaders">' . __('Structure') . PMA_showMySQLDocu('SQL-Syntax', 'CREATE_TABLE') . '</caption>';
 
     if ($display_type == 'horizontal') {
@@ -636,7 +636,7 @@ if (is_array($content_cells) && is_array($header_cells)) {
 
         $odd_row = true;
         foreach ($content_cells as $content_row) {
-            echo '<tr class="' . ($odd_row ? 'odd' : 'even') . ' noclick">';
+            echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">';
             $odd_row = ! $odd_row;
 
             if (is_array($content_row)) {
@@ -652,7 +652,7 @@ if (is_array($content_cells) && is_array($header_cells)) {
         $i = 0;
         $odd_row = true;
         foreach ($header_cells as $header_val) {
-            echo '<tr class="' . ($odd_row ? 'odd' : 'even') . ' noclick">';
+            echo '<tr class="' . ($odd_row ? 'odd' : 'even') . '">';
             $odd_row = ! $odd_row;
             ?>
     <th><?php echo $header_val; ?></th>
diff --git a/pmd/scripts/history.js b/pmd/scripts/history.js
index 478bd829ce..7caeea93ab 100644
--- a/pmd/scripts/history.js
+++ b/pmd/scripts/history.js
@@ -6,7 +6,7 @@
   * @requires    moves.js
   * @version $Id$
   */
-  
+
 var history_array = []; // Global array to store history objects
 var select_field = [];  // Global array to store informaation for columns which are used in select clause
 var g_index;
@@ -14,12 +14,12 @@ var g_index;
 /**
  * function for panel, hides and shows toggle_container <div>,which is for history elements uses {@link JQuery}.
  *
- * @param	index	has value 1 or 0,decides wheter to hide toggle_container on load. 
+ * @param index has value 1 or 0,decides wheter to hide toggle_container on load.
 **/
 
 function panel(index) {
     if (!index) {
-        $(".toggle_container").hide(); 
+        $(".toggle_container").hide();
     }
     $("h2.tiger").click(function(){
     $(this).toggleClass("active").next().slideToggle("slow");
@@ -31,18 +31,18 @@ function panel(index) {
  * clubbing all objects of same tables together
  * This function is called whenever changes are made in history_array[]
  *
- * @uses	and_or()
- * @uses	history_edit()
- * @uses	history_delete()
- * 	
- * @param {int}  init 	starting index of unsorted array   
- * @param {int}	final   last index of unsorted array
+ * @uses and_or()
+ * @uses history_edit()
+ * @uses history_delete()
+ *
+ * @param {int}  init starting index of unsorted array
+ * @param {int} final   last index of unsorted array
  *
 **/
 
 function display(init,final) {
     var str,i,j,k,sto;
-    // this part sorts the history array based on table name,this is needed for clubbing all object of same name together. 
+    // this part sorts the history array based on table name,this is needed for clubbing all object of same name together.
     for (i = init;i < final;i++) {
         sto = history_array[i];
         var temp = history_array[i].get_tab() ;//+ '.' + history_array[i].get_obj_no(); for Self JOINS
@@ -60,7 +60,7 @@ function display(init,final) {
     str =''; // string to store Html code for history tab
     for ( var i=0; i < history_array.length; i++){
         var temp = history_array[i].get_tab(); //+ '.' + history_array[i].get_obj_no(); for Self JOIN
-        str += '<h2 class="tiger"><a href="#">' + temp + '</a></h2>';  				
+        str += '<h2 class="tiger"><a href="#">' + temp + '</a></h2>';
         str += '<div class="toggle_container">\n';
         while((history_array[i].get_tab()) == temp) { //+ '.' + history_array[i].get_obj_no()) == temp) {
             str +='<div class="block"> <table width ="250">';
@@ -76,7 +76,7 @@ function display(init,final) {
                 str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+detail(i)+'"/><td title="' + detail(i) +'">' + history_array[i].get_type() + '</td></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_delete('+ i +')><img class="icon ic_b_drop" src="themes/dot.gif" title="Delete"></td></tr></thead>';
            }
            else {
-               str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+detail(i)+'"/></td><td title="' + detail(i) +'">' + history_array[i].               get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')><img class="icon ic_b_edit" src="themes/dot.gif" title="Edit"/></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'"               onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>'; 
+               str += '</td><td align="center"><img class="icon ic_b_info" src="themes/dot.gif" title="'+detail(i)+'"/></td><td title="' + detail(i) +'">' + history_array[i].               get_type() + '</td><td <td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'" onclick=history_edit('+ i +')><img class="icon ic_b_edit" src="themes/dot.gif" title="Edit"/></td><td onmouseover="this.className=\'history_table\';" onmouseout="this.className=\'history_table2\'"               onclick=history_delete('+ i +')><img src="themes/original/img/b_drop.png" title="Delete"></td></tr></thead>';
            }
            i++;
            if(i >= history_array.length) {
@@ -91,9 +91,9 @@ function display(init,final) {
 }
 
 /**
- * To change And/Or relation in history tab 
- * 
- * @uses	panel()
+ * To change And/Or relation in history tab
+ *
+ * @uses panel()
  *
  * @param {int} index of history_array where change is to be made
  *
@@ -113,8 +113,8 @@ function and_or(index) {
 
 /**
  * To display details of obects(where,rename,Having,aggregate,groupby,orderby,having)
- * 
- * @param	index	index of history_array where change is to be made
+ *
+ * @param index index of history_array where change is to be made
  *
 **/
 
@@ -152,16 +152,16 @@ function detail (index) {
 /**
  * Deletes entry in history_array
  *
- * @uses	panel()
- * @uses	display()
- * @param	index	index of history_array[] which is to be deleted
+ * @uses panel()
+ * @uses display()
+ * @param index index of history_array[] which is to be deleted
  *
 **/
 
 function history_delete(index) {
     for(var k =0 ;k < from_array.length;k++){
-        if(from_array[k] == history_array[index].get_tab()){ 
-            from_array.splice(k,1); 
+        if(from_array[k] == history_array[index].get_tab()){
+            from_array.splice(k,1);
             break;
         }
     }
@@ -173,8 +173,8 @@ function history_delete(index) {
 
 /**
  * To show where,rename,aggregate,having forms to edit a object
- * 
- * @param{int} index	index of history_array where change is to be made
+ *
+ * @param{int} index index of history_array where change is to be made
  *
 **/
 
@@ -219,10 +219,10 @@ function history_edit(index) {
 /**
  * Make changes in history_array when Edit button is clicked
  * checks for the type of object and then sets the new value
- * @uses	panel()
- * @uses	display()
+ * @uses panel()
+ * @uses display()
  *
- * @param	index	index of history_array where change is to be made
+ * @param index index of history_array where change is to be made
 **/
 
 function edit(type) {
@@ -261,13 +261,13 @@ function edit(type) {
 }
 
 /**
- * history object closure  
+ * history object closure
  *
- * @param	ncolumn_name	name of the column on which conditions are put
- * @param	nobj			object details(where,rename,orderby,groupby,aggregate)
- * @param	ntab			table name of the column on which conditions are applied
- * @param	nobj_no			object no used for inner join
- * @param	ntype			type of object
+ * @param ncolumn_name  name of the column on which conditions are put
+ * @param nobj          object details(where,rename,orderby,groupby,aggregate)
+ * @param ntab          table name of the column on which conditions are applied
+ * @param nobj_no       object no used for inner join
+ * @param ntype         type of object
  *
 **/
 
@@ -328,8 +328,8 @@ function history(ncolumn_name,nobj,ntab,nobj_no,ntype) {
 /**
  * where object closure, makes an object with all information of where
  *
- * @param	nrelation_operator	type of relation operator to be applied
- * @param	nquery				stores value of value/sub-query 
+ * @param nrelation_operator type of relation operator to be applied
+ * @param nquery             stores value of value/sub-query
  *
 **/
 
@@ -357,8 +357,8 @@ var where = function (nrelation_operator,nquery) {
 /**
  * Having object closure, makes an object with all information of where
  *
- * @param	nrelation_operator	type of relation operator to be applied
- * @param	nquery				stores value of value/sub-query 
+ * @param nrelation_operator type of relation operator to be applied
+ * @param nquery             stores value of value/sub-query
  *
 **/
 
@@ -392,7 +392,7 @@ var having = function (nrelation_operator,nquery,noperator) {
 /**
  * rename object closure,makes an object with all information of rename
  *
- * @param	nrename_to	new name information
+ * @param nrename_to new name information
  *
 **/
 
@@ -410,7 +410,7 @@ var rename = function(nrename_to) {
 /**
  * aggregate object closure
  *
- * @param	noperator	aggregte operator
+ * @param noperator aggregte operator
  *
 **/
 
@@ -435,10 +435,10 @@ var aggregate = function(noperator) {
 function unique(arrayName) {
     var newArray=new Array();
     label:for(var i=0; i<arrayName.length;i++ )
-    {  
+    {
         for(var j=0; j<newArray.length;j++ )
         {
-            if(newArray[j]==arrayName[i]) 
+            if(newArray[j]==arrayName[i])
                 continue label;
         }
         newArray[newArray.length] = arrayName[i];
@@ -453,27 +453,27 @@ function unique(arrayName) {
  * @param arrayName array
  * @param value  value which is to be searched in the array
  */
- 
+
 function found(arrayName,value) {
     for(var i=0; i<arrayName.length; i++) {
         if(arrayName[i] == value) { return 1;}
     }
     return -1;
 }
-		
+
 /**
  * This function is the main function for query building.
  * uses history object details for this.
  *
  * @ uses query_where()
  * @ uses query_groupby()
- * @ uses query_having() 
+ * @ uses query_having()
  * @ uses query_orderby()
- * 
+ *
  * @param formtitle title for the form
- * @param fadin      
+ * @param fadin
  */
- 
+
 function build_query(formtitle, fadin) {
     var q_select = "SELECT ";
     var temp;
@@ -486,19 +486,19 @@ function build_query(formtitle, fadin) {
         }
         else {
             temp = check_rename(select_field[i]);
-            q_select += select_field[i] + temp +","; 
+            q_select += select_field[i] + temp +",";
         }
     }
     q_select = q_select.substring(0,q_select.length - 1);
     q_select += " FROM " + query_from();
     if(query_where() != "") {
         q_select +="\n WHERE";
-		q_select += query_where();
+        q_select += query_where();
     }
     if(query_groupby() != "") { q_select += "\nGROUP BY " + query_groupby(); }
     if(query_having() != "") { q_select += "\nHAVING " + query_having(); }
     if(query_orderby() != "") { q_select += "\nORDER BY " + query_orderby(); }
-    var box = document.getElementById('box'); 
+    var box = document.getElementById('box');
     document.getElementById('filter').style.display='block';
     var btitle = document.getElementById('boxtitle');
     btitle.innerHTML = 'SELECT';//formtitle;
@@ -506,21 +506,21 @@ function build_query(formtitle, fadin) {
         gradient("box", 0);
         fadein("box");
     }
-    else{ 	
+    else{
         box.style.display='block';
-    }  	
+    }
     document.getElementById('textSqlquery').innerHTML = q_select;
 }
  /**
   * This function builds from clause of query
   * makes automatic joins.
-  * 
+  *
   * @uses unique
   * @uses add_array
   * @uses remove_array
   *
   */
- 
+
 
 function query_from() {
     var i =0;
@@ -543,12 +543,12 @@ function query_from() {
     temp = tab_left.shift();
     quer = temp;
     tab_used.push(temp);
-    // if master table (key2) matches with tab used get all keys and check if tab_left matches 
-    //after this check if master table (key2) matches with tab left then check if any foriegn matches with master . 
-	for( i =0; i<2 ; i++) {
+    // if master table (key2) matches with tab used get all keys and check if tab_left matches
+    //after this check if master table (key2) matches with tab left then check if any foriegn matches with master .
+    for( i =0; i<2 ; i++) {
         for (K in contr){
             for (key in contr[K]){// contr name
-	             for (key2 in contr[K][key]){// table name
+                 for (key2 in contr[K][key]){// table name
                     parts = key2.split(".");
                     if(found(tab_used,parts[1]) > 0)  {
                         for (key3 in contr[K][key][key2]) {
@@ -564,7 +564,7 @@ function query_from() {
                     }
                 }
             }
-        }	
+        }
         K = 0;
         t_tab_left = unique (t_tab_left);
         tab_used = add_array(t_tab_left,tab_used);
@@ -574,7 +574,7 @@ function query_from() {
              for (key in contr[K]) {
                  for (key2 in contr[K][key]){// table name
                      parts = key2.split(".");
-                         if(found(tab_left,parts[1]) > 0){	
+                         if(found(tab_left,parts[1]) > 0){
                            for (key3 in contr[K][key][key2]){
                                parts1 = contr[K][key][key2][key3][0].split(".");
                                if(found(tab_used,parts1[1]) > 0) {
@@ -601,9 +601,7 @@ function query_from() {
         from_array = t_array;
         return query;
 }
-				/*		document.write(key3+";"); //master_field
-							document.write(contr[K][key][key2][key3][0]+";"); // foreign_table
-							document.write(contr[K][key][key2][key3][1]+";"); //forieign_feild */
+
 /**
  * This function concatenates two array
  *
@@ -616,7 +614,7 @@ function add_array(add,arr){
     }
     return arr;
 }
- 
+
 /* This fucntion removes all elements present in one array from the other.
  *
  * @params rem array from which each element is removed from other array.
@@ -635,7 +633,7 @@ function remove_array(rem,arr){
  * This function builds the groupby clause from history object
  *
  */
- 
+
 function query_groupby() {
     var i = 0;
     var str = "";
@@ -658,7 +656,7 @@ function query_having() {
         if(history_array[i].get_type() == "Having") {
             if (history_array[i].get_obj().get_operator() != 'None') {
                 and += history_array[i].get_obj().get_operator() + "(" + history_array[i].get_column_name() + " ) " + history_array[i].get_obj().getrelation_operator();
-                and += " " + history_array[i].get_obj().getquery() + ", " ; 
+                and += " " + history_array[i].get_obj().getquery() + ", " ;
             }
             else {
                 and +=  history_array[i].get_column_name() + " " + history_array[i].get_obj().getrelation_operator() + " " + history_array[i].get_obj().getquery() + ", ";
@@ -707,11 +705,19 @@ function query_where(){
             }
         }
     }
-    if ( or != "(") {	or = or.substring(0,(or.length - 4 )) + ")"; }
-    else { or = "" ;}
-    if (and !="(") {and = and.substring(0,(and.length - 5)) + ")"; }
-    else {and = "" ;}
-    if ( or != "" ) { and = and + " OR " + or + " )"; }
+    if ( or != "(") {
+        or = or.substring(0,(or.length - 4 )) + ")";
+    } else {
+        or = "" ;
+    }
+    if (and !="(") {
+        and = and.substring(0,(and.length - 5)) + ")";
+    } else {
+        and = "" ;
+    }
+    if ( or != "" ) {
+        and = and + " OR " + or + " )";
+    }
     return and;
 }
 
@@ -749,7 +755,7 @@ function gradient(id, level)
 }
 
 
-function fadein(id) 
+function fadein(id)
 {
     var level = 0;
     while(level <= 1){
diff --git a/pmd/scripts/move.js b/pmd/scripts/move.js
index 1ce18a17ba..71eb037209 100644
--- a/pmd/scripts/move.js
+++ b/pmd/scripts/move.js
@@ -26,20 +26,20 @@
         eval (hrefscript);
         return false;
     }).attr('href', '#');
-}); 
+});
 
 // Below is the function to bind onbeforeunload events with the content_frame as well as the top window.
 
  $(document).ready(function(){
     $(window).bind('beforeunload', function(){        // onbeforeunload for the frame window.
-        if (_change == 1 && _staying == 0) 
+        if (_change == 1 && _staying == 0)
             return PMA_messages['strLeavingDesigner'];
-        else if (_change == 1 && _staying == 1) 
+        else if (_change == 1 && _staying == 1)
             _staying = 0;
     });
     $(window).unload(function(){
         _change = 0;
-    });    
+    });
     window.top.onbeforeunload = function(){     // onbeforeunload for the browser main window.
         if (_change == 1 && _staying == 0){
             _staying = 1;                                                   //  Helps if the user stays on the page  as there
@@ -48,7 +48,7 @@
         }
     };
 });
- 
+
  function make_zero(){   // Function called if the user stays after seeing the confirmation prompt.
       _staying = 0;
 }
@@ -1015,7 +1015,7 @@ function getColorByTarget( target )
   return color;
 }
 
-function Click_option(id_this,column_name,table_name) 
+function Click_option(id_this,column_name,table_name)
 {
     var left = Glob_X - (document.getElementById(id_this).offsetWidth>>1);
     document.getElementById(id_this).style.left = left + 'px';
@@ -1044,10 +1044,10 @@ function Select_all(id_this,owner)
                 parent.elements[i].checked = true;
                 parent.elements[i].disabled = true;
                 var temp = '`' + id_this.substring(owner.length +1) + '`.*';
-           }	
+           }
            else {
                parent.elements[i].checked = false;
-               parent.elements[i].disabled = false;	
+               parent.elements[i].disabled = false;
            }
         }
     }
@@ -1063,8 +1063,8 @@ function Select_all(id_this,owner)
             }
         }
         for(k =0 ;k < from_array.length;k++){
-            if(from_array[k] == id_this){ 
-                from_array.splice(k,1); 
+            if(from_array[k] == id_this){
+                from_array.splice(k,1);
                 break;
             }
         }
@@ -1096,7 +1096,7 @@ function store_column(id_this,owner,col) {
     var i = 0;
     var k = 0;
     if (document.getElementById('select_' + owner + '.' + id_this + '._' + col).checked == true) {
-        select_field.push('`' + id_this + '`.`' + col +'`');	
+        select_field.push('`' + id_this + '`.`' + col +'`');
         from_array.push(id_this);
     }
     else {
@@ -1107,9 +1107,9 @@ function store_column(id_this,owner,col) {
             }
         }
         for(k =0 ;k < from_array.length;k++){
-            if(from_array[k] == id_this){ 
-                from_array.splice(k,1); 
-			    break;
+            if(from_array[k] == id_this){
+                from_array.splice(k,1);
+                break;
             }
         }
      }
@@ -1119,13 +1119,13 @@ function store_column(id_this,owner,col) {
  * This function builds object and adds them to history_array
  * first it does a few checks on each object, then makes an object(where,rename,groupby,aggregate,orderby)
  * then a new history object is made and finally all these history objects are addded to history_array[]
- * 
- * @uses	where()
- * @uses	history()
- * @uses	aggregate()
- * @uses	rename()
- * @uses	panel()
- * @uses	display()
+ *
+ * @uses where()
+ * @uses history()
+ * @uses aggregate()
+ * @uses rename()
+ * @uses panel()
+ * @uses display()
 **/
 
 function add_object() {
@@ -1151,18 +1151,18 @@ function add_object() {
         sum = sum + 1;
         document.getElementById('new_name').value = "" ;
     }
-	if (document.getElementById('operator').value != '---') {
+    if (document.getElementById('operator').value != '---') {
         var aggregate_obj = new aggregate(document.getElementById('operator').value) ;
         history_array.push(new history(col_name,aggregate_obj,tab_name,h_tabs[downer + '.' + tab_name],"Aggregate"));
         sum = sum + 1;
         document.getElementById('operator').value = '---';
-		//make aggregate operator
+        //make aggregate operator
     }
     if (document.getElementById('groupby').checked == true ) {
         history_array.push(new history(col_name,'GroupBy',tab_name,h_tabs[downer + '.' +tab_name],"GroupBy"));
         sum = sum + 1;
         document.getElementById('groupby').checked = false;
-	//make groupby
+        //make groupby
     }
     if (document.getElementById('h_rel_opt').value != '--') {
         if (document.getElementById('having').value == "") {
@@ -1182,11 +1182,11 @@ function add_object() {
         history_array.push(new history(col_name,'OrderBy',tab_name,h_tabs[downer + '.' + tab_name],"OrderBy"));
         sum = sum + 1;
         document.getElementById('orderby').checked = false;
-		//make orderby
+        //make orderby
     }
     document.getElementById('hint').innerHTML = sum + "object created" ;
     document.getElementById('hint').style.visibility = "visible";
-	//output sum new objects created
+    //output sum new objects created
     var existingDiv = document.getElementById('ab');
     existingDiv.innerHTML = display(init,history_array.length);
     Close_option();
diff --git a/po/de.po b/po/de.po
index 5314c01011..2da471ebae 100644
--- a/po/de.po
+++ b/po/de.po
@@ -4,13 +4,13 @@ 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-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-25 14:55+0200\n"
+"PO-Revision-Date: 2011-08-01 20:57+0200\n"
 "Last-Translator: Sven Strickroth <email@cs-ware.de>\n"
 "Language-Team: german <de@li.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -1209,7 +1209,6 @@ msgid "Pause monitor"
 msgstr "Überwachung pausieren"
 
 #: js/messages.php:114
-#, fuzzy
 #| msgid "general_log and slow_query_log is enabled."
 msgid "general_log and slow_query_log are enabled."
 msgstr "general_log und slow_query_log sind aktiviert."
@@ -1223,7 +1222,6 @@ msgid "slow_query_log is enabled."
 msgstr "slow_query_log ist aktiviert."
 
 #: js/messages.php:117
-#, fuzzy
 #| msgid "slow_query_log and general_log is disabled."
 msgid "slow_query_log and general_log are disabled."
 msgstr "slow_query_log und general_log sind deaktiviert."
@@ -1328,7 +1326,6 @@ msgid "Analysing & loading logs. This may take a while."
 msgstr "Analysiere und Lade Protokolle. Dies kann eine Weile dauern."
 
 #: js/messages.php:143
-#, fuzzy
 #| msgid ""
 #| "This columns shows the amount of identical queries that are grouped "
 #| "together. However only the SQL Text is being compared, thus the queries "
@@ -1339,7 +1336,7 @@ msgid ""
 "the other attributes of queries, such as start time, may differ."
 msgstr ""
 "Diese Spalte zeigt die Anzahl der identischen Abfragen an, die gruppiert "
-"wurden. Dennoch wird nur der SQL-Text verglichen, daher kann die Angabe von "
+"wurden. Jedoch wird nur der SQL-Text verglichen, daher kann die Angabe von "
 "anderen Werten der Abfrage, wie die Startzeit, unterschiedlich sein."
 
 #: js/messages.php:144
@@ -1362,16 +1359,14 @@ msgid "Jump to Log table"
 msgstr "Springe zur Protokoll-Tabelle"
 
 #: js/messages.php:148
-#, fuzzy
 #| msgid "Log analysed, but not data found in this time span."
 msgid "Log analysed, but no data found in this time span."
 msgstr ""
-"Protokoll wurde analysiert, es wurden jedoch keine Daten im angegebenen "
-"Zeitraum gefunden."
+"Das Protokoll wurde analysiert, es wurden jedoch keine Daten für den "
+"angegebenen Zeitraum gefunden."
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
-#, fuzzy
 #| msgid "Filter"
 msgid "Filters"
 msgstr "Filter"
@@ -1383,23 +1378,21 @@ msgstr "Filter"
 
 #: js/messages.php:154
 msgid "Filter queries by word/regexp:"
-msgstr ""
+msgstr "Filte die Abfragen durch Wort / Regulären Ausdruck:"
 
 #: js/messages.php:155
 msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr ""
+msgstr "Gruppiere die Abfragen und ignoriere Werte in WHERE-Abfragen"
 
 #: js/messages.php:156
-#, fuzzy
 #| msgid "Number of inserted rows"
 msgid "Sum of grouped rows:"
-msgstr "Anzahl der eingefügten Datensätze"
+msgstr "Anzahl der gruppierten Datensätze"
 
 #: js/messages.php:157
-#, fuzzy
 #| msgid "Total"
 msgid "Total:"
-msgstr "Insgesamt"
+msgstr "Insgesamt:"
 
 #: js/messages.php:161 libraries/tbl_properties.inc.php:780
 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -1541,10 +1534,9 @@ msgid "Change"
 msgstr "Bearbeiten"
 
 #: js/messages.php:208
-#, fuzzy
 #| msgid "Maximum execution time"
 msgid "Query execution time"
-msgstr "Maximale Ausführungszeit"
+msgstr "Ausführungszeit der Abfrage"
 
 #: js/messages.php:211
 msgid "Hide search criteria"
@@ -1560,10 +1552,9 @@ msgid "Ignore"
 msgstr "Ignorieren"
 
 #: js/messages.php:218
-#, fuzzy
 #| msgid "Add column"
 msgid "Add columns"
-msgstr "Spalte hinzufügen"
+msgstr "Spalten hinzufügen"
 
 #: js/messages.php:221
 msgid "Select referenced key"
@@ -6297,7 +6288,6 @@ msgstr ""
 "können Sie:"
 
 #: libraries/import.lib.php:1069
-#, fuzzy
 #| msgid "View a structure`s contents by clicking on its name"
 msgid "View a structure's contents by clicking on its name"
 msgstr "Zum Anzeigen einer Struktur einfach auf den Namen klicken"
@@ -6309,10 +6299,9 @@ msgstr ""
 "Zum Ändern der Einstellungen auf das entsprechende \"Optionen\" klicken"
 
 #: libraries/import.lib.php:1071
-#, fuzzy
 #| msgid "Edit its structure by following the \"Structure\" link"
 msgid "Edit structure by following the \"Structure\" link"
-msgstr "Zum Ändern der Struktur auf das entsprechenden \"Struktur\" klicken"
+msgstr "Zum Ändern der Struktur auf den entsprechenden \"Struktur\"-Link klicken"
 
 #: libraries/import.lib.php:1074
 msgid "Go to database"
@@ -10017,7 +10006,6 @@ msgid "Monitor Instructions"
 msgstr "Einführung zur Überwachung"
 
 #: server_status.php:1364
-#, fuzzy
 #| msgid ""
 #| "The phpMyAdmin Monitor can assist you in optimizing the server "
 #| "configuration and track down time intensive\n"
@@ -10034,14 +10022,13 @@ msgid ""
 "increases server load by up to 15%"
 msgstr ""
 "Die phpMyAdmin-Überwachung kann Sie bei der Server-Konfiguration, und auch "
-"beim Aufspühren von zeitintensiven Abfragen unterstützen. Für das Letztere "
+"beim Aufspühren von zeitintensiven Abfragen unterstützen. Für Letzteres "
 "müssen Sie log_output auf 'TABLE' stellen und entweder slow_query_log oder "
 "general_log aktivieren. Beachten Sie aber, dass das Aktivieren der "
 "general_log viele Daten produzieren und die Serverauslastung um bis zu 15% "
 "erhöhen kann."
 
 #: server_status.php:1371
-#, fuzzy
 #| msgid ""
 #| "<b>Using the monitor:</b><br/>\n"
 #| "        Ok, you are good to go! Once you click 'Start monitor' your "
@@ -10064,21 +10051,19 @@ msgid ""
 "will load statistics from the logs helping you find what caused the activity "
 "spike.</p>"
 msgstr ""
-"<b>Verwendung der Überwachung:</b><br />\n"
-"OK, Sie sind bereit zum Starten! Sobald Sie 'Überwachung starten' angeklickt "
-"haben, wird Ihr Browser in regelmäßigen Intervallen alle angezeigten "
-"Diagramme aktualisieren. Unter 'Einstellungen' können Sie Diagramme "
-"hinzufügen und das Aktualisierungsintervall ändern oder beliebige Diagramme "
-"entfernen, wenn Sie das Zahnrad-Icon des entsprechenden Schaubilds "
-"verwenden.\n"
-"<p>Wenn Sie eine plötzliche Spitze in der Aktivität feststellen, wählen Sie "
-"den entsprechenden Zeitraum in einem beliebigen Diagramm, indem Sie die\n"
-"linke Maustaste gedrückt halten und über das Schaubild ziehen. Dies wird "
-"Statistiken aus den Protokollen laden um Sie bei der Auffindung der \n"
+"<b>Verwendung der Überwachung:</b><br />OK, Sie sind bereit zum Starten! "
+"Sobald Sie 'Überwachung starten' angeklickt haben, wird Ihr Browser in "
+"regelmäßigen Intervallen alle angezeigten Diagramme aktualisieren. Unter "
+"'Einstellungen' können Sie Diagramme hinzufügen und das "
+"Aktualisierungsintervall ändern oder beliebige Diagramme entfernen, wenn Sie "
+"das Zahnrad-Icon des entsprechenden Schaubilds verwenden.<p>Wenn Sie eine "
+"plötzliche Spitze in der Aktivität feststellen, wählen Sie den "
+"entsprechenden Zeitraum in einem beliebigen Diagramm, indem Sie die linke "
+"Maustaste gedrückt halten und über das Schaubild ziehen. Dies wird "
+"Statistiken aus den Protokollen laden um Sie bei der Auffindung der "
 "Aktivitätsspitze zu unterstützen.</p>"
 
 #: server_status.php:1375
-#, fuzzy
 #| msgid ""
 #| "<b>Please note:</b>\n"
 #| "        Enabling the general_log may increase the server load by 5-15%. "
@@ -10094,12 +10079,10 @@ msgid ""
 "disable the general_log and empty its table once monitoring is not required "
 "any more."
 msgstr ""
-"<b>Bitte beachten Sie:</b>\n"
-"Das Aktivieren des general_log kann die Serverlast um 5-15% steigern. Seien "
-"Sie sich bewusst, dass das Erzeugen von Statistiken aus den Logs ein \n"
-"sehr aufwändiger Prozess ist. Deshalb ist es ratsam, nur einen kleinen "
-"Zeitraum auszuwählen.\n"
-"        "
+"<b>Bitte beachten Sie:</b> Das Aktivieren des general_log kann die "
+"Serverlast um 5-15% steigern. Seien Sie sich bewusst, dass das Erzeugen von "
+"Statistiken aus den Logs ein sehr aufwändiger Prozess ist. Deshalb ist es "
+"ratsam, nur einen kleinen Zeitraum auszuwählen."
 
 #: server_status.php:1385
 msgid "CPU Usage"
@@ -10167,11 +10150,12 @@ msgstr "Ausgewählte Zeit-Spanne:"
 
 #: server_status.php:1454
 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements"
-msgstr ""
+msgstr "Rufe nur SELECT, INSERT, UPDATE und DELETE Abfragen ab"
 
 #: server_status.php:1459
 msgid "Remove variable data in INSERT statements for better grouping"
 msgstr ""
+"Lösche Variablen-Werte in INSERT Abfragen um die Gruppierung zu verbessern"
 
 #: server_status.php:1462
 msgid ""
@@ -10182,10 +10166,9 @@ msgstr ""
 "sollen</p> Ergebnisse sind nach Abfrage-Text zusammengefasst."
 
 #: server_status.php:1465
-#, fuzzy
 #| msgid "Query type"
 msgid "Query analyzer"
-msgstr "Abfrageart"
+msgstr "Query Analyzer"
 
 #: server_status.php:1501
 #, php-format
diff --git a/po/el.po b/po/el.po
index 1e78b7a68a..efb163159a 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-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-26 18:41+0200\n"
+"PO-Revision-Date: 2011-07-29 14:17+0200\n"
 "Last-Translator: Panagiotis Papazoglou <papaz_p@yahoo.com>\n"
 "Language-Team: greek <el@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -105,7 +105,7 @@ 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"
@@ -117,8 +117,8 @@ msgid ""
 "The %s file is not available on this system, please visit www.phpmyadmin.net "
 "for more information."
 msgstr ""
-"Το αρχείο %s δεν είναι διαθέσιμο σε αυτό το σύστημα. Eπισκεφτείτε το www."
-"phpmyadmin.net για περισσότερες πληροφορίες."
+"Το αρχείο %s δεν είναι διαθέσιμο σε αυτό το σύστημα, για αυτό επισκεφτείτε "
+"το www.phpmyadmin.net για περισσότερες πληροφορίες."
 
 #: db_create.php:58
 #, php-format
@@ -133,7 +133,7 @@ msgstr "Σχόλιο βάσης: "
 #: libraries/tbl_properties.inc.php:717 tbl_operations.php:371
 #: tbl_printview.php:127
 msgid "Table comments"
-msgstr "Σχόλια Πίνακα"
+msgstr "Σχόλια πίνακα"
 
 #: db_datadict.php:166 db_qbe.php:196 libraries/Index.class.php:436
 #: libraries/export/htmlword.php:251 libraries/export/latex.php:361
@@ -246,12 +246,12 @@ msgstr "Εκτύπωση"
 
 #: db_export.php:26
 msgid "View dump (schema) of database"
-msgstr "Εμφάνιση σχήματος της βάσης δεδομένων"
+msgstr "Εμφάνιση σκαριφήματος (σχήματος) της βάσης δεδομένων"
 
 #: db_export.php:30 db_printview.php:94 db_qbe.php:101 db_tracking.php:48
 #: export.php:374 navigation.php:296
 msgid "No tables found in database."
-msgstr "Δεν βρέθηκαν Πίνακες στη βάση δεδομένων."
+msgstr "Δεν βρέθηκαν πίνακες στη βάση δεδομένων."
 
 #: db_export.php:40 db_search.php:317 server_export.php:26
 msgid "Select All"
@@ -310,7 +310,7 @@ msgstr "Μόνο τα δεδομένα"
 
 #: db_operations.php:490
 msgid "CREATE DATABASE before copying"
-msgstr "ΔΗΜΙΟΥΡΓΙΑ ΒΑΣΗΣ ΔΕΔΟΜΕΝΩΝ πριν την αντιγραφή"
+msgstr "CREATE DATABASE πριν την αντιγραφή"
 
 #: db_operations.php:493 libraries/config/messages.inc.php:126
 #: libraries/config/messages.inc.php:127 libraries/config/messages.inc.php:129
@@ -408,8 +408,8 @@ msgstr "Tελευταίος έλεγχος"
 #, php-format
 msgid "%s table"
 msgid_plural "%s tables"
-msgstr[0] "%s Πίνακας"
-msgstr[1] "%s Πίνακες"
+msgstr[0] "%s πίνακας"
+msgstr[1] "%s πίνακες"
 
 #: db_qbe.php:41
 msgid "You have to choose at least one column to display"
@@ -457,7 +457,7 @@ msgstr "Εισαγωγή"
 
 #: db_qbe.php:379 db_qbe.php:461 db_qbe.php:546 db_qbe.php:577
 msgid "And"
-msgstr "Και"
+msgstr "Τομή"
 
 #: db_qbe.php:388 db_qbe.php:469 db_qbe.php:551 db_qbe.php:582
 msgid "Del"
@@ -467,7 +467,7 @@ msgstr "Διαγραφή"
 #: server_privileges.php:393 tbl_change.php:890 tbl_indexes.php:264
 #: tbl_select.php:279
 msgid "Or"
-msgstr "Ή"
+msgstr "Ενωση"
 
 #: db_qbe.php:529
 msgid "Modify"
@@ -503,7 +503,7 @@ msgstr "Υποβολή ερωτήματος"
 #: 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 "Άρνηση Πρόσβασης"
+msgstr "Άρνηση πρόσβασης"
 
 #: db_search.php:42 db_search.php:284
 msgid "at least one of the words"
@@ -589,12 +589,12 @@ msgstr "Εσωτερικό πεδίο:"
 
 #: db_structure.php:61
 msgid "No tables found in database"
-msgstr "Δεν βρέθηκαν Πίνακες στη βάση δεδομένων."
+msgstr "Δεν βρέθηκαν πίνακες στη βάση δεδομένων"
 
 #: db_structure.php:271 tbl_operations.php:697
 #, php-format
 msgid "Table %s has been emptied"
-msgstr "Ο Πίνακας %s άδειασε"
+msgstr "Ο πίνακας %s άδειασε"
 
 #: db_structure.php:280 tbl_operations.php:714
 #, php-format
@@ -604,7 +604,7 @@ msgstr "Η προβολή %s διαγράφτηκε"
 #: db_structure.php:280 tbl_operations.php:714
 #, php-format
 msgid "Table %s has been dropped"
-msgstr "Ο Πίνακας %s διεγράφη"
+msgstr "Ο πίνακας %s διεγράφη"
 
 #: db_structure.php:287 tbl_create.php:269
 msgid "Tracking is active."
@@ -702,7 +702,7 @@ msgstr "Έλεγχος πίνακα"
 #: db_structure.php:509 tbl_operations.php:662 tbl_structure.php:842
 #: tbl_structure.php:844
 msgid "Optimize table"
-msgstr "Βελτιστοποίηση Πίνακα"
+msgstr "Βελτιστοποίηση πίνακα"
 
 #: db_structure.php:511 tbl_operations.php:649
 msgid "Repair table"
@@ -710,7 +710,7 @@ msgstr "Επιδιόρθωση πίνακα"
 
 #: db_structure.php:513 tbl_operations.php:636
 msgid "Analyze table"
-msgstr "Ανάλυση Πίνακα"
+msgstr "Ανάλυση πίνακα"
 
 #: db_structure.php:515
 msgid "Add prefix to table"
@@ -843,8 +843,8 @@ msgstr "Δεν υπάρχει διαθέσιμος χώρος για την απ
 msgid ""
 "File %s already exists on server, change filename or check overwrite option."
 msgstr ""
-"Το αρχείο %s υπάρχει ήδη στον διακομιστή. Επιλέξτε διαφορετικό όνομα αρχείου "
-"ή ενεργοποιήστε την επιλογή αντικατάστασης."
+"Το αρχείο %s υπάρχει ήδη στον διακομιστή, για αυτό επιλέξτε διαφορετικό "
+"όνομα αρχείου ή ενεργοποιήστε την επιλογή αντικατάστασης."
 
 #: export.php:314 export.php:318
 #, php-format
@@ -890,12 +890,13 @@ msgid ""
 msgstr ""
 "Δεν ελήφθησαν δεδομένα για εισαγωγή. Είτε δεν υποβλήθηκε αρχείο είτε το "
 "μέγεθος του αρχείου υπερβαίνει το μέγιστο επιτρεπτό μέγεθος από τη ρύθμιση "
-"της ΡΗΡ. Δείτε τις [a@./Documentation.html#faq1_16@Documentation]ΣΑΕ 1.16[/"
-"a]."
+"της ΡΗΡ. Δείτε τις [a@./Documentation.html#faq1_16@Documentation]ΣΑΕ "
+"1.16[/a]."
 
 #: import.php:370 libraries/display_import.lib.php:23
 msgid "Could not load import plugins, please check your installation!"
-msgstr "Αδύνατη η φόρτωση προσθέτων εισαγωγής. Ελέξτε την εγκατάστασή σας!"
+msgstr ""
+"Αδύνατη η φόρτωση προσθέτων εισαγωγής, για αυτό ελέξτε την εγκατάστασή σας!"
 
 #: import.php:395
 msgid "The bookmark has been deleted."
@@ -920,7 +921,7 @@ msgid ""
 "Script timeout passed, if you want to finish import, please resubmit same "
 "file and import will resume."
 msgstr ""
-"Το χρονικό όριο του κώδικα εξαντλήθηκε. Αν θέλετε να τελειώσετε την "
+"Το χρονικό όριο του κώδικα εξαντλήθηκε, οπότε αν θέλετε να τελειώσετε την "
 "εισαγωγή, επανυποβάλτε το ίδιο αρχείο και η εισαγωγή θα συνεχίσει."
 
 #: import.php:424
@@ -947,8 +948,8 @@ msgstr "Επιστροφή"
 #: index.php:164
 msgid "phpMyAdmin is more friendly with a <b>frames-capable</b> browser."
 msgstr ""
-"Το phpMyAdmin είναι πιο φιλικό με έναν φυλλομετρητή <b>που υποστηρίζει "
-"πλαίσια (frames)</b>."
+"Το phpMyAdmin είναι πιο φιλικό με έναν <b>που υποστηρίζει frames</b> "
+"φυλλομετρητή."
 
 #: js/messages.php:27 server_synchronize.php:340 server_synchronize.php:352
 #: server_synchronize.php:368 server_synchronize.php:375
@@ -971,15 +972,15 @@ msgstr "Θέλετε να εκτελέσετε την εντολή "
 
 #: js/messages.php:33 libraries/mult_submits.inc.php:282 sql.php:304
 msgid "You are about to DESTROY a complete database!"
-msgstr "Πρόκειται να ΚΑΤΑΣΤΡΕΨΕΤΕ (DESTROY) μια ολόκληρη βάση δεδομένων!"
+msgstr "Πρόκειται να DESTROY μια ολόκληρη βάση δεδομένων!"
 
 #: js/messages.php:34
 msgid "You are about to DESTROY a complete table!"
-msgstr "Πρόκειται να ΚΑΤΑΣΤΡΕΨΕΤΕ (DESTROY) έναν ολόκληρο πίνακα!"
+msgstr "Πρόκειται να DESTROY έναν ολόκληρο πίνακα!"
 
 #: js/messages.php:35
 msgid "You are about to TRUNCATE a complete table!"
-msgstr "Πρόκειται να ΑΔΕΙΑΣΕΤΕ (TRUNCATE) έναν ολόκληρο πίνακα!"
+msgstr "Πρόκειται να TRUNCATE έναν ολόκληρο πίνακα!"
 
 #: js/messages.php:37
 msgid "Deleting tracking data"
@@ -995,7 +996,7 @@ msgstr "Αυτή η διαδικασία ίσως κρατήσει αρκετά.
 
 #: js/messages.php:42
 msgid "You are about to DISABLE a BLOB Repository!"
-msgstr "Πρόκειτε να ΑΠΕΝΕΡΓΟΠΟΙΉΣΕΤΕ μια Αποθήκη BLOB!"
+msgstr "Πρόκειτε να DISABLE μια Αποθήκη BLOB!"
 
 #: js/messages.php:43
 #, php-format
@@ -1005,7 +1006,7 @@ msgstr ""
 
 #: js/messages.php:46
 msgid "Missing value in the form!"
-msgstr "Ελλειπής τιμή στο πεδίο !"
+msgstr "Η τιμή δεν υπάρχει στη φόρμα!"
 
 #: js/messages.php:47
 msgid "This is not a number!"
@@ -1018,7 +1019,7 @@ msgstr "Συνολικό πλήθος"
 
 #: js/messages.php:54
 msgid "The host name is empty!"
-msgstr "Το όνομα του Συστήματος είναι κενό!"
+msgstr "Το όνομα του συστήματος είναι κενό!"
 
 #: js/messages.php:55
 msgid "The user name is empty!"
@@ -1026,7 +1027,7 @@ msgstr "Το όνομα του χρήστη είναι κενό!"
 
 #: js/messages.php:56 server_privileges.php:1307 user_password.php:50
 msgid "The password is empty!"
-msgstr "Ο Κωδικός Πρόσβασης είναι κενός!"
+msgstr "Ο κωδικός πρόσβασης είναι κενός!"
 
 #: js/messages.php:57 server_privileges.php:1305 user_password.php:53
 msgid "The passwords aren't the same!"
@@ -1091,12 +1092,12 @@ msgstr "Άλλα"
 #. l10n: Thousands separator
 #: js/messages.php:76 libraries/common.lib.php:1314
 msgid ","
-msgstr "."
+msgstr ","
 
 #. l10n: Decimal separator
 #: js/messages.php:78 libraries/common.lib.php:1316
 msgid "."
-msgstr ","
+msgstr "."
 
 #: js/messages.php:80
 msgid "KiB sent since last refresh"
@@ -1138,7 +1139,7 @@ msgstr "Στατιστικά ερωτήματος"
 
 #: js/messages.php:94
 msgid "System CPU Usage"
-msgstr "Χρήση Επεξεργαστή Συστήματος"
+msgstr "Χρήση CPU Συστήματος"
 
 #: js/messages.php:95
 msgid "System memory"
@@ -1163,7 +1164,7 @@ msgstr "Μέσο φορτίο"
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:102
 msgid "Questions"
-msgstr "Ερωτήσεις:"
+msgstr "Ερωτήσεις"
 
 #: js/messages.php:103 server_status.php:894
 msgid "Traffic"
@@ -1244,7 +1245,7 @@ msgstr ""
 #: js/messages.php:121
 #, php-format
 msgid "long_query_time is set to %d second(s)."
-msgstr "Το long_query_time έχει οριστεί στο(α) %d δευτερόλεπτο(α).."
+msgstr "Το long_query_time έχει οριστεί σε %d δευτερόλεπτο(α)."
 
 #: js/messages.php:122
 msgid ""
@@ -1349,7 +1350,7 @@ msgstr ""
 msgid "Log data loaded. Queries executed in this time span:"
 msgstr ""
 "Τα δεδομένα καταγραφής φορτώθηκαν. Τα ερωτήματα που εκτελέστηκαν σε αυτή την "
-"επέκταση χρόνου."
+"επέκταση χρόνου:"
 
 #: js/messages.php:147
 msgid "Jump to Log table"
@@ -1385,7 +1386,7 @@ msgstr ""
 
 #: js/messages.php:156
 msgid "Sum of grouped rows:"
-msgstr "Άθροισμα ομαδοποιημένων γραμμών"
+msgstr "Άθροισμα ομαδοποιημένων γραμμών:"
 
 #: js/messages.php:157
 msgid "Total:"
@@ -1493,11 +1494,11 @@ msgstr "Σημείωση: Αν το αρχείο περιέχει πολλούς
 
 #: js/messages.php:200
 msgid "Hide query box"
-msgstr "Απόκρυψη παραθύρου ερωτήματος SQL"
+msgstr "Απόκρυψη παραθύρου ερωτήματος"
 
 #: js/messages.php:201
 msgid "Show query box"
-msgstr "Προβολή παραθύρου ερωτήματος SQL"
+msgstr "Προβολή παραθύρου ερωτήματος"
 
 #: js/messages.php:202
 msgid "Inline Edit"
@@ -1577,7 +1578,7 @@ msgstr "Προσθήκη επιλογής για τη στήλη "
 
 #: js/messages.php:231
 msgid "Generate password"
-msgstr "Δημιουργία Κωδικού Πρόσβασης"
+msgstr "Δημιουργία κωδικού πρόσβασης"
 
 #: js/messages.php:232 libraries/replication_gui.lib.php:364
 msgid "Generate"
@@ -1603,7 +1604,7 @@ msgstr ""
 #. l10n: Latest available phpMyAdmin version
 #: js/messages.php:241
 msgid ", latest stable version:"
-msgstr ". τελευταία έκδοση:"
+msgstr ", τελευταία έκδοση:"
 
 #: js/messages.php:242
 msgid "up to date"
@@ -1969,7 +1970,7 @@ msgstr ""
 #: libraries/server_links.inc.php:43 server_databases.php:99
 #: server_privileges.php:1826
 msgid "Databases"
-msgstr "Βάσεις Δεδομένων"
+msgstr "Βάσεις δεδομένων"
 
 #: libraries/Message.class.php:193 libraries/blobstreaming.lib.php:303
 #: libraries/blobstreaming.lib.php:309 libraries/common.lib.php:531
@@ -2049,11 +2050,11 @@ msgstr "Σφάλμα μετονομασίας του πίνακα %1$s σε %2$s
 #: libraries/Table.class.php:1146
 #, php-format
 msgid "Table %s has been renamed to %s"
-msgstr "Ο Πίνακας %s μετονομάσθηκε σε %s"
+msgstr "Ο πίνακας %s μετονομάσθηκε σε %s"
 
 #: libraries/Table.class.php:1274
 msgid "Could not save table UI preferences"
-msgstr "Αδύνατη η αποθήκευση των ρυθμίσεων πίνακα για το περιβάλλον χρήστη"
+msgstr "Αδύνατη η αποθήκευση του πίανακα ρυθμίσεων UI"
 
 #: libraries/Theme.class.php:143
 #, php-format
@@ -2139,7 +2140,7 @@ msgstr ""
 
 #: libraries/auth/cookie.auth.lib.php:211
 msgid "Server:"
-msgstr "Διακομιστής"
+msgstr "Διακομιστής:"
 
 #: libraries/auth/cookie.auth.lib.php:216
 msgid "Username:"
@@ -2170,7 +2171,8 @@ msgstr ""
 #, php-format
 msgid "No activity within %s seconds; please log in again"
 msgstr ""
-"Καμιά δραστηριότητα εδώ και %s δευτερόλεπτα τουλάχιστον. Ξανασυνδεθείτε"
+"Καμιά δραστηριότητα εδώ και %s δευτερόλεπτα τουλάχιστον, για αυτό "
+"ξανασυνδεθείτε"
 
 #: libraries/auth/cookie.auth.lib.php:578
 #: libraries/auth/cookie.auth.lib.php:580
@@ -2210,7 +2212,7 @@ msgstr "Σφάλμα PBMS"
 
 #: libraries/blobstreaming.lib.php:262
 msgid "PBMS connection failed:"
-msgstr "Η σύνδεση PBMS απέτυχε"
+msgstr "Η σύνδεση PBMS απέτυχε:"
 
 #: libraries/blobstreaming.lib.php:307
 msgid "PBMS get BLOB info failed:"
@@ -2299,8 +2301,8 @@ msgid ""
 "This usually means there is a syntax error in it, please check any errors "
 "shown below."
 msgstr ""
-"Αυτό σημαίνει, συνήθως, ότι υπάρχει συντακτικό λάθος. Ελέγξτε τα σφάλματα "
-"που εμφανίζονται παρακάτω."
+"Αυτό σημαίνει, συνήθως, ότι υπάρχει συντακτικό λάθος, για αυτό ελέγξτε τα "
+"σφάλματα που εμφανίζονται παρακάτω."
 
 #: libraries/common.inc.php:596
 #, php-format
@@ -2396,7 +2398,7 @@ msgstr "Η MySQL επέστρεψε το μήνυμα: "
 
 #: libraries/common.lib.php:1024
 msgid "Failed to connect to SQL validator!"
-msgstr "Αδύνατη η σύνδεση στο εγκυροποιητή SQL"
+msgstr "Αδύνατη η σύνδεση στο εγκυροποιητή SQL!"
 
 #: libraries/common.lib.php:1065 libraries/config/messages.inc.php:474
 msgid "Explain SQL"
@@ -2499,7 +2501,8 @@ msgstr "Μεταπήδηση στην βάση «%s»."
 #: libraries/common.lib.php:2274
 #, php-format
 msgid "The %s functionality is affected by a known bug, see %s"
-msgstr "Η λειτουργία %s έχει επηρρεαστεί από ένα γνωστό σφάλμα. Δείτε %s"
+msgstr ""
+"Η λειτουργία %s έχει επηρρεαστεί από ένα γνωστό σφάλμα, για αυτό δείτε %s"
 
 #: libraries/common.lib.php:2427
 msgid "Click to toggle"
@@ -2620,11 +2623,11 @@ msgstr ""
 
 #: libraries/config.values.php:120
 msgid "complete inserts"
-msgstr "πλήρεις εντολές εισαγωγής (Insert)"
+msgstr "πλήρεις εντολές Insert"
 
 #: libraries/config.values.php:121
 msgid "extended inserts"
-msgstr "Εκτεταμένες εντολές εισαγωγής (Insert)"
+msgstr "εκτεταμένες εντολές Insert"
 
 #: libraries/config.values.php:122
 msgid "both of the above"
@@ -2698,7 +2701,7 @@ msgstr "Η επέκταση SOAP δεν βρέθηκε"
 #: libraries/config/FormDisplay.class.php:741
 #, php-format
 msgid "maximum %s"
-msgstr "Μέγιστος αριθμός %s"
+msgstr "μέγιστος αριθμός %s"
 
 #: libraries/config/FormDisplay.tpl.php:167
 msgid "This setting is disabled, it will not be applied to your configuration"
@@ -2757,13 +2760,12 @@ msgid ""
 "cross-frame scripting attacks"
 msgstr ""
 "Ενεργοποιώντας αυτό, επιτρέπει μια σελίδα που βρίσκεται σε άλλο διακομιστή "
-"να καλεί το phpMyAdmin μέσα σε ένα πλαίσιο (frame), κάτι που είναι [strong]"
-"τρύπα ασφαλείας[/strong] που επιτρέπει εισβολές στον κώδικα μέσω πλαισών "
-"(frames)"
+"να καλεί το phpMyAdmin μέσα σε ένα frame, κάτι που είναι [strong]τρύπα "
+"ασφαλείας[/strong] που επιτρέπει εισβολές στον κώδικα μέσω frames"
 
 #: libraries/config/messages.inc.php:22
 msgid "Allow third party framing"
-msgstr "Επιτρέπονται πλαίσια (frames) τρίτων"
+msgstr "Επιτρέπονται frames τρίτων"
 
 #: libraries/config/messages.inc.php:23
 msgid "Show &quot;Drop database&quot; link to normal users"
@@ -2829,7 +2831,7 @@ msgstr "Αριθμός στηλών για περιοχές κειμένου CHA
 
 #: libraries/config/messages.inc.php:35
 msgid "CHAR textarea columns"
-msgstr "Στήλες περιοχής κειμένου (textarea) CHAR"
+msgstr "Στήλες textarea για CHAR"
 
 #: libraries/config/messages.inc.php:36
 msgid "Number of rows for CHAR/VARCHAR textareas"
@@ -2837,7 +2839,7 @@ msgstr "Αριθμός γραμμών για περιοχές κειμένου C
 
 #: libraries/config/messages.inc.php:37
 msgid "CHAR textarea rows"
-msgstr "Γραμμές περιοχής κειμένου (textarea) CHAR"
+msgstr "Γραμμές textarea για CHAR"
 
 #: libraries/config/messages.inc.php:38
 msgid "Check config file permissions"
@@ -2848,8 +2850,8 @@ msgid ""
 "Compress gzip/bzip2 exports on the fly without the need for much memory; if "
 "you encounter problems with created gzip/bzip2 files disable this feature"
 msgstr ""
-"Η συμπίεση gzip/bzip2 εξάγει άμεσα χωρίς την ανάγκη για πολύ μνήμη. Αν "
-"παρουσιάστηκαν προβλήματα με τα δημιουργηθέντα αρχεία gzip/bzip2 "
+"Η συμπίεση gzip/bzip2 εξάγει άμεσα χωρίς την ανάγκη για πολύ μνήμη, για αυτό "
+"αν παρουσιάστηκαν προβλήματα με τα δημιουργηθέντα αρχεία gzip/bzip2 "
 "απενεργοποιήστε αυτό το χαρακτηριστικό"
 
 #: libraries/config/messages.inc.php:40
@@ -2871,7 +2873,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:43
 msgid "Confirm DROP queries"
-msgstr "Επιβεβαίωση ερωτημάτων ΔΙΑΓΡΑΦΗΣ (DROP)"
+msgstr "Επιβεβαίωση ερωτημάτων DROP"
 
 #: libraries/config/messages.inc.php:44
 msgid "Debug SQL"
@@ -3029,7 +3031,7 @@ msgstr "Στήλες που περικλείονται από"
 #: libraries/config/messages.inc.php:249 libraries/import/csv.php:81
 #: libraries/import/ldi.php:43
 msgid "Columns escaped by"
-msgstr "Τα πεδία χρησιμοποιούν το χαρακτήρα διαφυγής "
+msgstr "Τα πεδία χρησιμοποιούν το χαρακτήρα διαφυγής"
 
 #: libraries/config/messages.inc.php:77 libraries/config/messages.inc.php:83
 #: libraries/config/messages.inc.php:90 libraries/config/messages.inc.php:99
@@ -3118,7 +3120,7 @@ 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
 msgid "Overwrite existing file(s)"
-msgstr "Αντικατάσταση υπαρχόντων αρχείων"
+msgstr "Αντικατάσταση αρχείου(ων)"
 
 #: libraries/config/messages.inc.php:118
 msgid "Remember file name template"
@@ -3126,7 +3128,7 @@ msgstr "Πρότυπο απομνημόνευσης ονοματος αρχεί
 
 #: libraries/config/messages.inc.php:120
 msgid "Enclose table and column names with backquotes"
-msgstr "Χρήση ανάποδων εισαγωγικών στα ονόματα των Πινάκων και των Στηλών"
+msgstr "Χρήση ανάποδων εισαγωγικών στα ονόματα των πινάκων και των στηλών"
 
 #: libraries/config/messages.inc.php:121 libraries/config/messages.inc.php:260
 #: libraries/display_export.lib.php:346
@@ -3135,7 +3137,7 @@ msgstr "Κατάσταση συμβατότητας SQL"
 
 #: libraries/config/messages.inc.php:122 libraries/export/sql.php:183
 msgid "<code>CREATE TABLE</code> options:"
-msgstr "Επιλογές <code>ΔΗΜΙΟΥΡΓΙΑΣ ΠΙΝΑΚΑ</code> (CREATE TABLE):"
+msgstr "Επιλογές <code>CREATE TABLE</code>:"
 
 #: libraries/config/messages.inc.php:123
 msgid "Creation/Update/Check dates"
@@ -3190,9 +3192,9 @@ msgid ""
 "Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is "
 "the referenced data, [kbd]id[/kbd] is the key value"
 msgstr ""
-"Ταξινόμηση για αντικείμενα σε αναδυόμενο μενού μη διακριτού κλειδιού "
-"(foreing key); [kbd]content[/kbd] είναι τα αναφερθέντα δεδομένα, [kbd]id[/"
-"kbd] είναι η τιμή κλειδιού"
+"Ταξινόμηση για αντικείμενα σε αναδυόμενο μενού foreing key; "
+"[kbd]content[/kbd] είναι τα αναφερθέντα δεδομένα, [kbd]id[/kbd] είναι η τιμή "
+"κλειδιού"
 
 #: libraries/config/messages.inc.php:151
 msgid "Foreign key dropdown order"
@@ -3282,7 +3284,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"
@@ -3327,7 +3329,7 @@ msgstr "Microsoft Excel"
 
 #: libraries/config/messages.inc.php:188
 msgid "Open Document"
-msgstr "Έγγραφο Κειμένου Ανοιχτού Κώδικα (ODΤ)"
+msgstr "Έγγραφο Κειμένου Ανοιχτού Κώδικα - ODΤ"
 
 #: libraries/config/messages.inc.php:190
 msgid "Other core settings"
@@ -3413,7 +3415,7 @@ msgid ""
 "storage[/a] in documentation"
 msgstr ""
 "Προσαρμογή βάσης δεδομένων phpMyAdmin για παροχή πρόσβασης σε πρόσθετα "
-"χαρακτηριστικά. Δείτε την [a@../Documentation.html#linked-tables]υποδομή "
+"χαρακτηριστικά. Δείτε την [a@Documentation.html#linked-tables]υποδομή "
 "συνδεδεμένων πινάκων[/a] στην τεκμηρίωση"
 
 #: libraries/config/messages.inc.php:206
@@ -3504,7 +3506,7 @@ msgstr "Προσαρμογή πεδίων εισαγωγής κειμένου"
 
 #: libraries/config/messages.inc.php:228 libraries/export/texytext.php:18
 msgid "Texy! text"
-msgstr "Κείμενο Texy!"
+msgstr "Κείμενο Texy"
 
 #: libraries/config/messages.inc.php:230
 msgid "Warnings"
@@ -3561,12 +3563,12 @@ msgstr "Μερική εισαγωγή: να επιτρέπεται η διακο
 #: libraries/config/messages.inc.php:243 libraries/config/messages.inc.php:250
 #: libraries/import/csv.php:27 libraries/import/ldi.php:40
 msgid "Do not abort on INSERT error"
-msgstr "Να μην γίνετια ακύρωση σε σφάλμα ΕΙΣΑΓΩΓΗΣ (INSERT)"
+msgstr "Να μην γίνετια ακύρωση σε σφάλμα INSERT"
 
 #: libraries/config/messages.inc.php:244 libraries/config/messages.inc.php:252
 #: libraries/import/csv.php:26 libraries/import/ldi.php:39
 msgid "Replace table data with file"
-msgstr "Αντικατάσταση δεδομένων Πίνακα με το αρχείο"
+msgstr "Αντικατάσταση δεδομένων πίνακα με το αρχείο"
 
 #: libraries/config/messages.inc.php:246
 msgid ""
@@ -3582,7 +3584,7 @@ msgstr "Μορφή εισαχθέντος αρχείου"
 
 #: libraries/config/messages.inc.php:251 libraries/import/ldi.php:46
 msgid "Use LOCAL keyword"
-msgstr "Χρήση ΤΟΠΙΚΗΣ λέξης-κλειδί"
+msgstr "Χρήση λέξης-κλειδί LOCAL"
 
 #: libraries/config/messages.inc.php:254 libraries/config/messages.inc.php:262
 #: libraries/config/messages.inc.php:263
@@ -3611,7 +3613,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"
@@ -3692,8 +3694,7 @@ msgstr "Διαχωριστικό δέντρου πινάκων"
 
 #: libraries/config/messages.inc.php:282
 msgid "URL where logo in the navigation frame will point to"
-msgstr ""
-"Ο Σϋνδεσμος (URL) όπου θα τοποιθετηθεί στο λογότυπο στο πλαίσιο πλοήγησης"
+msgstr "Ο Σϋνδεσμος URL όπου θα τοποιθετηθεί στο λογότυπο στο πλαίσιο πλοήγησης"
 
 #: libraries/config/messages.inc.php:283
 msgid "Logo link URL"
@@ -3754,11 +3755,10 @@ msgid ""
 "only occurs for the current server. Setting this to FALSE makes it easy to "
 "forget to log out from other servers when connected to multiple servers."
 msgstr ""
-"Αν οριστεί ως ΑΛΗΘΕΙΑ (TRUE), με την αποσύνδεση διαγράφονται τα cookies για "
-"όλους τους διακομιστές; όταν οριστεί ως ΨΕΥΔΟΣ (FALSE), η αποσύνδεση "
-"επηρεάζει μόνο τον τρέχοντα διακομιστή. Ορίζοντάς το σε ΨΕΥΔΟΣ είναι εύκολο "
-"να ξεχάσετε να αποσυνδεθείτε από άλλους διακομιστές όταν συνδέεστε σε "
-"πολλούς."
+"Αν οριστεί ως TRUE, με την αποσύνδεση διαγράφονται τα cookies για όλους τους "
+"διακομιστές; όταν οριστεί ως FALSE, η αποσύνδεση επηρεάζει μόνο τον "
+"τρέχοντα διακομιστή. Ορίζοντάς το σε FALSE είναι εύκολο να ξεχάσετε να "
+"αποσυνδεθείτε από άλλους διακομιστές όταν συνδέεστε σε πολλούς."
 
 #: libraries/config/messages.inc.php:295
 msgid "Delete all cookies on logout"
@@ -3783,7 +3783,7 @@ msgid ""
 "and will be deleted as soon as you close the browser window. This is "
 "recommended for non-trusted environments."
 msgstr ""
-"Ορίζει για πόσο χρόνο (σε δευτερόλεπτα) ένα cookie σύνδεσης πρέπει να να "
+"Ορίζει για πόσο χρόνο (σε δευτερόλεπτα) ένα cookie σύνδεσης πρέπει να "
 "αποθηκεύεται στο φυλλομετρητή. Η προεπιλογή 0 σημαίνει ότι θα κρατηθεί μόνο "
 "για την τρέχουσα συνεδρία και θα διαγραφεί μόλις κλείσετε τον φυλλομετρητή. "
 "Αυτό προτείνεται για μη αξιόπιστα περιβάλλοντα."
@@ -4128,8 +4128,8 @@ msgid ""
 "Leave blank for no column comments/mime types, suggested: [kbd]"
 "pma_column_info[/kbd]"
 msgstr ""
-"Αφήστε κενό για να μη υπάρχουν σχόλια/τύποι mime στις στήλες. Προτείνεται: "
-"[kbd]pma_column_info[/kbd]"
+"Αφήστε κενό για να μη υπάρχουν σχόλια/τύποι mime στις στήλες, σας "
+"προτείνεται: [kbd]pma_column_info[/kbd]"
 
 #: libraries/config/messages.inc.php:374
 msgid "Column information table"
@@ -4146,7 +4146,8 @@ msgstr "Σύνδεση συμπίεσης"
 #: libraries/config/messages.inc.php:377
 msgid "How to connect to server, keep [kbd]tcp[/kbd] if unsure"
 msgstr ""
-"Πως να συνδεθείτε στο διακομιστή, κρατήστε το tcp αν δεν είστε σίγουρος/η"
+"Πως να συνδεθείτε στο διακομιστή, κρατήστε το [kbd]tcp[/kbd] αν δεν είστε "
+"σίγουρος/η"
 
 #: libraries/config/messages.inc.php:378
 msgid "Connection type"
@@ -4260,11 +4261,11 @@ msgid ""
 "alphabetical order."
 msgstr ""
 "Μπορείτε να χρησιμοποιήσετε χαρακτήρες μπαλαντέρ MySQL (% και _), με ανάποδη "
-"κάθετο χρησιμοποιήστε τα ως κανονικούς χαρακτήρες, π.χ. χρησιμοποιήστε «my"
-"\\_db» και όχι «my_db». Με χρήση αυτής της επιλογής μπορείτε να ταξινομήσετε "
-"τις βάσεις δεδομένων, απλά εισάγωγοντας τα ονόματά τους σε σειρά και "
-"χρησιμοποιώντας το [kbd]*[/kbd] στο τέλος για να δείξετε τις υπόλοιπες σε "
-"αλφαβητική σειρά."
+"κάθετο χρησιμοποιήστε τα ως κανονικούς χαρακτήρες, π.χ. χρησιμοποιήστε "
+"[kbd]'my\\_db[/kbd]' και όχι [kbd]'my_db[/kbd]'. Με χρήση αυτής της επιλογής "
+"μπορείτε να ταξινομήσετε τις βάσεις δεδομένων, απλά εισάγοντας τα ονόματά "
+"τους σε σειρά και χρησιμοποιώντας το [kbd]*[/kbd] στο τέλος για να δείξετε "
+"τις υπόλοιπες σε αλφαβητική σειρά."
 
 #: libraries/config/messages.inc.php:400
 msgid "Show only listed databases"
@@ -4330,8 +4331,9 @@ msgid ""
 "Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links"
 "[/a] support, suggested: [kbd]pma_relation[/kbd]"
 msgstr ""
-"Αφήστε το κενό για να μην υπάρχει υποστήριξη [a@http://wiki.phpmyadmin.net/"
-"pma/relation]συνδέσμων-συσχετίσεων[/a]. Προτείνεται: [kbd]pma_relation[/kbd]"
+"Αφήστε το κενό για να μην υπάρχει υποστήριξη "
+"[a@http://wiki.phpmyadmin.net/pma/relation]συνδέσμων-συσχετίσεων[/a], σας "
+"προτείνεται: [kbd]pma_relation[/kbd]"
 
 #: libraries/config/messages.inc.php:412
 msgid "Relation table"
@@ -4395,8 +4397,8 @@ msgid ""
 "Table to describe the display columns, leave blank for no support; "
 "suggested: [kbd]pma_table_info[/kbd]"
 msgstr ""
-"Ο πίνακας που περιγράφει τις προβαλλόμενες στήλες. Αφήστε το κενό για να μην "
-"υποστηρίζεται. Προτείνεται: [kbd]pma_table_info[/kbd]"
+"Ο πίνακας που περιγράφει τις προβαλλόμενες στήλες - αφήστε το κενό για να "
+"μην υποστηρίζεται - προτείνεται: [kbd]pma_table_info[/kbd]"
 
 #: libraries/config/messages.inc.php:425
 msgid "Display columns table"
@@ -4412,7 +4414,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:427
 msgid "UI preferences table"
-msgstr "Πίνακας προτιμήσεων περιβάλλοντος χρήστη"
+msgstr "Πίνακας προτιμήσεων UI"
 
 #: libraries/config/messages.inc.php:428
 msgid ""
@@ -4424,7 +4426,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:429
 msgid "Add DROP DATABASE"
-msgstr "Προσθήκη ΔΙΑΓΡΑΦΗΣ ΒΑΣΗΣ ΔΕΔΟΜΕΝΩΝ (DROP DATABASE)"
+msgstr "Προσθήκη της εντολής DROP DATABASE"
 
 #: libraries/config/messages.inc.php:430
 msgid ""
@@ -4436,7 +4438,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:431
 msgid "Add DROP TABLE"
-msgstr "Προσθήκη ΔΙΑΓΡΑΦΗΣ ΠΙΝΑΚΑ (DROP TABLE)"
+msgstr "Προσθήκη DROP TABLE"
 
 #: libraries/config/messages.inc.php:432
 msgid ""
@@ -4448,7 +4450,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:433
 msgid "Add DROP VIEW"
-msgstr "Προσθήκη ΔΙΑΓΡΑΦΗΣ ΠΡΟΒΟΛΗΣ (DROP VIEW)"
+msgstr "Προσθήκη DROP VIEW"
 
 #: libraries/config/messages.inc.php:434
 msgid "Defines the list of statements the auto-creation uses for new versions."
@@ -4526,7 +4528,7 @@ msgstr "Φιλοχρηστικό όνομα διακομιστή"
 
 #: libraries/config/messages.inc.php:448
 msgid "Whether a user should be displayed a &quot;show all (rows)&quot; button"
-msgstr "Αν θα εμφανίζεται στο χρήστη ένα κουμπί «Εμφάνιση όλων»"
+msgstr "Αν θα εμφανίζεται στο χρήστη ένα κουμπί «εμφάνιση όλων (γραμμών)»"
 
 #: libraries/config/messages.inc.php:449
 msgid "Allow to display all the rows"
@@ -4540,7 +4542,7 @@ msgid ""
 msgstr ""
 "Σημειώστε ότι ενεργοποιώντας αυτή δεν έχει καμιά επίδραση στην κατάσταση "
 "επικύρωσης [kbd]ρύθμισης[/kbd] γιατί έχει πολύ κωδικοποίηση στο αρχείο "
-"ρυθμίσεων. Αυτό δεν περιορίζει τη δυνατότητα άμεσης εκτέλεσης της ίδιας "
+"ρυθμίσεων και αυτό δεν περιορίζει τη δυνατότητα άμεσης εκτέλεσης της ίδιας "
 "εντολής"
 
 #: libraries/config/messages.inc.php:451
@@ -4625,7 +4627,7 @@ msgid ""
 "comment and the real name"
 msgstr ""
 "Αν οι επεξηγήσεις είναι ενεργοποιημένες και έχει οριστεί σχόλιο για τη βάση "
-"δεδομένων, αυτή η επιλογή θα αντικαταστήσει το όνομα με το σχόλιο."
+"δεδομένων, αυτή η επιλογή θα αντικαταστήσει το όνομα με το σχόλιο"
 
 #: libraries/config/messages.inc.php:467
 msgid "Display database comment instead of its name"
@@ -4674,7 +4676,7 @@ msgstr "Απαιτεί την ενεργοποίηση του Εγκυροποι
 #: server_privileges.php:868 server_privileges.php:879
 #: server_privileges.php:1694 server_synchronize.php:1185
 msgid "Password"
-msgstr "Κωδικός Πρόσβασης"
+msgstr "Κωδικός πρόσβασης"
 
 #: libraries/config/messages.inc.php:480
 msgid ""
@@ -4732,7 +4734,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:489
 msgid "Textarea columns"
-msgstr "Στήλες περιοχής κειμένου (textarea)"
+msgstr "Στήλες textarea"
 
 #: libraries/config/messages.inc.php:490
 msgid ""
@@ -4745,7 +4747,7 @@ msgstr ""
 
 #: libraries/config/messages.inc.php:491
 msgid "Textarea rows"
-msgstr "Γραμμές περιοχής κειμένου (textarea)"
+msgstr "Γραμμές textarea"
 
 #: libraries/config/messages.inc.php:492
 msgid "Title of browser window when a database is selected"
@@ -4876,7 +4878,7 @@ msgstr "Σειρά επικύρωσης"
 #: libraries/config/setup.forms.php:245
 #: libraries/config/user_preferences.forms.php:147 libraries/import/ldi.php:35
 msgid "CSV using LOAD DATA"
-msgstr "CSV με χρήση ΦΟΡΤΩΣΗΣ ΔΕΔΟΜΕΝΩΝ (LOAD DATA)"
+msgstr "CSV με χρήση LOAD DATA"
 
 #: libraries/config/setup.forms.php:254 libraries/config/setup.forms.php:348
 #: libraries/config/user_preferences.forms.php:155
@@ -4897,7 +4899,7 @@ msgstr "Βιβλίο εργασίας Excel 2007 XLSX"
 #: libraries/config/user_preferences.forms.php:261 libraries/export/ods.php:18
 #: libraries/import/ods.php:22
 msgid "Open Document Spreadsheet"
-msgstr "Έγγραφο Λογιστικού Φύλλου Ανοιχτού Κώδικα (ODS)"
+msgstr "Έγγραφο Λογιστικού Φύλλου Ανοιχτού Κώδικα - ODS"
 
 #: libraries/config/setup.forms.php:267
 #: libraries/config/user_preferences.forms.php:168
@@ -4929,7 +4931,7 @@ msgstr "Έγγραφο Microsoft Word 2000"
 #: libraries/config/setup.forms.php:365
 #: libraries/config/user_preferences.forms.php:265 libraries/export/odt.php:22
 msgid "Open Document Text"
-msgstr "Έγγραφο Κειμένου Ανοιχτού Κώδικα (ODΤ)"
+msgstr "Έγγραφο Κειμένου Ανοιχτού Κώδικα - ODΤ"
 
 #: libraries/config/validate.lib.php:197 libraries/config/validate.lib.php:204
 msgid "Could not connect to MySQL server"
@@ -5098,7 +5100,8 @@ msgstr "Αριθμός στηλών"
 
 #: libraries/display_export.lib.php:35
 msgid "Could not load export plugins, please check your installation!"
-msgstr "Αδύνατη η φόρτωση προσθέτων εξαγωγής. Ελέξτε την εγκατάστασή σας!"
+msgstr ""
+"Αδύνατη η φόρτωση προσθέτων εξαγωγής, για αυτό εξέξτε την εγκατάστασή σας!"
 
 #: libraries/display_export.lib.php:80
 msgid "Exporting databases from the current server"
@@ -5116,7 +5119,7 @@ msgstr "Εξαγωγή εγγραφών από τον πίνακα «%s»"
 
 #: libraries/display_export.lib.php:90
 msgid "Export Method:"
-msgstr "Μέθοδος εξαγωγής"
+msgstr "Μέθοδος εξαγωγής:"
 
 #: libraries/display_export.lib.php:106
 msgid "Quick - display only the minimal options"
@@ -5128,23 +5131,23 @@ msgstr "Προσαρμογή - προβολή όλων των πιθανών ε
 
 #: libraries/display_export.lib.php:130
 msgid "Database(s):"
-msgstr "Βάση(εις) Δεδομένων"
+msgstr "Βάση(εις) δεδομένων:"
 
 #: libraries/display_export.lib.php:132
 msgid "Table(s):"
-msgstr "Πίνακας(ες)"
+msgstr "Πίνακας(ες):"
 
 #: libraries/display_export.lib.php:142
 msgid "Rows:"
-msgstr "Εγγραφές"
+msgstr "Εγγραφές:"
 
 #: libraries/display_export.lib.php:150
 msgid "Dump some row(s)"
-msgstr "Αχρήστευση μερικών εγγραφών"
+msgstr "Μετατροπή εγγραφής(ών)"
 
 #: libraries/display_export.lib.php:152
 msgid "Number of rows:"
-msgstr "Αριθμός εγγραφών"
+msgstr "Αριθμός εγγραφών:"
 
 #: libraries/display_export.lib.php:155
 msgid "Row to begin at:"
@@ -5152,7 +5155,7 @@ msgstr "Η εγγραφή θα ξεκινάει στο:"
 
 #: libraries/display_export.lib.php:166
 msgid "Dump all rows"
-msgstr "Αχρήστευση όλων των γραμμών"
+msgstr "Μετατροπή όλων των γραμμών"
 
 #: libraries/display_export.lib.php:174 libraries/display_export.lib.php:195
 msgid "Output:"
@@ -5169,7 +5172,7 @@ msgstr "Αποθήκευση εξαγόμενου σε αρχείο"
 
 #: libraries/display_export.lib.php:220
 msgid "File name template:"
-msgstr "Πρότυπο ονόματος αρχείου"
+msgstr "Πρότυπο ονόματος αρχείου:"
 
 #: libraries/display_export.lib.php:222
 msgid "@SERVER@ will become the server name"
@@ -5206,7 +5209,7 @@ msgstr "Σύνολο χαρακτήρων του αρχείου:"
 
 #: libraries/display_export.lib.php:304
 msgid "Compression:"
-msgstr "Συμπίεση"
+msgstr "Συμπίεση:"
 
 #: libraries/display_export.lib.php:308
 msgid "zipped"
@@ -5227,11 +5230,11 @@ msgstr "Προβολή εξαγόμενου ως κείμενο"
 #: libraries/display_export.lib.php:326 libraries/display_import.lib.php:244
 #: libraries/export/codegen.php:38
 msgid "Format:"
-msgstr "Μορφοποίηση"
+msgstr "Μορφοποίηση:"
 
 #: libraries/display_export.lib.php:331
 msgid "Format-specific options:"
-msgstr "Επιλογές Ορισμένης Μορφής:"
+msgstr "Επιλογές ορισμένης μορφής:"
 
 #: libraries/display_export.lib.php:332
 msgid ""
@@ -5243,7 +5246,7 @@ msgstr ""
 
 #: libraries/display_export.lib.php:340 libraries/display_import.lib.php:260
 msgid "Encoding Conversion:"
-msgstr "Μετατροπή κωδικοποίησης"
+msgstr "Μετατροπή κωδικοποίησης:"
 
 #: libraries/display_import.lib.php:66
 msgid ""
@@ -5283,7 +5286,7 @@ msgstr "Εισαγωγή στον πίνακα «%s»"
 
 #: libraries/display_import.lib.php:139
 msgid "File to Import:"
-msgstr "Αρχείο για εισαγωγή"
+msgstr "Αρχείο για εισαγωγή:"
 
 #: libraries/display_import.lib.php:156
 #, php-format
@@ -5304,7 +5307,7 @@ msgstr "Οι αποστολές αρχείων δεν επιτρέπονται 
 
 #: libraries/display_import.lib.php:208
 msgid "Partial Import:"
-msgstr "Μερική εισαγωγή"
+msgstr "Μερική εισαγωγή:"
 
 #: libraries/display_import.lib.php:214
 #, php-format
@@ -5321,15 +5324,13 @@ msgid ""
 "however it can break transactions.)</i>"
 msgstr ""
 "Να επιτρέπεται η διακοπή της εισαγωγής σε περίπτωση που ανιχνευτεί ότι η "
-"εφαρμογή του κώδικα προσεγγίζει το χρονικό όριο. <i>(Αυτό μπορεί να είναι "
-"καλό για εισαγωγή μεγάλων αρχείων, ωστόσο, μπορεί να κόψει τις μεταφορές."
-"Allow the interruption of an import in case the script detects it is close "
-"to the PHP timeout limit. <i>(This might be good way to import large files, "
-"however it can break transactions.)</i>"
+"εφαρμογή του κώδικα προσεγγίζει το χρονικό όριο PHP. <i>(Αυτό μπορεί να "
+"είναι καλό για εισαγωγή μεγάλων αρχείων, ωστόσο, μπορεί να κόψει τις "
+"μεταφορές.)</i>"
 
 #: libraries/display_import.lib.php:228
 msgid "Number of rows to skip, starting from the first row:"
-msgstr "Αριθμός εγγραφών που θα παραβλεφθούν από την αρχή"
+msgstr "Αριθμός εγγραφών που θα παραβλεφθούν από την αρχή:"
 
 #: libraries/display_import.lib.php:250
 msgid "Format-Specific Options:"
@@ -5358,7 +5359,7 @@ msgstr "Πατήστε για εναλλαγή επισήμανσης"
 
 #: libraries/display_tbl.lib.php:417
 msgid "Click the drop-down arrow<br />to toggle column's visibility"
-msgstr "Πατήστε το βέλος (προς τα κάτω)<br />για εναλλαγή της εμφάνισης στηλών"
+msgstr "Πατήστε το προς τα κάτω βέλος<br />για εναλλαγή της εμφάνισης στηλών"
 
 #: libraries/display_tbl.lib.php:428
 #, php-format
@@ -5464,7 +5465,7 @@ msgstr "Αντιγραφή"
 
 #: libraries/display_tbl.lib.php:1315 libraries/display_tbl.lib.php:1327
 msgid "The row has been deleted"
-msgstr "Η Εγγραφή έχει διαγραφεί"
+msgstr "Η εγγραφή έχει διαγραφεί"
 
 #: libraries/display_tbl.lib.php:1354 libraries/display_tbl.lib.php:2311
 #: server_status.php:1050
@@ -5477,7 +5478,7 @@ msgstr "στην εντολή"
 
 #: libraries/display_tbl.lib.php:2203
 msgid "Showing rows"
-msgstr "Εμφάνιση εγγραφών "
+msgstr "Εμφάνιση εγγραφών"
 
 #: libraries/display_tbl.lib.php:2213
 msgid "total"
@@ -5502,7 +5503,7 @@ msgstr "Εμφάνιση διαγράμματος"
 
 #: libraries/display_tbl.lib.php:2506
 msgid "Visualize GIS data"
-msgstr "Οπτικοποίηση δεδομένων ΓΠΣ"
+msgstr "Οπτικοποίηση δεδομένων GIS"
 
 #: libraries/display_tbl.lib.php:2526
 msgid "Create view"
@@ -5543,7 +5544,7 @@ msgstr ""
 
 #: libraries/engines/innodb.lib.php:32
 msgid "Buffer pool size"
-msgstr "Μέγεθος Buffer pool"
+msgstr "Μέγεθος buffer pool"
 
 #: libraries/engines/innodb.lib.php:33
 msgid ""
@@ -5981,34 +5982,34 @@ msgstr "Η Ιστοσελίδα του PrimeBase Media Streaming (PBMS)"
 
 #: libraries/export/csv.php:24 libraries/import/csv.php:28
 msgid "Columns separated with:"
-msgstr "Στήλες που χωρίζονται με"
+msgstr "Στήλες που χωρίζονται με:"
 
 #: libraries/export/csv.php:25 libraries/import/csv.php:29
 msgid "Columns enclosed with:"
-msgstr "Στήλες που περικλείονται με"
+msgstr "Στήλες που περικλείονται με:"
 
 #: libraries/export/csv.php:26 libraries/import/csv.php:30
 msgid "Columns escaped with:"
-msgstr "Τα πεδία χρησιμοποιούν το χαρακτήρα διαφυγής: "
+msgstr "Τα πεδία χρησιμοποιούν το χαρακτήρα διαφυγής:"
 
 #: libraries/export/csv.php:27 libraries/import/csv.php:31
 msgid "Lines terminated with:"
-msgstr "Γραμμές που τελειώνουν με"
+msgstr "Γραμμές που τελειώνουν με:"
 
 #: libraries/export/csv.php:28 libraries/export/excel.php:23
 #: libraries/export/htmlword.php:29 libraries/export/latex.php:80
 #: libraries/export/ods.php:24 libraries/export/odt.php:60
 #: libraries/export/xls.php:24 libraries/export/xlsx.php:24
 msgid "Replace NULL with:"
-msgstr "Αντικατάσταση τιμής NULL με"
+msgstr "Αντικατάσταση τιμής NULL με:"
 
 #: libraries/export/csv.php:29 libraries/export/excel.php:24
 msgid "Remove carriage return/line feed characters within columns"
-msgstr "Απομάκρυνση χαρακτήρων CRLF μέσα στις στήλες"
+msgstr "Απομάκρυνση χαρακτήρων αλλαγής γραμμής μέσα στις στήλες"
 
 #: libraries/export/excel.php:33
 msgid "Excel edition:"
-msgstr "Έκδοση Excel"
+msgstr "Έκδοση Excel:"
 
 #: libraries/export/htmlword.php:28 libraries/export/latex.php:70
 #: libraries/export/odt.php:56 libraries/export/sql.php:215
@@ -6024,7 +6025,7 @@ msgstr "Άδειασμα δεδομένων του πίνακα"
 #: libraries/export/htmlword.php:195 libraries/export/odt.php:235
 #: libraries/export/sql.php:980 libraries/export/texytext.php:177
 msgid "Table structure for table"
-msgstr "Δομή Πίνακα για τον Πίνακα"
+msgstr "Δομή πίνακα για τον πίνακα"
 
 #: libraries/export/latex.php:14
 msgid "Content of table @TABLE@"
@@ -6080,7 +6081,7 @@ msgstr "Χρόνος δημιουργίας"
 #: libraries/export/latex.php:135 libraries/export/sql.php:476
 #: libraries/export/xml.php:101 main.php:162
 msgid "Server version"
-msgstr "Έκδοση Διακομιστή"
+msgstr "Έκδοση διακομιστή"
 
 #: libraries/export/latex.php:136 libraries/export/sql.php:477
 #: libraries/export/xml.php:102
@@ -6118,8 +6119,7 @@ msgstr ""
 #: libraries/export/sql.php:45
 msgid "Additional custom header comment (\\n splits lines):"
 msgstr ""
-"Προσθήκη προσαρμοσμένου σχολίου στην κεφαλίδα (το \n"
-" χωρίζει γραμμές)"
+"Προσθήκη προσαρμοσμένου σχολίου στην κεφαλίδα (το \\ n χωρίζει τις γραμμές):"
 
 #: libraries/export/sql.php:50
 msgid ""
@@ -6144,7 +6144,7 @@ msgstr "Προσθήκη δήλωσης %s"
 
 #: libraries/export/sql.php:152
 msgid "Add statements:"
-msgstr "Προσθήκη δηλώσεων"
+msgstr "Προσθήκη δηλώσεων:"
 
 #: libraries/export/sql.php:204
 msgid ""
@@ -6157,19 +6157,19 @@ msgstr ""
 
 #: libraries/export/sql.php:224
 msgid "Instead of <code>INSERT</code> statements, use:"
-msgstr "Αντί για δηλώσεις <code>ΕΙΣΑΓΩΓΗΣ</code> (INSERT), χρησιμοποιήστε:"
+msgstr "Αντί για δηλώσεις <code>INSERT</code>, χρησιμοποιήστε:"
 
 #: libraries/export/sql.php:229
 msgid "<code>INSERT DELAYED</code> statements"
-msgstr "δηλώσεις <code>ΕΙΣΑΓΩΓΗΣ ΚΑΘΥΣΤΕΡΗΜΕΝΗΣ</code> (INSERT DELAYED)"
+msgstr "δηλώσεις <code>INSERT DELAYED</code>"
 
 #: libraries/export/sql.php:235
 msgid "<code>INSERT IGNORE</code> statements"
-msgstr "δηλώσεις <code>ΕΙΣΑΓΩΓΗΣ ΑΓΝΟΗΣΗΣ</code> (INSERT IGNORE)"
+msgstr "δηλώσεις <code>INSERT IGNORE</code>"
 
 #: libraries/export/sql.php:245
 msgid "Function to use when dumping data:"
-msgstr "Η συνάρτηση που θα χρησιμοποιηθεί κατά την αχρήστευση δεδομένων:"
+msgstr "Η συνάρτηση που θα χρησιμοποιηθεί κατά την μετατροπή δεδομένων:"
 
 #: libraries/export/sql.php:258
 msgid "Syntax to use when inserting data:"
@@ -6181,8 +6181,8 @@ msgid ""
 "&nbsp; &nbsp; Example: <code>INSERT INTO tbl_name (col_A,col_B,col_C) VALUES "
 "(1,2,3)</code>"
 msgstr ""
-"συμπεριλαμβάνει ονόματα στηλών σε κάθε δήλωση <code>ΕΙΣΑΓΩΓΗΣ</code> "
-"(INSERT) <br /> &nbsp; &nbsp; &nbsp; Παράδειγμα: <code>INSERT INTO tbl_name "
+"συμπεριλαμβάνει ονόματα στηλών σε κάθε δήλωση <code>INSERT</code> <br /> "
+"&nbsp; &nbsp; &nbsp; Παράδειγμα: <code>INSERT INTO tbl_name "
 "(col_A,col_B,col_C) VALUES (1,2,3)</code>"
 
 #: libraries/export/sql.php:265
@@ -6191,9 +6191,9 @@ msgid ""
 "&nbsp; &nbsp; Example: <code>INSERT INTO tbl_name VALUES (1,2,3), (4,5,6), "
 "(7,8,9)</code>"
 msgstr ""
-"εισάγει πολλαπλές εγγραφές σε κάθε δήλωση <code>ΕΙΣΑΓΩΓΗΣ</code> (INSERT)"
-"<br /> &nbsp; &nbsp; &nbsp; Παράδειγμα: <code>INSERT INTO tbl_name VALUES "
-"(1,2,3), (4,5,6), (7,8,9)</code>"
+"εισάγει πολλαπλές εγγραφές σε κάθε δήλωση <code>INSERT</code><br /> &nbsp; "
+"&nbsp; &nbsp; Παράδειγμα: <code>INSERT INTO tbl_name VALUES (1,2,3), "
+"(4,5,6), (7,8,9)</code>"
 
 #: libraries/export/sql.php:266
 msgid ""
@@ -6216,7 +6216,7 @@ msgid ""
 "Dump binary columns in hexadecimal notation <i>(for example, \"abc\" becomes "
 "0x616263)</i>"
 msgstr ""
-"Αχρήστευση δυαδικών στηλών σε δεκαεξαδική σημείωση <i>(για παράδειγμα, το "
+"Μετατροπή δυαδικών στηλών σε δεκαεξαδική σημείωση <i>(για παράδειγμα, το "
 "«abc» γίνεται 0x616263)</i>"
 
 #: libraries/export/sql.php:289
@@ -6224,9 +6224,9 @@ msgid ""
 "Dump TIMESTAMP columns in UTC <i>(enables TIMESTAMP columns to be dumped and "
 "reloaded between servers in different time zones)</i>"
 msgstr ""
-"Αχρήστευση στηλών ΧΡΟΝΟΣΦΡΑΓΙΔΑΣ (TIMESTAMP) σε UTC <i>(ενεργοποιεί τις "
-"στήλες TIMESTAMP να αχρηστευτούν και να επαναφορτωθούν μεταξύ διακομιστών σε "
-"διαφορετικές ζώνες ώρας)</i>"
+"Μετατροπή στηλών TIMESTAMP σε UTC <i>(ενεργοποιεί τις στήλες TIMESTAMP να "
+"μετατραπούν και να επαναφορτωθούν μεταξύ διακομιστών σε διαφορετικές ζώνες "
+"ώρας)</i>"
 
 #: libraries/export/sql.php:329 libraries/export/xml.php:34
 msgid "Procedures"
@@ -6283,7 +6283,7 @@ msgstr "Άνοιγμα νέου παραθύρου phpMyAdmin"
 
 #: libraries/gis_visualization.lib.php:129
 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"
@@ -6291,7 +6291,7 @@ msgstr "αποτέλεσμα SQL"
 
 #: libraries/header_printview.inc.php:59
 msgid "Generated by"
-msgstr "Δημιουργήθηκε από:"
+msgstr "Δημιουργήθηκε από"
 
 #: libraries/import.lib.php:152 libraries/rte/rte_routines.lib.php:1237
 #: sql.php:685 tbl_change.php:183 tbl_get_field.php:34
@@ -6401,15 +6401,15 @@ msgstr "Αυτό το πρόσθετο δεν υποστηρίζει συμπι
 
 #: libraries/import/ods.php:28
 msgid "Import percentages as proper decimals <i>(ex. 12.00% to .12)</i>"
-msgstr "Εισαγωγή ποσοστών ως κανονικά δεκαδικά (π.χ. 12.00% αντί .12)"
+msgstr "Εισαγωγή ποσοστών ως κανονικά δεκαδικά <i>(π.χ. 12.00% αντί .12)</i>"
 
 #: libraries/import/ods.php:29
 msgid "Import currencies <i>(ex. $5.00 to 5.00)</i>"
-msgstr "Εισαγωγή νομισμάτων (π.χ. €5,00 αντί 5,00)"
+msgstr "Εισαγωγή νομισμάτων <i>(π.χ. €5,00 αντί 5,00)</i>"
 
 #: libraries/import/sql.php:33
 msgid "SQL compatibility mode:"
-msgstr "Κατάσταση συμβατότητας SQL"
+msgstr "Κατάσταση συμβατότητας SQL:"
 
 #: libraries/import/sql.php:43
 msgid "Do not use <code>AUTO_INCREMENT</code> for zero values"
@@ -6673,7 +6673,7 @@ msgstr "Αυτή η μορφή δεν έχει επιλογές"
 
 #: libraries/relation.lib.php:72
 msgid "not OK"
-msgstr "ΛΑΘΟΣ"
+msgstr "άκυρο"
 
 #: libraries/relation.lib.php:77
 msgid "Enabled"
@@ -6701,7 +6701,7 @@ msgid ""
 "Please see the documentation on how to update your column_comments table"
 msgstr ""
 "Παρακαλώ διαβάστε στην τεκμηρίωση για το πως μπορείτε να ανανεώσετε τον "
-"πίνακα Column_comments"
+"πίνακα column_comments"
 
 #: libraries/relation.lib.php:120 libraries/sql_query_form.lib.php:370
 msgid "Bookmarked SQL query"
@@ -6717,7 +6717,7 @@ msgstr "Μόνιμοι πρόσφατα χρησιμοποιημένοι πίν
 
 #: libraries/relation.lib.php:136
 msgid "Persistent tables' UI preferences"
-msgstr "Μόνιμες ρυθμίσεις πινάκων περιβάλλοντος χρήστη"
+msgstr "Μόνιμες ρυθμίσεις πινάκων UI"
 
 #: libraries/relation.lib.php:144
 msgid "User preferences"
@@ -6820,7 +6820,7 @@ msgstr "Προσθήκη δευτερέοντα χρήστη αναπαραγω
 
 #: libraries/replication_gui.lib.php:255 server_privileges.php:784
 msgid "Any user"
-msgstr "Οποιοσδήποτε Χρήστης"
+msgstr "Οποιοσδήποτε χρήστης"
 
 #: libraries/replication_gui.lib.php:256 libraries/replication_gui.lib.php:324
 #: libraries/replication_gui.lib.php:347 server_privileges.php:785
@@ -6831,7 +6831,7 @@ msgstr "Χρησιμοποιήστε το πεδίο κειμένου"
 
 #: libraries/replication_gui.lib.php:303 server_privileges.php:832
 msgid "Any host"
-msgstr "Οποιοδήποτε Σύστημα"
+msgstr "Οποιοδήποτε σύστημα"
 
 #: libraries/replication_gui.lib.php:307 server_privileges.php:836
 msgid "Local"
@@ -7076,7 +7076,7 @@ msgstr "Τύπος επιστροφής"
 
 #: libraries/rte/rte_routines.lib.php:881
 msgid "Return length/values"
-msgstr "Μήκος/Τιμές επιστροφής"
+msgstr "Επιστροφή μήκους/τιμών"
 
 #: libraries/rte/rte_routines.lib.php:887
 msgid "Return options"
@@ -7129,10 +7129,8 @@ msgstr "Πρέπει να δώσετε ένα προσδιορισμό ρουτ
 #, php-format
 msgid "%d row affected by the last statement inside the procedure"
 msgid_plural "%d rows affected by the last statement inside the procedure"
-msgstr[0] ""
-"%d εγγραφή επηρεάστηκε από την τελευταία δήλωση μέσα στη διαδικασία "
-msgstr[1] ""
-"%d εγγραφές επηρεάστηκαν από την τελευταία δήλωση μέσα στη διαδικασία"
+msgstr[0] "%d εγγραφή επηρεάστηκε από την τελευταία δήλωση μέσα στη διαδικασία"
+msgstr[1] "%d εγγραφές επηρεάστηκαν από την τελευταία δήλωση μέσα στη διαδικασία"
 
 #: libraries/rte/rte_routines.lib.php:1214
 #, php-format
@@ -7190,7 +7188,7 @@ msgstr "Πρέπει να δώσετε ένα έγκυρο χρόνο για τ
 
 #: libraries/rte/rte_triggers.lib.php:409
 msgid "You must provide a valid event for the trigger"
-msgstr "Πρέπει να δώσετε ένα έγκυρο συμβάν για την ενέργεια."
+msgstr "Πρέπει να δώσετε ένα έγκυρο συμβάν για την ενέργεια"
 
 #: libraries/rte/rte_triggers.lib.php:415
 msgid "You must provide a valid table name"
@@ -7251,7 +7249,7 @@ msgstr ""
 
 #: libraries/rte/rte_words.lib.php:36
 msgid "There are no triggers to display."
-msgstr "Δεν υπάρχουν ενέργειες για εμφάνιση"
+msgstr "Δεν υπάρχουν ενέργειες για εμφάνιση."
 
 #: libraries/rte/rte_words.lib.php:42
 msgid "Add event"
@@ -7307,11 +7305,11 @@ msgstr "Σχήμα της βάσης δεδομένων %s - Σελίδα %s"
 
 #: libraries/schema/Export_Relation_Schema.class.php:170
 msgid "This page does not contain any tables!"
-msgstr "Η σελίδα %s δεν περιέχει κανένα πίνακα!"
+msgstr "Αυτή η σελίδα δεν περιέχει κανένα πίνακα!"
 
 #: libraries/schema/Export_Relation_Schema.class.php:195
 msgid "SCHEMA ERROR: "
-msgstr "ΣΦΑΛΜΑ ΣΧΗΜΑΤΟΣ"
+msgstr "ΣΦΑΛΜΑ ΣΧΗΜΑΤΟΣ: "
 
 #: libraries/schema/Pdf_Relation_Schema.class.php:868
 #: libraries/schema/Pdf_Relation_Schema.class.php:1107
@@ -7353,7 +7351,7 @@ msgstr "Εσωτερικές συσχετίσεις"
 
 #: libraries/schema/User_Schema.class.php:112
 msgid "FOREIGN KEY"
-msgstr "ΜΗ ΔΙΑΚΡΙΤΟ ΚΛΕΙΔΙ"
+msgstr "FOREIGN KEY"
 
 #: libraries/schema/User_Schema.class.php:144
 msgid "Please choose a page to edit"
@@ -7389,7 +7387,7 @@ msgstr "Εμφάνιση διαστάσεων πινάκων"
 
 #: libraries/schema/User_Schema.class.php:379
 msgid "Display all tables with the same width"
-msgstr "εμφάνιση όλων των πινάκων με το ίδιο πλάτος;"
+msgstr "Εμφάνιση όλων των πινάκων με το ίδιο πλάτος;"
 
 #: libraries/schema/User_Schema.class.php:384
 msgid "Only show keys"
@@ -7421,7 +7419,7 @@ msgstr ""
 
 #: libraries/schema/User_Schema.class.php:464
 msgid "Toggle scratchboard"
-msgstr "(Απ)ενεργοποίηση πίνακα σχεδιασμού"
+msgstr "Εναλλαγή πίνακα σχεδιασμού"
 
 #. l10n: Text direction, use either ltr or rtl
 #: libraries/select_lang.lib.php:469
@@ -7524,7 +7522,7 @@ msgstr "Διαχωριστικό"
 
 #: libraries/sql_query_form.lib.php:346
 msgid " Show this query here again "
-msgstr " Επανεμφάνιση αυτού του ερώτηματος εδώ"
+msgstr " Επανεμφάνιση αυτού του ερώτηματος εδώ "
 
 #: libraries/sql_query_form.lib.php:402
 msgid "View only"
@@ -7536,7 +7534,7 @@ msgstr "Τοποθεσία του αρχείου κειμένου"
 
 #: libraries/sql_query_form.lib.php:449 tbl_change.php:890
 msgid "web server upload directory"
-msgstr "Υποκατάλογος αποθήκευσης αρχείων διακομιστή"
+msgstr "κατάλογος αποθήκευσης αρχείων διακομιστή"
 
 #: libraries/sqlparser.lib.php:136
 msgid ""
@@ -7545,7 +7543,7 @@ msgid ""
 msgstr ""
 "Φαίνεται να υπάρχει ένα λάθος στο ερώτημά σας. Το παρακάτω λάθος διακομιστή "
 "MySQL, εάν υπάρχει κάποιο, μπορεί επίσης να σας βοηθήσει να διαγνώσετε το "
-"πρόβλημα."
+"πρόβλημα"
 
 #: libraries/sqlparser.lib.php:175
 msgid ""
@@ -7608,7 +7606,7 @@ msgid ""
 "installed the necessary PHP extensions as described in the %sdocumentation%s."
 msgstr ""
 "Ο επικυρωτής SQL δεν μπόρεσε να ξεκινήσει. Ελέγξτε ότι έχετε εγκαταστήσει "
-"της απαραίτητες επεκτάσεις της php όπως περιγράφεται στην %sτεκμηρίωση%s."
+"της απαραίτητες επεκτάσεις της PHP όπως περιγράφεται στην %sτεκμηρίωση%s."
 
 #: libraries/tbl_links.inc.php:118 libraries/tbl_links.inc.php:119
 msgid "Table seems to be empty!"
@@ -7722,7 +7720,7 @@ msgstr "Μηχανή αποθήκευσης"
 
 #: libraries/tbl_properties.inc.php:748
 msgid "PARTITION definition"
-msgstr "Ορισμός ΚΑΤΑΤΜΗΣΗΣ (PARTITION)"
+msgstr "Ορισμός PARTITION"
 
 #: libraries/tbl_properties.inc.php:779
 msgid "+ Add a value"
@@ -7757,7 +7755,7 @@ msgid ""
 "in pixels. The original aspect ratio is preserved."
 msgstr ""
 "Εμφανίζει μια εικόνα προεπισκόπησης με σύνδεσμο; επιλογές: πλάτος, ύψος σε "
-"εικονοστοιχεία (διατηρεί τις αρχικές αναλογίες)"
+"εικονοστοιχεία με διατήρηση της αρχικής αναολογίας."
 
 #: libraries/transformations/image_jpeg__link.inc.php:9
 msgid "Displays a link to download this image."
@@ -7774,15 +7772,14 @@ msgid ""
 "documentation for PHP's strftime() function and for \"utc\" it is done using "
 "gmdate() function."
 msgstr ""
-"Προβάλεται ένα πεδίο ημερομηνίας-ώρας (TIME, TIMESTAMP, DATETIME ή "
-"αριθμητικός χρόνος UNIX) ως μορφοποιημένη ημερομηνία. Η πρώτη επιλογή είναι "
-"το αντιστάθμισμα (σε ώρες) που θα προστεθεί στην υπαρχουσα (Προεπιλογή: 0) "
-"Χρησιμοποιείστε τη δεύτερη επιλογή για να ορίσετε μια μορφή ημερομηνίας "
-"ώρας. Η τρίτη επιλογή ορίζει αν θέλετε να δείτε την τοπική ή την παγκόσμια "
-"ώρα (χρήση «local» ή «utc» αντίστοιχα). Σύμφωνα με αυτό, η μορφή της "
-"ημερομηνίας έχει διαφορετική τιμή - για το «local» δείτε την τεκμηρίωση για "
-"τη συνάρτηση strftime() της PHP και για το «utc» γίνεται χρησιμοποιώντας τη "
-"συνάρτηση gmdate()."
+"Προβάλεται ένα πεδίο TIME, TIMESTAMP, DATETIME ή αριθμητικός χρόνος UNIX ως "
+"μορφοποιημένη ημερομηνία. Η πρώτη επιλογή είναι το αντιστάθμισμα (σε ώρες) "
+"που θα προστεθεί στην υπαρχουσα (Προεπιλογή: 0) Χρησιμοποιείστε τη δεύτερη "
+"επιλογή για να ορίσετε μια μορφή ημερομηνίας-ώρας. Η τρίτη επιλογή ορίζει αν "
+"θέλετε να δείτε την τοπική ή την παγκόσμια ώρα (χρήση «local» ή «utc» "
+"αντίστοιχα). Σύμφωνα με αυτό, η μορφή της ημερομηνίας έχει διαφορετική τιμή "
+"- για το «local» δείτε την τεκμηρίωση για τη συνάρτηση strftime() της PHP "
+"και για το «utc» γίνεται χρησιμοποιώντας τη συνάρτηση gmdate()."
 
 #: libraries/transformations/text_plain__external.inc.php:9
 msgid ""
@@ -7800,15 +7797,15 @@ msgstr ""
 "ΜΟΝΟ ΓΙΑ LINUX: Εκτελεί μία εξωτερική εφαρμογή και στέλνει τα δεδομένα μέσω "
 "«βασικής εισαγωγής». Επιστρέφει το αποτέλεσμα της εφαρμογής. Προεπιλεγμένη "
 "τιμή είναι το Tidy, που τυπώνει μορφοποιημένο κώδικα HTML. Για λόγους "
-"ασφαλείες, πρέπει χειροκίνητα να αλλάξετε το αρχείο libraries/"
-"transformations/text_plain__external.inc.php και να εισάγετε τις εφαρμογές "
-"που εσείς επιτρέπετε να εκτελούνται. Η πρώτη επιλογή είναι ο αριθμός της "
-"εφαρμογής που θέλετε να χρησιμοποιήσετε και η δεύτερη επιλογή είναι οι "
-"παράμετροι της. Η τρίτη επιλογή, αν τεθεί σε 1 θα μετατρέψει το αποτέλεσμα "
-"χρησιμοποιώντας την εντολή htmlspecialchars() (Προεπιλεγμένη τιμή: 1). Η "
-"τέταρτη επιλογή, αν τεθεί σε 1 θα εισάγει NOWRAP στο κελί περιεχομένου ούτως "
-"ώστε όλο το αποτέλεσμα να εμφανιστεί χωρίς αλλαγές στην διάταξη "
-"(Προεπιλεγμένη τιμή: 1)"
+"ασφαλείες, πρέπει χειροκίνητα να αλλάξετε το αρχείο "
+"libraries/transformations/text_plain__external.inc.php και να εισάγετε τις "
+"εφαρμογές που εσείς επιτρέπετε να εκτελούνται. Η πρώτη επιλογή είναι ο "
+"αριθμός της εφαρμογής που θέλετε να χρησιμοποιήσετε και η δεύτερη επιλογή "
+"είναι οι παράμετροι της. Η τρίτη επιλογή, αν τεθεί σε 1 θα μετατρέψει το "
+"αποτέλεσμα χρησιμοποιώντας την εντολή htmlspecialchars() (Προεπιλεγμένη "
+"τιμή: 1). Η τέταρτη επιλογή, αν τεθεί σε 1 θα εισάγει NOWRAP στο κελί "
+"περιεχομένου ούτως ώστε όλο το αποτέλεσμα να εμφανιστεί χωρίς αλλαγές στην "
+"διάταξη (Προεπιλεγμένη τιμή: 1)."
 
 #: libraries/transformations/text_plain__formatted.inc.php:9
 msgid ""
@@ -7825,8 +7822,8 @@ msgid ""
 "third options are the width and the height in pixels."
 msgstr ""
 "Εμφανίζει μία εικόνα και ένα σύνδεσμο, το πεδίο περιέχει το όνομα αρχείου. Η "
-"πρώτη επιλογή είναι ένα πρόθεμα όπως «http://domain.gr», η δεύτερη επιλογή "
-"είναι το πλάτος σε εικονοστοιχεία, η τρίτη είναι το ύψος."
+"πρώτη επιλογή είναι ένα πρόθεμα όπως «http://www.example.com/», η δεύτερη "
+"επιλογή είναι το πλάτος σε εικονοστοιχεία, η τρίτη είναι το ύψος."
 
 #: libraries/transformations/text_plain__link.inc.php:9
 msgid ""
@@ -7835,8 +7832,8 @@ msgid ""
 "the link."
 msgstr ""
 "Εμφανίζει ένα σύνδεσμο, το πεδίο περιέχει το όνομα αρχείου. Η πρώτη επιλογή "
-"είναι ένα πρόθεμα όπως «http://domain.gr», η δεύτερη επιλογή είναι ένας "
-"τίτλος για τον σύνδεσμο."
+"είναι ένα πρόθεμα όπως «http://www.example.com/», η δεύτερη επιλογή είναι "
+"ένας τίτλος για τον σύνδεσμο."
 
 #: libraries/transformations/text_plain__longToIpv4.inc.php:9
 msgid ""
@@ -7860,9 +7857,9 @@ msgid ""
 msgstr ""
 "Εμφανίζει μόνο μέρος ενός αλφαριθμητικού. Η πρώτη επιλογή είναι η θέση στην "
 "οποία ξεκινά η εμφάνιση του κειμένου (Προεπιλογή: 0). Η δεύτερη επιλογή "
-"είναι το μήκος του κειμένου. Αν μείνει κενό θα επιστραφεί όλο το "
-"αλφαριθμητικό. Η τρίτη επιλογή καθορίζει ποιοι χαρακτήρες θα ακολουθούν το "
-"κείμενο όταν εμφανίζεται μέρος του (Προεπιλογή: ...) ."
+"είναι ο αριθμός των χαρακτήρων που θα επιστραφούν (Προεπιλογή: μέχρι το "
+"τέλος του κειιμένου). Η τρίτη επιλογή καθορίζει ποιοι χαρακτήρες θα "
+"ακολουθούν το κείμενο όταν εμφανίζεται τμήμα του (Προεπιλογή: «...»)."
 
 #: libraries/user_preferences.inc.php:32
 msgid "Manage your settings"
@@ -7979,7 +7976,7 @@ msgstr ""
 "πρόσβασης) που αντιστοιχούν στον προεπιλεγμένο λογαριασμό χρήστη MySQL. Ο "
 "διακομιστής MySQL σας που τρέχει με αυτή τη ρύθμιση, είναι ανοιχτός σε "
 "επιθέσεις και θα πρέπει να διορθώσετε το πρόβλημα εισάγωντας κωδικό "
-"πρόσβασης για το χρήστη «root».."
+"πρόσβασης για το χρήστη «root»."
 
 #: main.php:251
 msgid ""
@@ -8009,20 +8006,20 @@ msgid ""
 "validity configured in phpMyAdmin, because of this, your login will expire "
 "sooner than configured in phpMyAdmin."
 msgstr ""
-"Η παράμετρος PHP [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] είναι μικρότερη από την "
-"ρυθμισμένη εγκυρότητα cookie στο phpMyAdmin. Εξαιτίας αυτού, η σύνδεσή σας "
-"θα λήξει νωρίτερα από ό,τι ρυθμίστηκε στο phpMyAdmin."
+"Η παράμετρος PHP "
+"[a@http://php.net/manual/en/session.configuration.php#ini.session.gc-"
+"maxlifetime@]session.gc_maxlifetime[/a] είναι μικρότερη από την ρυθμισμένη "
+"εγκυρότητα cookie στο phpMyAdmin. Εξαιτίας αυτού, η σύνδεσή σας θα λήξει "
+"νωρίτερα από ό,τι ρυθμίστηκε στο phpMyAdmin."
 
 #: main.php:274
 msgid ""
 "Login cookie store is lower than cookie validity configured in phpMyAdmin, "
 "because of this, your login will expire sooner than configured in phpMyAdmin."
 msgstr ""
-"Η παράμετρος PHP [a@http://php.net/manual/en/session.configuration.php#ini."
-"session.gc-maxlifetime@]session.gc_maxlifetime[/a] είναι μικρότερη από την "
-"ρυθμισμένη εγκυρότητα cookie στο phpMyAdmin. Εξαιτίας αυτού, η σύνδεσή σας "
-"θα λήξει νωρίτερα από ό,τι ρυθμίστηκε στο phpMyAdmin."
+"Το αποθηκευμένο cookie σύνδεσης είναι μικρότερο από την εγκυρότητα cookie "
+"που ορίστηκε στο phpMyAdmin, για αυτό, η σύνδεσή σας θα λήξει συντομότερα "
+"από τη ρύθμιση του phpMyAdmin."
 
 #: main.php:282
 msgid "The configuration file now needs a secret passphrase (blowfish_secret)."
@@ -8066,8 +8063,8 @@ msgid ""
 "Your PHP MySQL library version %s differs from your MySQL server version %s. "
 "This may cause unpredictable behavior."
 msgstr ""
-"Η έκδοση της βιβλιοθήκης PHP MySQL (%s) διαφέρει από την έκδοση του "
-"διακομιστή MySQL (%s). Αυτό ίσως έχει μη προβλέψιμα αποτελέσματα."
+"Η έκδοση της βιβλιοθήκης PHP MySQL %s διαφέρει από την έκδοση του διακομιστή "
+"MySQL %s. Αυτό ίσως έχει μη προβλέψιμα αποτελέσματα."
 
 #: main.php:341
 #, php-format
@@ -8243,7 +8240,7 @@ msgstr "Δημιουργία μιας σελίδας και εξαγωγή σε
 
 #: pmd_pdf.php:111
 msgid "New page name: "
-msgstr "Νέο όνομα σελίδα:"
+msgstr "Νέο όνομα σελίδα: "
 
 #: pmd_pdf.php:114
 msgid "Export/Import to scale"
@@ -8255,7 +8252,7 @@ msgstr "προτείνεται"
 
 #: pmd_relation_new.php:29
 msgid "Error: relation already exists."
-msgstr "Σφάλμα: Η συσχέτιση υπαρχει ήδη."
+msgstr "Σφάλμα: η συσχέτιση υπαρχει ήδη."
 
 #: pmd_relation_new.php:61 pmd_relation_new.php:86
 msgid "Error: Relation not added."
@@ -8263,7 +8260,7 @@ msgstr "Σφάλμα: Δεν προστέθηκε η συσχέτιση."
 
 #: pmd_relation_new.php:62
 msgid "FOREIGN KEY relation added"
-msgstr "Προστέθηκε η συσχέτιση ΜΗ ΔΙΑΚΡΙΤΟΥ ΚΛΕΙΔΙΟΥ (FOREIGN KEY)"
+msgstr "Προστέθηκε η συσχέτιση FOREIGN KEY"
 
 #: pmd_relation_new.php:84
 msgid "Internal relation added"
@@ -8449,7 +8446,7 @@ msgstr "Μηχανές αποθήκευσης"
 
 #: server_export.php:20
 msgid "View dump (schema) of databases"
-msgstr "Εμφάνισης σχήματος βάσεων"
+msgstr "Εμφάνισης σκαριφήματος (σχήματος) βάσεων δεδομένων"
 
 #: server_privileges.php:32 server_privileges.php:362
 msgid "Includes all privileges except GRANT."
@@ -8596,7 +8593,7 @@ msgstr ""
 #: server_privileges.php:652
 msgid "Allows the user to ask where the slaves / masters are."
 msgstr ""
-"Δίνει το δικαίωμα στον χρήστη να βρει που είναι οι κύριοι και δευτερεύοντες "
+"Δίνει το δικαίωμα στον χρήστη να βρει που είναι οι κύριοι / δευτερεύοντες "
 "διακομιστές."
 
 #: server_privileges.php:59 server_privileges.php:260
@@ -8632,8 +8629,8 @@ msgid ""
 "killing threads of other users."
 msgstr ""
 "Επιτρέπει τη σύνδεση, ακόμα και όταν ο μέγιστος αριθμός συνδέσεων έχει "
-"καλυθφεί; Απαιτείται για τις περισσότερες λειτουργίες διαχείρισης όπως ο "
-"ορισμός γενικών μεταβλητών ή τη διακοπή λειτουργιών άλλων χρηστών."
+"καλυθφεί, το οποίο απαιτείται για τις περισσότερες λειτουργίες διαχείρισης "
+"όπως ο ορισμός γενικών μεταβλητών ή τη διακοπή λειτουργιών άλλων χρηστών."
 
 #: server_privileges.php:65 server_privileges.php:276
 #: server_privileges.php:635
@@ -8719,7 +8716,7 @@ msgstr "Ανακαλέσατε τα δικαιώματα για %s"
 #: server_privileges.php:1322
 #, php-format
 msgid "The password for %s was changed successfully."
-msgstr "Ο Κωδικός Πρόσβασης για τον χρήστη %s άλλαξε επιτυχώς."
+msgstr "Ο κωδικός πρόσβασης για τον χρήστη %s άλλαξε επιτυχώς."
 
 #: server_privileges.php:1342
 #, php-format
@@ -8873,11 +8870,11 @@ msgstr "Χρήστες με πρόσβαση στη βάση «%s»"
 
 #: server_privileges.php:2340
 msgid "global"
-msgstr "Γενικός"
+msgstr "γενικός"
 
 #: server_privileges.php:2342
 msgid "database-specific"
-msgstr "Χρήστης Βάσης"
+msgstr "σχετιζόμενος με βάση δεδομένων"
 
 #: server_privileges.php:2344
 msgid "wildcard"
@@ -8971,8 +8968,8 @@ msgid ""
 "Now, add the following lines at the end of [mysqld] section in your my.cnf "
 "and please restart the MySQL server afterwards."
 msgstr ""
-"Τώρα, προσθέστε της ακόλουθες γραμμές στο τέλος του αρχείου my.cnf και "
-"επανεκκινήστε τον διακομιστή MySQL."
+"Τώρα, προσθέστε της ακόλουθες γραμμές στο τέλος του τομέα [mysqld] του "
+"αρχείου my.cnf και επανεκκινήστε τον διακομιστή MySQL."
 
 #: server_replication.php:228
 msgid ""
@@ -9327,7 +9324,7 @@ msgid ""
 msgstr ""
 "Ο αριθμός των προσωρινών πινάκων στο δίσκο που δημιουργήθηκαν αυτόματα από "
 "τον διακομιστή κατά την εκτέλεση δηλώσεων. Αν το Created_tmp_disk_tables "
-"είναι μεγάλο, ίσως θέλετε να αυξήσετε την τιμή tmp_table_size ώστε οι "
+"είναι μεγάλο, ίσως θέλετε να αυξήσετε την τιμή  tmp_table_size ώστε οι "
 "προσωρινοί πίνακες να είναι στη μνήμη και όχι στο δίσκο."
 
 #: server_status.php:1081
@@ -9361,17 +9358,15 @@ msgstr ""
 
 #: server_status.php:1085
 msgid "The number of INSERT DELAYED rows written."
-msgstr ""
-"Ο αριθμός των ΚΑΘΥΣΤΕΡΗΜΕΝΑ ΕΙΣΕΡΧΟΜΕΝΩΝ (INSERT DELAYED) γραμμών που "
-"εγγράφτηκαν."
+msgstr "Ο αριθμός των INSERT DELAYED γραμμών που εγγράφτηκαν."
 
 #: server_status.php:1086
 msgid "The number of executed FLUSH statements."
-msgstr "Ο αριθμός των εκτελεσθέντων δηλώσεων ΕΚΚΑΘΑΡΙΣΗΣ (FLUSH)."
+msgstr "Ο αριθμός των εκτελεσθέντων δηλώσεων FLUSH."
 
 #: server_status.php:1087
 msgid "The number of internal COMMIT statements."
-msgstr "Ο αριθμός των εσωτερικών δηλώσεων ΠΑΡΑΠΟΜΠΗΣ (COMMIT)."
+msgstr "Ο αριθμός των εσωτερικών δηλώσεων COMMIT."
 
 #: server_status.php:1088
 msgid "The number of times a row was deleted from a table."
@@ -9454,7 +9449,7 @@ msgstr ""
 
 #: server_status.php:1096
 msgid "The number of internal ROLLBACK statements."
-msgstr "Ο αριθμός των εσωτερικών δηλώσεων ΕΠΙΣΤΡΟΦΗΣ (ROLLBACK)."
+msgstr "Ο αριθμός των εσωτερικών δηλώσεων ROLLBACK."
 
 #: server_status.php:1097
 msgid "The number of requests to update a row in a table."
@@ -9606,7 +9601,7 @@ msgid ""
 "wait for it to be flushed before continuing."
 msgstr ""
 "Ο αριθμός των αναμονών που έγιναν εξαιτίας του μικρού μεγέθος του buffer "
-"καταγραφής και και έπρεπε να αναμένεται να εκκαθαριστεί πριν συνεχίσει."
+"καταγραφής και έπρεπε να αναμένεται να εκκαθαριστεί πριν συνεχίσει."
 
 #: server_status.php:1123
 msgid "The number of log write requests."
@@ -9618,8 +9613,7 @@ msgstr "Ο αριθμός των φυσικών εγγραφών στο αρχε
 
 #: server_status.php:1125
 msgid "The number of fsync() writes done to the log file."
-msgstr ""
-"Ο αριθμός των εγγραφών fsyncs() που ολοκληρώθηκαν στο αρχείο καταγραφής."
+msgstr "Ο αριθμός των εγγραφών fsync() που ολοκληρώθηκαν στο αρχείο καταγραφής."
 
 #: server_status.php:1126
 msgid "The number of pending log file fsyncs."
@@ -9673,7 +9667,7 @@ msgstr ""
 msgid "The maximum time to acquire a row lock, in milliseconds."
 msgstr ""
 "Ο μέγιστος χρόνος απόκτησης ενός κλειδώματος γραμμής σε "
-"χιλιοστοδευτερόλεπτα.."
+"χιλιοστοδευτερόλεπτα."
 
 #: server_status.php:1137
 msgid "The number of times a row lock had to be waited for."
@@ -9770,8 +9764,7 @@ msgstr ""
 #: server_status.php:1151
 msgid "The number of rows waiting to be written in INSERT DELAYED queues."
 msgstr ""
-"Ο αριθμός των γραμμών σε αναμονή για εγγραφή στις σειρές ΚΑΘΥΣΤΕΡΗΜΕΝΩΝ "
-"ΕΙΣΑΓΩΓΩΝ (INSERT DELAYED)."
+"Ο αριθμός των γραμμών σε αναμονή για εγγραφή στις σειρές INSERT DELAYED."
 
 #: server_status.php:1152
 msgid ""
@@ -9945,7 +9938,7 @@ msgstr "Ο αριθμός των ταξινομήσεων που έγιναν σ
 
 #: server_status.php:1179
 msgid "The number of times that a table lock was acquired immediately."
-msgstr "Οι φορές που ένα κλείδωμα πινακα ανακτήθηκε άμεσα.."
+msgstr "Οι φορές που ένα κλείδωμα πινακα ανακτήθηκε άμεσα."
 
 #: server_status.php:1180
 msgid ""
@@ -10044,11 +10037,11 @@ msgid ""
 msgstr ""
 "Η Εποπτεία phpMyAdmin μπορεί να σας βοηθήσει να βελτιστοποιήσετε τη ρύθμιση "
 "του διακομιστή και να καταγράφει χρονοβόρα\n"
-"ερωτήματα. Για το τελευταίο θα χρειαστείτε να ορίσετε το log_output σε "
-"«TABLE» και να έχετε ενεργοποιήσει το slow_query_log ή το general_log. "
+"        ερωτήματα. Για το τελευταίο θα χρειαστείτε να ορίσετε το log_output "
+"σε «TABLE» και να έχετε ενεργοποιήσει το slow_query_log ή το general_log. "
 "Σημειώστε, ωστόσο, ότι το\n"
-"general_log παράγει πολλά δεδομένα και αυξάνει τη χρήση πόρων του διακομιστή "
-"μέχρι και 15%"
+"        general_log παράγει πολλά δεδομένα και αυξάνει τη χρήση πόρων του "
+"διακομιστή μέχρι και 15%"
 
 #: server_status.php:1371
 #, fuzzy
@@ -10108,14 +10101,15 @@ msgstr ""
 "<b>Σημειώστε:</b>\n"
 "        Η ενεργοποίηση του general_log μπορεί να αυξήσει τη χρήση των πόρων "
 "του συστήματος κατά 5-15%. Επίσης, λάβετε υπόψη ότι η δημιουργία στατιστικών "
-"από τις καταγραφές είναι μια εργασία που απαιτεί έντονη χρήση πόρων, για "
-"αυτό σας προτείνεται να χρησιμοποιήσετε μικρό χρονικό όριο και να "
-"απενεργοποιήσετε το general_log και να αδειάσετε τον πίνακά του μόλις η "
-"εποπτεία δεν είναι πλέον απαραίτητη.        "
+"από τις καταγραφές είναι μια\n"
+"        εργασία που απαιτεί έντονη χρήση πόρων, για αυτό σας προτείνεται να "
+"χρησιμοποιήσετε μικρό χρονικό όριο και να απενεργοποιήσετε το general_log "
+"και να αδειάσετε τον πίνακά του μόλις η εποπτεία δεν είναι πλέον απαραίτητη:\n"
+"        "
 
 #: server_status.php:1385
 msgid "CPU Usage"
-msgstr "Χρήση Επεξεργαστή"
+msgstr "Χρήση CPU"
 
 #: server_status.php:1388
 msgid "Memory Usage"
@@ -10139,7 +10133,7 @@ msgstr "Συχνά εποπτευόμενα"
 
 #: server_status.php:1413
 msgid "or type variable name:"
-msgstr "ή όνομα τύπου μεταβλητής"
+msgstr "ή όνομα τύπου μεταβλητής:"
 
 #: server_status.php:1417
 msgid "Display as differential value"
@@ -10339,7 +10333,7 @@ msgstr "Ρυθμίσεις και μεταβλητές του διακομιστ
 
 #: server_variables.php:110 server_variables.php:133
 msgid "Session value"
-msgstr "Τιμή Συνεδρίας"
+msgstr "Τιμή συνεδρίας"
 
 #: server_variables.php:110
 msgid "Global value"
@@ -10360,9 +10354,9 @@ msgid ""
 "documentation[/a]. Otherwise you will be only able to download or display it."
 msgstr ""
 "Δημιουργήστε εγγράψιμο φάκελο διακομιστή ιστού [em]config[/em] στο φάκελο "
-"μέγιστου επιπέδου phpMyAdmin όπως περιγράφετε στην [a@../Documentation."
-"html#setup_script]τεκμηρίωση[/a]. Διαφορετικά, θα μπορείτε μόνο να τον "
-"λάβετε ή να τον προβάλετε."
+"μέγιστου επιπέδου phpMyAdmin όπως περιγράφετε στην "
+"[a@Documentation.html#setup_script]τεκμηρίωση[/a]. Διαφορετικά, θα μπορείτε "
+"μόνο να τον λάβετε ή να τον προβάλετε."
 
 #: setup/frames/index.inc.php:57
 msgid ""
@@ -10421,7 +10415,7 @@ msgstr "Προεπιλεγμένη γλώσσα"
 
 #: setup/frames/index.inc.php:195
 msgid "let the user choose"
-msgstr "Δικαίωμα επιλογής στο χρήστη"
+msgstr "δικαίωμα επιλογής στο χρήστη"
 
 #: setup/frames/index.inc.php:206
 msgid "- none -"
@@ -10513,7 +10507,7 @@ msgstr ""
 
 #: setup/lib/index.lib.php:165
 msgid "No newer stable version is available"
-msgstr "Δεν υπάρχει νεότερη έκδοση (μη δοκιμαστική) διαθέσιμη"
+msgstr "Δεν υπάρχει νεότερη σταθερή έκδοση διαθέσιμη"
 
 #: setup/lib/index.lib.php:250
 #, php-format
@@ -10654,11 +10648,11 @@ msgstr ""
 msgid "You should use SSL connections if your web server supports it."
 msgstr ""
 "Πρέπει να χρησιμοποιήσετε συνδέσεις SSL αν ο διακομιστής ιστού σας τις "
-"υποστηρίζει"
+"υποστηρίζει."
 
 #: setup/lib/index.lib.php:306
 msgid "You should use mysqli for performance reasons."
-msgstr "Πρέπει να χρησιμοποιείτε την mysqli για λόγους απόδοσης"
+msgstr "Πρέπει να χρησιμοποιείτε την mysqli για λόγους απόδοσης."
 
 #: setup/lib/index.lib.php:331
 msgid "You allow for connecting to the server without a password."
@@ -10666,13 +10660,14 @@ msgstr "Επιτρέπετε την σύνδεση στο διακομιστή 
 
 #: setup/lib/index.lib.php:351
 msgid "Key is too short, it should have at least 8 characters."
-msgstr "Το κλειδί είναι πολύ μικρό. Πρέπει να έχει τουλάχιστον 8 χαρακτήρες"
+msgstr ""
+"Το κλειδί είναι πολύ μικρό γιατί πρέπει να έχει τουλάχιστον 8 χαρακτήρες."
 
 #: setup/lib/index.lib.php:358
 msgid "Key should contain letters, numbers [em]and[/em] special characters."
 msgstr ""
 "Το κλειδί πρέπει να περιέχει γράμματα, αριθμούς [em]και[/em] ειδικούς "
-"χαρακτήρες"
+"χαρακτήρες."
 
 #: sql.php:95 tbl_change.php:257 tbl_select.php:28 tbl_select.php:29
 #: tbl_select.php:32 tbl_select.php:35
@@ -10743,7 +10738,7 @@ msgstr "Εισαγωγή ως νέα γραμμή και παράβλεψη σφ
 
 #: tbl_change.php:985
 msgid "Show insert query"
-msgstr "Εμφάνιση ερωτήματος εισαγωγής SQL"
+msgstr "Εμφάνιση ερωτήματος εισαγωγής"
 
 #: tbl_change.php:996
 msgid "and then"
@@ -10841,11 +10836,11 @@ msgstr "Ο πίνακας %1$s έχει δημιουργηθεί."
 
 #: tbl_export.php:24
 msgid "View dump (schema) of table"
-msgstr "Εμφάνιση σχήματος του πίνακα"
+msgstr "Εμφάνιση σκαριφήματος (σχήματος) του πίνακα"
 
 #: tbl_gis_visualization.php:111
 msgid "Display GIS Visualization"
-msgstr "Εμφάνιση Οπτικοποίησης ΓΠΣ"
+msgstr "Εμφάνιση Οπτικοποίησης GIS"
 
 #: tbl_gis_visualization.php:157
 msgid "Width"
@@ -10889,7 +10884,7 @@ msgstr "Το όνομα του πρωτεύοντος κλειδιού πρέπ
 
 #: tbl_indexes.php:75
 msgid "Can't rename index to PRIMARY!"
-msgstr "Η μετατροπή του ευρετηρίου σε ΠΡΩΤΕΥΟΝ σε είναι εφικτή!"
+msgstr "Η μετατροπή του ευρετηρίου σε PRIMARY δεν είναι εφικτή!"
 
 #: tbl_indexes.php:91
 msgid "No index parts defined!"
@@ -10908,15 +10903,15 @@ msgid ""
 "(\"PRIMARY\" <b>must</b> be the name of and <b>only of</b> a primary key!)"
 msgstr ""
 "(«PRIMARY» <b>πρέπει</b> να είναι το όνομα του πρωτεύοντος κλειδιού και "
-"<b>μόνο αυτού</b> !)"
+"<b>μόνο αυτού</b>!)"
 
 #: tbl_indexes.php:179
 msgid "Index name:"
-msgstr "Όνομα ευρετηρίου :"
+msgstr "Όνομα ευρετηρίου:"
 
 #: tbl_indexes.php:185
 msgid "Index type:"
-msgstr "Τύπος ευρετηρίου :"
+msgstr "Τύπος ευρετηρίου:"
 
 #: tbl_indexes.php:265
 #, php-format
@@ -10943,15 +10938,15 @@ msgstr "Ο πίνακας %s μεταφέρθηκε στο %s."
 #: tbl_move_copy.php:56
 #, php-format
 msgid "Table %s has been copied to %s."
-msgstr "Ο Πίνακας %s αντιγράφηκε στο %s."
+msgstr "Ο πίνακας %s αντιγράφηκε στο %s."
 
 #: tbl_move_copy.php:74
 msgid "The table name is empty!"
-msgstr "Το όνομα του Πίνακα είναι κενό!"
+msgstr "Το όνομα του πίνακα είναι κενό!"
 
 #: tbl_operations.php:273
 msgid "Alter table order by"
-msgstr "Αλλαγή ταξινόμησης Πίνακα κατά"
+msgstr "Αλλαγή ταξινόμησης πίνακα κατά"
 
 #: tbl_operations.php:282
 msgid "(singly)"
@@ -10979,7 +10974,7 @@ msgstr "Μεταφορά στον αντεγραμμένο πίνακα"
 
 #: tbl_operations.php:599
 msgid "Table maintenance"
-msgstr "Συντήρηση Πίνακα"
+msgstr "Συντήρηση πίνακα"
 
 #: tbl_operations.php:623
 msgid "Defragment table"
@@ -10988,7 +10983,7 @@ msgstr "Ανασυγκρότηση πίνακα"
 #: tbl_operations.php:671
 #, php-format
 msgid "Table %s has been flushed"
-msgstr "Ο Πίνακας %s εκκαθαρίστηκε («FLUSH»)"
+msgstr "Ο πίνακας %s εκκαθαρίστηκε"
 
 #: tbl_operations.php:677
 msgid "Flush the table (FLUSH)"
@@ -11073,11 +11068,11 @@ msgstr "δυναμικά"
 
 #: tbl_printview.php:401 tbl_structure.php:918
 msgid "Row length"
-msgstr "Μέγεθος Γραμμής"
+msgstr "Μέγεθος γραμμής"
 
 #: tbl_printview.php:411 tbl_structure.php:926
 msgid " Row size "
-msgstr " Μέγεθος Εγγραφής "
+msgstr " Μέγεθος εγγραφής "
 
 #: tbl_relation.php:276
 #, php-format
@@ -11096,7 +11091,7 @@ msgid ""
 "relation exists."
 msgstr ""
 "Μια εσωτερική συσχέτιση δεν είναι απαραίτητη όταν υπάρχει μια αντίστοιχη "
-"συσχέτιση ΜΗ ΔΙΑΚΡΙΤΟΥ ΚΛΕΙΔΙΟΥ (FOREIGN KEY)."
+"συσχέτιση FOREIGN KEY."
 
 #: tbl_relation.php:410
 msgid "Foreign key constraint"
@@ -11108,7 +11103,7 @@ msgstr "Εκτέλεσε ένα «επερώτημα κατά παράδειγμ
 
 #: tbl_select.php:261
 msgid "Select columns (at least one):"
-msgstr "Επιλογή πεδίων (τουλάχιστον ένα)"
+msgstr "Επιλογή πεδίων (τουλάχιστον ένα):"
 
 #: tbl_select.php:279
 msgid "Add search conditions (body of the \"where\" clause):"
@@ -11148,7 +11143,7 @@ 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"
@@ -11367,8 +11362,8 @@ msgid ""
 "No themes support; please check your configuration and/or your themes in "
 "directory %s."
 msgstr ""
-"Δεν υποστηρίζονται θέματα. Ελέξτε τις ρυθμίσεις σας και/ή τα θέματά σας στο "
-"φάκελο %s."
+"Δεν υποστηρίζονται θέματα, για αυτό ελέξτε τις ρυθμίσεις σας και/ή τα θέματά "
+"σας στο φάκελο %s."
 
 #: themes.php:41
 msgid "Get more themes!"
@@ -11404,7 +11399,7 @@ msgstr "Τα στοιχεία ανανεώθηκαν."
 
 #: view_create.php:141
 msgid "VIEW name"
-msgstr "ΠΡΟΒΟΛΗ ονόματος"
+msgstr "Όνομα VIEW"
 
 #: view_operations.php:91
 msgid "Rename view to"
diff --git a/po/en_GB.po b/po/en_GB.po
index 0f098eff96..71133f270d 100644
--- a/po/en_GB.po
+++ b/po/en_GB.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-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-24 20:54+0200\n"
-"Last-Translator: Marc Delisle <marc@infomarc.info>\n"
+"PO-Revision-Date: 2011-07-30 22:27+0200\n"
+"Last-Translator: Robert Readman <robert_readman@hotmail.com>\n"
 "Language-Team: english-gb <en_GB@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -1199,7 +1199,7 @@ msgstr "Pause monitor"
 
 #: js/messages.php:114
 msgid "general_log and slow_query_log are enabled."
-msgstr ""
+msgstr "general_log and slow_query_log are enabled."
 
 #: js/messages.php:115
 msgid "general_log is enabled."
@@ -1211,7 +1211,7 @@ msgstr "slow_query_log is enabled."
 
 #: js/messages.php:117
 msgid "slow_query_log and general_log are disabled."
-msgstr ""
+msgstr "slow_query_log and general_log are disabled."
 
 #: js/messages.php:118
 msgid "log_output is not set to TABLE."
@@ -1317,6 +1317,9 @@ msgid ""
 "However only the SQL query itself has been used as a grouping criteria, so "
 "the other attributes of queries, such as start time, may differ."
 msgstr ""
+"This columns shows the amount of identical queries that are grouped "
+"together. However only the SQL Text is being compared, thus the queries "
+"other attributes such as start time may differ."
 
 #: js/messages.php:144
 msgid ""
@@ -1324,27 +1327,28 @@ msgid ""
 "same table are also being grouped together, disregarding of the inserted "
 "data."
 msgstr ""
+"Since grouping of INSERTs queries has been selected, INSERT queries into the "
+"same table are also being grouped together, disregarding of the inserted "
+"data."
 
 #: js/messages.php:145
 msgid "Log data loaded. Queries executed in this time span:"
-msgstr ""
+msgstr "Log data loaded. Queries executed in this time span:"
 
 #: js/messages.php:147
-#, fuzzy
 #| msgid "Jump to database"
 msgid "Jump to Log table"
-msgstr "Jump to database"
+msgstr "Jump to Log table"
 
 #: js/messages.php:148
 msgid "Log analysed, but no data found in this time span."
-msgstr ""
+msgstr "Log analyzed, but no data found in this time span."
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
-#, fuzzy
 #| msgid "Filter"
 msgid "Filters"
-msgstr "Filter"
+msgstr "Filters"
 
 #. l10n: Filter as in "Start Filtering"
 #: js/messages.php:153 navigation.php:270
@@ -1353,23 +1357,21 @@ msgstr "Filter"
 
 #: js/messages.php:154
 msgid "Filter queries by word/regexp:"
-msgstr ""
+msgstr "Filter queries by word/regexp:"
 
 #: js/messages.php:155
 msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr ""
+msgstr "Group queries, ignoring variable data in WHERE clauses"
 
 #: js/messages.php:156
-#, fuzzy
 #| msgid "Number of inserted rows"
 msgid "Sum of grouped rows:"
-msgstr "Number of inserted rows"
+msgstr "Sum of grouped rows:"
 
 #: js/messages.php:157
-#, fuzzy
 #| msgid "Total"
 msgid "Total:"
-msgstr "Total"
+msgstr "Total:"
 
 #: js/messages.php:161 libraries/tbl_properties.inc.php:780
 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -1507,10 +1509,9 @@ msgid "Change"
 msgstr "Change"
 
 #: js/messages.php:208
-#, fuzzy
 #| msgid "Maximum execution time"
 msgid "Query execution time"
-msgstr "Maximum execution time"
+msgstr "Query execution time"
 
 #: js/messages.php:211
 msgid "Hide search criteria"
@@ -1526,10 +1527,9 @@ msgid "Ignore"
 msgstr "Ignore"
 
 #: js/messages.php:218
-#, fuzzy
 #| msgid "Add column"
 msgid "Add columns"
-msgstr "Add column"
+msgstr "Add columns"
 
 #: js/messages.php:221
 msgid "Select referenced key"
@@ -1846,13 +1846,12 @@ msgstr "Font size"
 
 #: libraries/File.class.php:220
 msgid "File was not an uploaded file."
-msgstr ""
+msgstr "File was not an uploaded file."
 
 #: libraries/File.class.php:259 libraries/File.class.php:388
-#, fuzzy
 #| msgid "Unknown error in file upload."
 msgid "Unknown error while uploading."
-msgstr "Unknown error in file upload."
+msgstr "Unknown error while uploading."
 
 #: libraries/File.class.php:277
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -1897,11 +1896,11 @@ msgstr ""
 
 #: libraries/File.class.php:507
 msgid "Error while moving uploaded file."
-msgstr ""
+msgstr "Error while moving uploaded file."
 
 #: libraries/File.class.php:515
 msgid "Cannot read (moved) upload file."
-msgstr ""
+msgstr "Cannot read (moved) upload file."
 
 #: libraries/Index.class.php:418 tbl_relation.php:526
 msgid "No index defined!"
@@ -2449,10 +2448,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s days, %s hours, %s minutes and %s seconds"
 
 #: libraries/common.lib.php:1856
-#, fuzzy
 #| msgid "Routine parameters"
 msgid "Missing parameter:"
-msgstr "Routine parameters"
+msgstr "Missing parameter:"
 
 #: libraries/common.lib.php:2162 libraries/common.lib.php:2165
 #: libraries/display_tbl.lib.php:299
@@ -6205,10 +6203,9 @@ msgstr ""
 "The following structures have either been created or altered. Here you can:"
 
 #: libraries/import.lib.php:1069
-#, fuzzy
 #| msgid "View a structure`s contents by clicking on its name"
 msgid "View a structure's contents by clicking on its name"
-msgstr "View a structure`s contents by clicking on its name"
+msgstr "View a structure's contents by clicking on its name"
 
 #: libraries/import.lib.php:1070
 msgid ""
@@ -6217,10 +6214,9 @@ msgstr ""
 "Change any of its settings by clicking the corresponding \"Options\" link"
 
 #: libraries/import.lib.php:1071
-#, fuzzy
 #| msgid "Edit its structure by following the \"Structure\" link"
 msgid "Edit structure by following the \"Structure\" link"
-msgstr "Edit its structure by following the \"Structure\" link"
+msgstr "Edit structure by following the \"Structure\" link"
 
 #: libraries/import.lib.php:1074
 msgid "Go to database"
@@ -9004,13 +9000,12 @@ msgstr "All status variables"
 
 #: server_status.php:619
 msgid "Monitor"
-msgstr ""
+msgstr "Monitor"
 
 #: server_status.php:629 server_status.php:651
-#, fuzzy
 #| msgid "Refresh rate:"
 msgid "Refresh rate: "
-msgstr "Refresh rate:"
+msgstr "Refresh rate: "
 
 #: server_status.php:672
 msgid "Containing the word:"
@@ -9030,10 +9025,10 @@ msgstr "Related links:"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: server_status.php:738
-#, fuzzy, php-format
+#, php-format
 #| msgid "Network traffic since startup: %s"
 msgid "Questions since startup: %s"
-msgstr "Network traffic since startup: %s"
+msgstr "Questions since startup: %s"
 
 #: server_status.php:744 server_status.php:779 server_status.php:895
 #: server_status.php:940
@@ -9063,10 +9058,10 @@ msgid "Network traffic since startup: %s"
 msgstr "Network traffic since startup: %s"
 
 #: server_status.php:852
-#, fuzzy, php-format
+#, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
-msgstr "This MySQL server has been running for %s. It started up on %s."
+msgstr "This MySQL server has been running for %1$s. It started up on %2$s."
 
 #: server_status.php:862
 msgid ""
@@ -9142,6 +9137,8 @@ msgid ""
 "The number of connections that were aborted because the client died without "
 "closing the connection properly."
 msgstr ""
+"The number of connections that were aborted because the client died without "
+"closing the connection properly."
 
 #: server_status.php:1076
 msgid "The number of failed attempts to connect to the MySQL server."
@@ -9797,52 +9794,46 @@ msgid "The number of threads that are not sleeping."
 msgstr "The number of threads that are not sleeping."
 
 #: server_status.php:1320
-#, fuzzy
 #| msgid "Start row"
 msgid "Start Monitor"
-msgstr "Start row"
+msgstr "Start Monitor"
 
 #: server_status.php:1328
-#, fuzzy
 #| msgid "Introduction"
 msgid "Instructions/Setup"
-msgstr "Introduction"
+msgstr "Instructions/Setup"
 
 #: server_status.php:1332
 msgid "Done rearranging/editing charts"
-msgstr ""
+msgstr "Done rearranging/editing charts"
 
 #: server_status.php:1339
-#, fuzzy
 #| msgid "Add parameter"
 msgid "Add chart"
-msgstr "Add parameter"
+msgstr "Add chart"
 
 #: server_status.php:1341
 msgid "Rearrange/edit charts"
-msgstr ""
+msgstr "Rearrange/edit charts"
 
 #: server_status.php:1343
 msgid "Refresh rate:"
 msgstr "Refresh rate:"
 
 #: server_status.php:1346
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Chart columns:"
-msgstr "Textarea columns"
+msgstr "Chart columns:"
 
 #: server_status.php:1360
-#, fuzzy
 #| msgid "User for config auth"
 msgid "Clear monitor config"
-msgstr "User for config auth"
+msgstr "Clear monitor config"
 
 #: server_status.php:1363
-#, fuzzy
 #| msgid "Introduction"
 msgid "Monitor Instructions"
-msgstr "Introduction"
+msgstr "Monitor Instructions"
 
 #: server_status.php:1364
 msgid ""
@@ -9852,6 +9843,13 @@ msgid ""
 "enabled. Note however, that the general_log produces a lot of data and "
 "increases server load by up to 15%"
 msgstr ""
+"The phpMyAdmin Monitor can assist you in optimising the server configuration "
+"and track down time intensive\n"
+"        queries. For the latter you will need to set log_output to 'TABLE' "
+"and have either the slow_query_log or general_log enabled. Note however, "
+"that the\n"
+"        general_log produces a lot of data and increases server load by up "
+"to 15%"
 
 #: server_status.php:1371
 msgid ""
@@ -9864,6 +9862,17 @@ msgid ""
 "will load statistics from the logs helping you find what caused the activity "
 "spike.</p>"
 msgstr ""
+"<b>Using the monitor:</b><br/>\n"
+"        Ok, you are good to go! Once you click 'Start monitor' your browser "
+"will refresh all displayed charts\n"
+"        in a regular interval. You may add charts and change the refresh "
+"rate under 'Settings', or remove any chart\n"
+"        using the cog icon on each respective chart.\n"
+"        <p>When you get to see a sudden spike in activity, select the "
+"relevant time span on any chart by holding down the\n"
+"        left mouse button and panning over the chart. This will load "
+"statistics from the logs helping you find what caused the\n"
+"        activity spike.</p>"
 
 #: server_status.php:1375
 msgid ""
@@ -9873,86 +9882,73 @@ msgid ""
 "disable the general_log and empty its table once monitoring is not required "
 "any more."
 msgstr ""
+"<b>Please note:</b>\n"
+"        Enabling the general_log may increase the server load by 5-15%. Also "
+"be aware that generating statistics from the logs is a\n"
+"        load intensive task, so it is advisable to select only a small time "
+"span and to disable the general_log and empty its table once monitoring is "
+"not required any more.\n"
+"        "
 
 #: server_status.php:1385
-#, fuzzy
-#| msgid "Usage"
 msgid "CPU Usage"
-msgstr "Usage"
+msgstr "CPU Usage"
 
 #: server_status.php:1388
-#, fuzzy
-#| msgid "2. Usage"
 msgid "Memory Usage"
-msgstr "2. Usage"
+msgstr "Memory Usage"
 
 #: server_status.php:1391
-#, fuzzy
-#| msgid "Usage"
 msgid "Swap Usage"
-msgstr "Usage"
+msgstr "Swap Usage"
 
 #: server_status.php:1394
-#, fuzzy
-#| msgid "All status variables"
 msgid "Status variable(s)"
-msgstr "All status variables"
+msgstr "Status variable(s)"
 
 #: server_status.php:1396
-#, fuzzy
-#| msgid "Select Tables"
 msgid "Select series:"
-msgstr "Select Tables"
+msgstr "Select series:"
 
 #: server_status.php:1398
 msgid "Commonly monitored"
-msgstr ""
+msgstr "Commonly monitored"
 
 #: server_status.php:1413
-#, fuzzy
-#| msgid "You must provide a valid table name"
 msgid "or type variable name:"
-msgstr "You must provide a valid table name"
+msgstr "or type variable name:"
 
 #: server_status.php:1417
 msgid "Display as differential value"
-msgstr ""
+msgstr "Display as differential value"
 
 #: server_status.php:1419
 msgid "Apply a divisor"
-msgstr ""
+msgstr "Apply a divisor"
 
 #: server_status.php:1426
 msgid "Append unit to data values"
-msgstr ""
+msgstr "Append unit to data values"
 
 #: server_status.php:1432
-#, fuzzy
-#| msgid "Add trigger"
 msgid "Add this series"
-msgstr "Add trigger"
+msgstr "Add this series"
 
 #: server_status.php:1434
 msgid "Clear series"
-msgstr ""
+msgstr "Clear series"
 
 #: server_status.php:1437
-#, fuzzy
-#| msgid "Series:"
 msgid "Series in Chart:"
-msgstr "Series:"
+msgstr "Series in Chart:"
 
 #: server_status.php:1445
-#, fuzzy
-#| msgid "Loading"
 msgid "Loading logs"
-msgstr "Loading"
+msgstr "Loading logs"
 
 #: server_status.php:1448
-#, fuzzy
-#| msgid "Show statistics"
 msgid "Log statistics"
-msgstr "Show statistics"
+msgstr "Log statistics"
 
 #: server_status.php:1449
 msgid "Selected time range:"
@@ -9960,11 +9956,11 @@ msgstr "Selected time range:"
 
 #: server_status.php:1454
 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements"
-msgstr ""
+msgstr "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements"
 
 #: server_status.php:1459
 msgid "Remove variable data in INSERT statements for better grouping"
-msgstr ""
+msgstr "Remove variable data in INSERT statements for better grouping"
 
 #: server_status.php:1462
 msgid ""
@@ -9975,10 +9971,8 @@ msgstr ""
 "Results are grouped by query text."
 
 #: server_status.php:1465
-#, fuzzy
-#| msgid "Query type"
 msgid "Query analyzer"
-msgstr "Query type"
+msgstr "Query analyser"
 
 #: server_status.php:1501
 #, php-format
diff --git a/po/es.po b/po/es.po
index 2caea9824d..a3464a24f1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -4,13 +4,13 @@ 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-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-27 16:54+0200\n"
+"PO-Revision-Date: 2011-08-01 18:53+0200\n"
 "Last-Translator: Matías Bellone <matiasbellone@gmail.com>\n"
 "Language-Team: spanish <es@li.org>\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -1326,7 +1326,6 @@ msgid "Analysing & loading logs. This may take a while."
 msgstr "Analizando y cargando registros. Esto puede demorar."
 
 #: js/messages.php:143
-#, fuzzy
 #| msgid ""
 #| "This columns shows the amount of identical queries that are grouped "
 #| "together. However only the SQL Text is being compared, thus the queries "
@@ -1337,8 +1336,9 @@ msgid ""
 "the other attributes of queries, such as start time, may differ."
 msgstr ""
 "Esta columna muestra la cantidad de consultas idénticas que fueron "
-"agrupadas. Sin embargo, sólo el texto SQL es comparado, por lo que los demás "
-"atributos de las consultas como el tiempo de inicio podría diferir."
+"agrupadas. Sin embargo, sólo la consulta SQL en sí es es utilizada para "
+"agrupar, por lo que los demás atributos de las consultas como el tiempo de "
+"inicio podría diferir."
 
 #: js/messages.php:144
 msgid ""
@@ -1360,11 +1360,11 @@ msgid "Jump to Log table"
 msgstr "Saltar a la tabla de registros"
 
 #: js/messages.php:148
-#, fuzzy
 #| msgid "Log analysed, but not data found in this time span."
 msgid "Log analysed, but no data found in this time span."
 msgstr ""
-"Registros analizados, pero no se encontraron datos en este período de tiempo."
+"Registros analizados, pero no se encontraron datos en este período de "
+"tiempo."
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
@@ -1381,10 +1381,9 @@ msgid "Filter queries by word/regexp:"
 msgstr "Filtrar consultas por palabra/expresión regular:"
 
 #: js/messages.php:155
-#, fuzzy
 #| msgid "Group queries, ignoring variable data in WHERE statements"
 msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr "Agrupar consultas, ignorando datos variables en sentencias WHERE"
+msgstr "Agrupar consultas ignorando datos variables en sentencias WHERE"
 
 #: js/messages.php:156
 msgid "Sum of grouped rows:"
@@ -10061,7 +10060,6 @@ msgid "Monitor Instructions"
 msgstr "Instrucciones de monitorización"
 
 #: server_status.php:1364
-#, fuzzy
 #| msgid ""
 #| "The phpMyAdmin Monitor can assist you in optimizing the server "
 #| "configuration and track down time intensive\n"
@@ -10077,14 +10075,14 @@ msgid ""
 "enabled. Note however, that the general_log produces a lot of data and "
 "increases server load by up to 15%"
 msgstr ""
-"El monitorizador de phpMyAdmin puede asistir en la optimización de la "
+"El Monitorizador de phpMyAdmin puede asistir en la optimización de la "
 "configuración del servidor y rastrear consultas que toman mucho tiempo. Para "
 "esto último necesitará que «log_output» esté definido como 'TABLE' y tener "
-"activado «slow_query_log» o «general_log». Note, sin embargo, que «general_log» "
-"produce mucha información y aumenta la carga en el servidor hasta en un 15%"
+"activado «slow_query_log» o «general_log». Note, sin embargo, que "
+"«general_log» produce mucha información y aumenta la carga en el servidor "
+"hasta en un 15%"
 
 #: server_status.php:1371
-#, fuzzy
 #| msgid ""
 #| "<b>Using the monitor:</b><br/>\n"
 #| "        Ok, you are good to go! Once you click 'Start monitor' your "
@@ -10107,19 +10105,17 @@ msgid ""
 "will load statistics from the logs helping you find what caused the activity "
 "spike.</p>"
 msgstr ""
-"<b>Utilizando el monitorizador:</b><br />\n"
-"¡Ya estás listo! Una vez que pulses en 'Iniciar monitorización' el navegador "
-"actualizará a intervalos regulares todos los gráficos mostrados. Podría "
-"agregar gráficos y cambiar la velocidad de actualización en 'Configuración', "
-"o eliminar cualquier gráfico utilizando el icono de rueda dentada en cada "
-"gráfico.\n"
-"<p>Cuando vea un pico repentino de actividad, seleccione el intervalo de "
-"tiempo relevante en el gráfico manteniendo pulsado el botón izquierdo y "
-"arrastrando sobre el gráfico. Esto cargará las estadísticas de los "
-"registros, lo que lo ayudará a encontrar la causa del pico de actividad.</p>"
+"<b>Utilizando el monitorizador:</b><br /> ¡Ya está listo! Una vez que pulse "
+"en 'Iniciar monitorización' el navegador actualizará a intervalos regulares "
+"todos los gráficos mostrados. Puede agregar gráficos y cambiar la velocidad "
+"de actualización en la sección 'Configuración' o eliminar cualquier gráfico "
+"utilizando el icono de rueda dentada en cada gráfico. <p>Cuando vea un pico "
+"repentino de actividad, seleccione el intervalo de tiempo relevante en el "
+"gráfico manteniendo pulsado el botón izquierdo y arrastrando sobre el "
+"gráfico. Esto cargará las estadísticas de los registros, lo que lo ayudará a "
+"encontrar la causa del pico de actividad.</p>"
 
 #: server_status.php:1375
-#, fuzzy
 #| msgid ""
 #| "<b>Please note:</b>\n"
 #| "        Enabling the general_log may increase the server load by 5-15%. "
@@ -10135,13 +10131,12 @@ msgid ""
 "disable the general_log and empty its table once monitoring is not required "
 "any more."
 msgstr ""
-"<b>Notar que:</b>\n"
-"Activar «general_log» puede aumentar la carga en el servidor hasta un 5-15%. "
-"También esté al tanto que generar estadísticas de los registros es una tarea "
-"muy intensiva por lo que se recomienda seleccionar un período de tiempo lo "
-"más pequeño posible y desactivar «general_log» y vaciar sus tablas una vez "
-"que ya no se necesite monitorizar.\n"
-"        "
+"<b>Notar que:</b> Activar «general_log» puede aumentar la carga en el "
+"servidor hasta un 5-15%. También esté al tanto que generar estadísticas de "
+"los registros es una tarea muy intensiva por lo que se recomienda "
+"seleccionar un período de tiempo lo más pequeño posible y desactivar "
+"«general_log» y vaciar sus tablas una vez que ya no se necesite monitorizar. "
+"       "
 
 #: server_status.php:1385
 msgid "CPU Usage"
diff --git a/po/fr.po b/po/fr.po
index d2c1ff72ed..b7488f0b56 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -4,13 +4,13 @@ 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-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-16 14:57+0200\n"
+"PO-Revision-Date: 2011-08-01 12:56+0200\n"
 "Last-Translator: Marc Delisle <marc@infomarc.info>\n"
 "Language-Team: french <fr@li.org>\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -1129,15 +1129,14 @@ msgstr "Connexions / Processus"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:87
-#, fuzzy
 #| msgid "Connections since last refresh"
 msgid "Questions since last refresh"
-msgstr "Connexions depuis le dernier rafraîchissement"
+msgstr "Questions depuis le dernier rafraîchissement"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:89
 msgid "Questions (executed statements by the server)"
-msgstr ""
+msgstr "Questions (énoncés exécutés par le serveur)"
 
 #: js/messages.php:91 server_status.php:617
 msgid "Query statistics"
@@ -1145,15 +1144,15 @@ msgstr "Statistiques sur les requêtes"
 
 #: js/messages.php:94
 msgid "System CPU Usage"
-msgstr ""
+msgstr "Utilisation processeur"
 
 #: js/messages.php:95
 msgid "System memory"
-msgstr ""
+msgstr "Mémoire système"
 
 #: js/messages.php:96
 msgid "System swap"
-msgstr ""
+msgstr "Zone d'échange (swap)"
 
 #: js/messages.php:97 libraries/common.lib.php:1274 server_status.php:1422
 msgid "MiB"
@@ -1165,14 +1164,13 @@ msgstr "Kio"
 
 #: js/messages.php:100
 msgid "Average load"
-msgstr ""
+msgstr "Charge moyenne"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:102
-#, fuzzy
 #| msgid "Suggestions:"
 msgid "Questions"
-msgstr "Suggestions&nbsp;:"
+msgstr "Questions"
 
 #: js/messages.php:103 server_status.php:894
 msgid "Traffic"
@@ -1184,24 +1182,22 @@ msgid "Settings"
 msgstr "Paramètres"
 
 #: js/messages.php:105
-#, fuzzy
 #| msgid "Remove database"
 msgid "Remove chart"
-msgstr "Supprimer la base de données"
+msgstr "Supprimer le graphique"
 
 #: js/messages.php:106
 msgid "Edit labels and series"
-msgstr ""
+msgstr "Éditer étiquettes et séries"
 
 #: js/messages.php:107
-#, fuzzy
 #| msgid "Snap to grid"
 msgid "Add chart to grid"
-msgstr "Accrocher à la grille"
+msgstr "Ajouter graphique à la grille"
 
 #: js/messages.php:109
 msgid "Please add at least one variable to the series"
-msgstr ""
+msgstr "Veuillez ajouter au moins une variable à la série"
 
 #: js/messages.php:110 libraries/display_export.lib.php:306
 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1052
@@ -1212,35 +1208,35 @@ msgstr "Aucune"
 
 #: js/messages.php:111
 msgid "Resume monitor"
-msgstr ""
+msgstr "Reprendre la surveillance"
 
 #: js/messages.php:112
 msgid "Pause monitor"
-msgstr ""
+msgstr "Mettre la surveillance en pause"
 
 #: js/messages.php:114
 msgid "general_log and slow_query_log are enabled."
-msgstr ""
+msgstr "general_log et slow_query_log sont activés."
 
 #: js/messages.php:115
 msgid "general_log is enabled."
-msgstr ""
+msgstr "general_log est activé."
 
 #: js/messages.php:116
 msgid "slow_query_log is enabled."
-msgstr ""
+msgstr "slow_query_log est activé."
 
 #: js/messages.php:117
 msgid "slow_query_log and general_log are disabled."
-msgstr ""
+msgstr "general_log et slow_query_log sont désactivés."
 
 #: js/messages.php:118
 msgid "log_output is not set to TABLE."
-msgstr ""
+msgstr "log_output n'est pas réglé à TABLE."
 
 #: js/messages.php:119
 msgid "log_output is set to TABLE."
-msgstr ""
+msgstr "log_output est réglé à TABLE."
 
 #: js/messages.php:120
 #, php-format
@@ -1249,92 +1245,96 @@ msgid ""
 "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
 "depending on your system."
 msgstr ""
+"slow_query_log est activé, mais le serveur n'enregistre que les requêtes qui "
+"prennent plus de %d secondes. Il est recommandé de régler long_query_time à "
+"0-2 secondes, selon votre système."
 
 #: js/messages.php:121
 #, php-format
 msgid "long_query_time is set to %d second(s)."
-msgstr ""
+msgstr "long_query_time est réglé à %d seconde(s)."
 
 #: js/messages.php:122
 msgid ""
 "Following settings will be applied globally and reset to default on server "
 "restart:"
 msgstr ""
+"Les réglages suivants seront appliqués globalement et remis à la valeur par "
+"défaut lors du rémarrage du serveur :"
 
 #. l10n: %s is FILE or TABLE
 #: js/messages.php:124
-#, fuzzy, php-format
+#, php-format
 #| msgid "Save output to a file"
 msgid "Set log_output to %s"
-msgstr "Diriger la sortie vers un fichier"
+msgstr "Régler log_output à %s"
 
 #. l10n: Enable in this context means setting a status variable to ON
 #: js/messages.php:126
-#, fuzzy, php-format
+#, php-format
 #| msgid "Enabled"
 msgid "Enable %s"
-msgstr "Activé"
+msgstr "Activer %s"
 
 #. l10n: Disable in this context means setting a status variable to OFF
 #: js/messages.php:128
-#, fuzzy, php-format
+#, php-format
 #| msgid "Disabled"
 msgid "Disable %s"
-msgstr "Désactivé"
+msgstr "Désactiver %s"
 
 #. l10n: %d seconds
 #: js/messages.php:130
 #, php-format
 msgid "Set long_query_time to %ds"
-msgstr ""
+msgstr "Régler long_query_time à %ds"
 
 #: js/messages.php:131
 msgid ""
 "You can't change these variables. Please log in as root or contact your "
 "database administrator."
 msgstr ""
+"Vous ne pouvez changer ces variables. Connectez-vous en tant que root ou "
+"contactez l'administrateur du serveur."
 
 #: js/messages.php:132
-#, fuzzy
 #| msgid "Manage your settings"
 msgid "Change settings"
-msgstr "Gérer vos paramètres"
+msgstr "Changer les paramètres"
 
 #: js/messages.php:133
-#, fuzzy
 #| msgid "More settings"
 msgid "Current settings"
-msgstr "Plus de paramètres"
+msgstr "Paramètres courants"
 
 #: js/messages.php:135 server_status.php:1382
-#, fuzzy
-#| msgid "Chart title"
 msgid "Chart Title"
 msgstr "Titre du graphique"
 
 #. l10n: As in differential values
 #: js/messages.php:137
-#, fuzzy
 #| msgid "Difference"
 msgid "Differential"
-msgstr "Différence"
+msgstr "Différentiel"
 
 #: js/messages.php:138
 #, php-format
 msgid "Divided by %s:"
-msgstr ""
+msgstr "Divisé par %s:"
 
 #: js/messages.php:140
 msgid "From slow log"
-msgstr ""
+msgstr "Depuis le journal des requêtes lentes (slow log)"
 
 #: js/messages.php:141
 msgid "From general log"
-msgstr ""
+msgstr "Depuis le journal général"
 
 #: js/messages.php:142
 msgid "Analysing & loading logs. This may take a while."
 msgstr ""
+"Analyse et chargement des journaux en cours. Ceci peut prendre un certain "
+"temps."
 
 #: js/messages.php:143
 msgid ""
@@ -1342,6 +1342,10 @@ msgid ""
 "However only the SQL query itself has been used as a grouping criteria, so "
 "the other attributes of queries, such as start time, may differ."
 msgstr ""
+"Cette colonne montre le nombre de requêtes identiques qui sont regroupées. "
+"Cependant, seulement le texte SQL de la requête a été utilisé comme critère "
+"de regroupement, donc les autres propriétés des requêtes, comme l'heure de "
+"début, peuvent différer."
 
 #: js/messages.php:144
 msgid ""
@@ -1349,27 +1353,27 @@ msgid ""
 "same table are also being grouped together, disregarding of the inserted "
 "data."
 msgstr ""
+"Puisque le groupement des requêtes INSERT a été sélectionné, les requêtes "
+"INSERT vers une même table sont groupées, peu importe les données insérées."
 
 #: js/messages.php:145
 msgid "Log data loaded. Queries executed in this time span:"
-msgstr ""
+msgstr "Fichier journal chargé. Requêtes exécutées dans ce laps de temps :"
 
 #: js/messages.php:147
-#, fuzzy
 #| msgid "Jump to database"
 msgid "Jump to Log table"
-msgstr "Aller à la base de données"
+msgstr "Aller à la table du journal"
 
 #: js/messages.php:148
 msgid "Log analysed, but no data found in this time span."
-msgstr ""
+msgstr "Journal analysé, mais aucune donnée trouvée pour ce laps de temps."
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
-#, fuzzy
 #| msgid "Filter"
 msgid "Filters"
-msgstr "Filtre"
+msgstr "Filtres"
 
 #. l10n: Filter as in "Start Filtering"
 #: js/messages.php:153 navigation.php:270
@@ -1378,23 +1382,21 @@ msgstr "Filtre"
 
 #: js/messages.php:154
 msgid "Filter queries by word/regexp:"
-msgstr ""
+msgstr "Filtrer les requêtes par mot ou expression régulière :"
 
 #: js/messages.php:155
 msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr ""
+msgstr "Grouper les requêtes en ignorant la partie variable des clauses WHERE"
 
 #: js/messages.php:156
-#, fuzzy
 #| msgid "Number of inserted rows"
 msgid "Sum of grouped rows:"
-msgstr "Nombre de lignes à insérer"
+msgstr "Somme des lignes regroupées :"
 
 #: js/messages.php:157
-#, fuzzy
 #| msgid "Total"
 msgid "Total:"
-msgstr "Total"
+msgstr "Total :"
 
 #: js/messages.php:161 libraries/tbl_properties.inc.php:780
 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -1531,10 +1533,9 @@ msgid "Change"
 msgstr "Modifier"
 
 #: js/messages.php:208
-#, fuzzy
 #| msgid "Maximum execution time"
 msgid "Query execution time"
-msgstr "Durée maximum d'exécution"
+msgstr "Durée d'exécution de la requête"
 
 #: js/messages.php:211
 msgid "Hide search criteria"
@@ -1550,10 +1551,9 @@ msgid "Ignore"
 msgstr "Ignorer"
 
 #: js/messages.php:218
-#, fuzzy
 #| msgid "Add column"
 msgid "Add columns"
-msgstr "Ajouter une colonne"
+msgstr "Ajouter des colonnes"
 
 #: js/messages.php:221
 msgid "Select referenced key"
@@ -1870,13 +1870,12 @@ msgstr "Taille du texte"
 
 #: libraries/File.class.php:220
 msgid "File was not an uploaded file."
-msgstr ""
+msgstr "Le fichier n'était pas un fichier téléversé."
 
 #: libraries/File.class.php:259 libraries/File.class.php:388
-#, fuzzy
 #| msgid "Unknown error in file upload."
 msgid "Unknown error while uploading."
-msgstr "Erreur inconnue durant le téléchargement."
+msgstr "Erreur inconnue durant le téléversement."
 
 #: libraries/File.class.php:277
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -1922,11 +1921,11 @@ msgstr ""
 
 #: libraries/File.class.php:507
 msgid "Error while moving uploaded file."
-msgstr ""
+msgstr "Erreur lors du déplacement du fichier téléversé."
 
 #: libraries/File.class.php:515
 msgid "Cannot read (moved) upload file."
-msgstr ""
+msgstr "Impossible de lire le fichier téléversé."
 
 #: libraries/Index.class.php:418 tbl_relation.php:526
 msgid "No index defined!"
@@ -2482,10 +2481,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s jours, %s heures, %s minutes et %s secondes"
 
 #: libraries/common.lib.php:1856
-#, fuzzy
 #| msgid "Routine parameters"
 msgid "Missing parameter:"
-msgstr "Paramètres de procédure"
+msgstr "Paramètre manquant :"
 
 #: libraries/common.lib.php:2162 libraries/common.lib.php:2165
 #: libraries/display_tbl.lib.php:299
@@ -6289,7 +6287,6 @@ msgstr ""
 "Les structures suivanates ont été créées ou modifiées. Ici vous pouvez :"
 
 #: libraries/import.lib.php:1069
-#, fuzzy
 #| msgid "View a structure`s contents by clicking on its name"
 msgid "View a structure's contents by clicking on its name"
 msgstr "Consulter le contenu d'une structure en cliquant sur son nom"
@@ -6301,7 +6298,6 @@ msgstr ""
 "Modifiez l'un des paramètres en cliquant le lien «Options» correspondant"
 
 #: libraries/import.lib.php:1071
-#, fuzzy
 #| msgid "Edit its structure by following the \"Structure\" link"
 msgid "Edit structure by following the \"Structure\" link"
 msgstr "Modifier sa structure via le lien «Structure»"
@@ -9137,10 +9133,9 @@ msgstr "Toutes les variables d'état"
 
 #: server_status.php:619
 msgid "Monitor"
-msgstr ""
+msgstr "Surveillance"
 
 #: server_status.php:629 server_status.php:651
-#, fuzzy
 #| msgid "Refresh rate:"
 msgid "Refresh rate: "
 msgstr "Taux de rafraîchissement :"
@@ -9163,10 +9158,10 @@ msgstr "Liens connexes:"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: server_status.php:738
-#, fuzzy, php-format
+#, php-format
 #| msgid "Network traffic since startup: %s"
 msgid "Questions since startup: %s"
-msgstr "Trafic réseau depuis le démarrage : %s"
+msgstr "Questions depuis le démarrage : %s"
 
 #: server_status.php:744 server_status.php:779 server_status.php:895
 #: server_status.php:940
@@ -9196,10 +9191,10 @@ msgid "Network traffic since startup: %s"
 msgstr "Trafic réseau depuis le démarrage : %s"
 
 #: server_status.php:852
-#, fuzzy, php-format
+#, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
-msgstr "Ce serveur MySQL fonctionne depuis %s. Il a démarré le %s."
+msgstr "Ce serveur MySQL fonctionne depuis %1$s. Il a démarré le %2$s."
 
 #: server_status.php:862
 msgid ""
@@ -9279,6 +9274,8 @@ msgid ""
 "The number of connections that were aborted because the client died without "
 "closing the connection properly."
 msgstr ""
+"Le nombre de connexions avortées en raison d'une interruption du client sans "
+"fermeture adéquate de la connexion."
 
 #: server_status.php:1076
 msgid "The number of failed attempts to connect to the MySQL server."
@@ -9950,52 +9947,46 @@ msgid "The number of threads that are not sleeping."
 msgstr "Le nombre de fils d'exécution non suspendus."
 
 #: server_status.php:1320
-#, fuzzy
 #| msgid "Start row"
 msgid "Start Monitor"
-msgstr "Ligne de départ"
+msgstr "Démarrer la surveillance"
 
 #: server_status.php:1328
-#, fuzzy
 #| msgid "Introduction"
 msgid "Instructions/Setup"
-msgstr "Introduction"
+msgstr "Consignes / réglages"
 
 #: server_status.php:1332
 msgid "Done rearranging/editing charts"
-msgstr ""
+msgstr "Terminé de modifier les graphiques"
 
 #: server_status.php:1339
-#, fuzzy
 #| msgid "Add parameter"
 msgid "Add chart"
-msgstr "Ajouter un paramètre"
+msgstr "Ajouter un graphique"
 
 #: server_status.php:1341
 msgid "Rearrange/edit charts"
-msgstr ""
+msgstr "Modifier les graphiques"
 
 #: server_status.php:1343
 msgid "Refresh rate:"
 msgstr "Taux de rafraîchissement :"
 
 #: server_status.php:1346
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Chart columns:"
-msgstr "Taille horizontale pour une zone de texte"
+msgstr "Colonnes du graphique :"
 
 #: server_status.php:1360
-#, fuzzy
 #| msgid "User for config auth"
 msgid "Clear monitor config"
-msgstr "Utilisateur pour méthode config"
+msgstr "Effacer la configuration de surveillance"
 
 #: server_status.php:1363
-#, fuzzy
 #| msgid "Introduction"
 msgid "Monitor Instructions"
-msgstr "Introduction"
+msgstr "Consignes pour la surveillance"
 
 #: server_status.php:1364
 msgid ""
@@ -10005,6 +9996,11 @@ msgid ""
 "enabled. Note however, that the general_log produces a lot of data and "
 "increases server load by up to 15%"
 msgstr ""
+"Le moniteur phpMyAdmin peut vous aider à optimiser la configuration serveur "
+"et à traquer les requêtes qui prennent beaucoup de temps. Pour ce faire vous "
+"devrez régler le paramètre log_output à 'TABLE' et activer le journal "
+"slow_query_log ou general_log. Cependant, general_log produit beaucoup de "
+"données et augmente jusqu'à 15% la charge du serveur"
 
 #: server_status.php:1371
 msgid ""
@@ -10017,6 +10013,15 @@ msgid ""
 "will load statistics from the logs helping you find what caused the activity "
 "spike.</p>"
 msgstr ""
+"<b>Utilisation de la surveillance :</b><br />Vous êtes maintenant prêt! "
+"Après avoir cliqué sur «Démarrer la surveillance», votre navigateur va "
+"rafraîchir les graphiques à intervalle régulier. Vous pouvez ajouter des "
+"graphiques et modifier le taux de rafraîchissement sous «Paramètres», ou "
+"supprimer tout graphique via l'cône de rouage.<p>Lorsque vous constatez un "
+"pic d'activité soudain, sélectionnez la portion de temps pertinent sur l'un "
+"des graphiques en tenant enfoncé le bouton gauche de la souris et en vous "
+"déplaçant sur le graphique. Ceci va charger les statistiques à partir des "
+"journaux et vous aidera à trouver la cause du pic dans l'activité.</p>"
 
 #: server_status.php:1375
 msgid ""
@@ -10026,112 +10031,96 @@ msgid ""
 "disable the general_log and empty its table once monitoring is not required "
 "any more."
 msgstr ""
+"<b>À noter :</b>Activer le journal general_log peut causer une augmentation "
+"de charge de 5 à 15%. Également, la génération des statistiques à partir des "
+"journaux est une tâche intensive, donc il est suggéré de ne sélectionner "
+"qu'une petite portion de temps et de désactiver general_log puis de vider la "
+"table correspondante lorsque la surveillance n'est plus requise."
 
 #: server_status.php:1385
-#, fuzzy
-#| msgid "Usage"
 msgid "CPU Usage"
-msgstr "Espace"
+msgstr "Utilisation du processeur"
 
 #: server_status.php:1388
-#, fuzzy
-#| msgid "2. Usage"
 msgid "Memory Usage"
-msgstr "2. Utilisation"
+msgstr "Utilisation de la mémoire"
 
 #: server_status.php:1391
-#, fuzzy
-#| msgid "Usage"
 msgid "Swap Usage"
-msgstr "Espace"
+msgstr "Utilisation de la zone d'échange"
 
 #: server_status.php:1394
-#, fuzzy
-#| msgid "All status variables"
 msgid "Status variable(s)"
-msgstr "Toutes les variables d'état"
+msgstr "Variables d'état"
 
 #: server_status.php:1396
-#, fuzzy
-#| msgid "Select Tables"
 msgid "Select series:"
-msgstr "Choisissez les tables"
+msgstr "Choisissez les séries :"
 
 #: server_status.php:1398
 msgid "Commonly monitored"
-msgstr ""
+msgstr "Couramment surveillés"
 
 #: server_status.php:1413
-#, fuzzy
-#| msgid "You must provide a valid table name"
 msgid "or type variable name:"
-msgstr "Vous devez fournir un nom de table valable"
+msgstr "ou entrez un nom de variable :"
 
 #: server_status.php:1417
 msgid "Display as differential value"
-msgstr ""
+msgstr "Afficher en tant que valeur différentielle"
 
 #: server_status.php:1419
 msgid "Apply a divisor"
-msgstr ""
+msgstr "Appliquer un diviseur"
 
 #: server_status.php:1426
 msgid "Append unit to data values"
-msgstr ""
+msgstr "Ajouter l'unité aux valeurs de données"
 
 #: server_status.php:1432
-#, fuzzy
-#| msgid "Add trigger"
 msgid "Add this series"
-msgstr "Ajouter un déclencheur"
+msgstr "Ajouter cette série"
 
 #: server_status.php:1434
 msgid "Clear series"
-msgstr ""
+msgstr "Effacer la série"
 
 #: server_status.php:1437
-#, fuzzy
-#| msgid "Series:"
 msgid "Series in Chart:"
-msgstr "Séries:"
+msgstr "Séries dans le graphique :"
 
 #: server_status.php:1445
-#, fuzzy
-#| msgid "Loading"
 msgid "Loading logs"
-msgstr "Chargement en cours"
+msgstr "Chargement des journaux en cours"
 
 #: server_status.php:1448
-#, fuzzy
-#| msgid "Show statistics"
 msgid "Log statistics"
-msgstr "Afficher les statistiques"
+msgstr "Statistiques des journaux"
 
 #: server_status.php:1449
-#, fuzzy
-#| msgid "Select page"
 msgid "Selected time range:"
-msgstr "Choisissez la page"
+msgstr "Sélectionnez un intervalle de temps :"
 
 #: server_status.php:1454
 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements"
-msgstr ""
+msgstr "Ne traiter que les énoncés SELECT, INSERT, UPDATE et DELETE"
 
 #: server_status.php:1459
 msgid "Remove variable data in INSERT statements for better grouping"
 msgstr ""
+"Enlever les données variables des énoncés INSERT pour un meilleur groupement"
 
 #: server_status.php:1462
 msgid ""
 "<p>Choose from which log you want the statistics to be generated from.</p> "
 "Results are grouped by query text."
 msgstr ""
+"<p>Choississez depuis quel journal les statistiques doivent être "
+"générées.</p>Les résultats sont regroupés par le texte des requêtes."
 
 #: server_status.php:1465
-#, fuzzy
-#| msgid "Query type"
 msgid "Query analyzer"
-msgstr "Type de requête"
+msgstr "Analyseur de requêtes"
 
 #: server_status.php:1501
 #, php-format
diff --git a/po/ja.po b/po/ja.po
index 45da9a4aff..a6d0479401 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -4,13 +4,13 @@ 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-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-27 12:14+0200\n"
+"PO-Revision-Date: 2011-08-02 16:09+0200\n"
 "Last-Translator: Yuichiro <yuichiro@pop07.odn.ne.jp>\n"
 "Language-Team: japanese <jp@li.org>\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -1201,27 +1201,27 @@ msgstr "モニタ一時中断"
 
 #: js/messages.php:114
 msgid "general_log and slow_query_log are enabled."
-msgstr ""
+msgstr "general_log および slow_query_log は有効です。"
 
 #: js/messages.php:115
 msgid "general_log is enabled."
-msgstr ""
+msgstr "general_log は有効です。"
 
 #: js/messages.php:116
 msgid "slow_query_log is enabled."
-msgstr ""
+msgstr "slow_query_log は有効です。"
 
 #: js/messages.php:117
 msgid "slow_query_log and general_log are disabled."
-msgstr ""
+msgstr "slow_query_log および general_log は無効です。"
 
 #: js/messages.php:118
 msgid "log_output is not set to TABLE."
-msgstr ""
+msgstr "log_output はテーブルに設定されていません。"
 
 #: js/messages.php:119
 msgid "log_output is set to TABLE."
-msgstr ""
+msgstr "log_output はテーブルに設定されています。"
 
 #: js/messages.php:120
 #, php-format
@@ -1230,11 +1230,13 @@ msgid ""
 "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
 "depending on your system."
 msgstr ""
+"slow_query_log は有効になっていますが、サーバは %d "
+"秒より長くかかるクエリだけをログに記録します。お使いのシステムによっては、long_query_time を 0～2 秒に設定したほうがいいでしょう。"
 
 #: js/messages.php:121
 #, php-format
 msgid "long_query_time is set to %d second(s)."
-msgstr ""
+msgstr "long_query_time は %d 秒に設定されています。"
 
 #: js/messages.php:122
 msgid ""
@@ -1246,10 +1248,10 @@ msgstr ""
 
 #. l10n: %s is FILE or TABLE
 #: js/messages.php:124
-#, fuzzy, php-format
+#, php-format
 #| msgid "Save output to a file"
 msgid "Set log_output to %s"
-msgstr "出力をファイルに保存する"
+msgstr "%s に log_output を設定する"
 
 #. l10n: Enable in this context means setting a status variable to ON
 #: js/messages.php:126
@@ -1267,7 +1269,7 @@ msgstr "%s を無効にする"
 #: js/messages.php:130
 #, php-format
 msgid "Set long_query_time to %ds"
-msgstr ""
+msgstr "long_query_time を %d 秒に設定する"
 
 #: js/messages.php:131
 msgid ""
@@ -1311,7 +1313,7 @@ msgstr ""
 
 #: js/messages.php:142
 msgid "Analysing & loading logs. This may take a while."
-msgstr ""
+msgstr "ログの解析および読み込み中。すこし時間がかかることがあります。"
 
 #: js/messages.php:143
 msgid ""
@@ -1329,17 +1331,16 @@ msgstr ""
 
 #: js/messages.php:145
 msgid "Log data loaded. Queries executed in this time span:"
-msgstr ""
+msgstr "ログデータを読み込みました。この期間に行われたクエリは以下の通りです。"
 
 #: js/messages.php:147
-#, fuzzy
 #| msgid "Jump to database"
 msgid "Jump to Log table"
-msgstr "データベースに移動"
+msgstr "ログの表に移動する"
 
 #: js/messages.php:148
 msgid "Log analysed, but no data found in this time span."
-msgstr ""
+msgstr "ログの解析を行いましたが、この期間のデータは見つかりませんでした。"
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
@@ -1357,7 +1358,7 @@ msgstr ""
 
 #: js/messages.php:155
 msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr ""
+msgstr "クエリをまとめる（WHERE 句内のデータ部（文字列や数値など）は同一として扱われます）"
 
 #: js/messages.php:156
 #, fuzzy
@@ -1366,10 +1367,9 @@ msgid "Sum of grouped rows:"
 msgstr "挿入する行数"
 
 #: js/messages.php:157
-#, fuzzy
 #| msgid "Total"
 msgid "Total:"
-msgstr "合計"
+msgstr "合計:"
 
 #: js/messages.php:161 libraries/tbl_properties.inc.php:780
 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -9782,10 +9782,9 @@ msgid "Start Monitor"
 msgstr "モニタ開始"
 
 #: server_status.php:1328
-#, fuzzy
 #| msgid "Introduction"
 msgid "Instructions/Setup"
-msgstr "はじめに"
+msgstr "使用方法／セットアップ"
 
 #: server_status.php:1332
 msgid "Done rearranging/editing charts"
@@ -9812,13 +9811,11 @@ msgid "Clear monitor config"
 msgstr "モニタ設定のクリア"
 
 #: server_status.php:1363
-#, fuzzy
 #| msgid "Introduction"
 msgid "Monitor Instructions"
-msgstr "はじめに"
+msgstr "モニタの使用方法"
 
 #: server_status.php:1364
-#, fuzzy
 #| msgid ""
 #| "The phpMyAdmin Monitor can assist you in optimizing the server "
 #| "configuration and track down time intensive\n"
@@ -9834,11 +9831,9 @@ msgid ""
 "enabled. Note however, that the general_log produces a lot of data and "
 "increases server load by up to 15%"
 msgstr ""
-"phpMyAdmin モニタは、サーバ構成の最適化を支援し、時間のかかるクエリを追跡する"
-"ことができます。後者の場合には、テーブルに log_output を設定し、"
-"slow_query_log または general_log のいずれかを有効にする必要があります。な"
-"お、general_log を大量のデータを生成し、サーバの負荷を 15% 増加させますので、"
-"注意するようにしてください。"
+"phpMyAdmin モニタは、サーバ構成の最適化を支援し、時間のかかるクエリを追跡することができます。後者の場合には、テーブルに log_output "
+"を設定し、slow_query_log または general_log のいずれかを有効にする必要があります。なお、general_log "
+"は大量のデータを生成し、サーバの負荷を 15% 増加させますので、注意するようにしてください。"
 
 #: server_status.php:1371
 msgid ""
@@ -9851,6 +9846,10 @@ msgid ""
 "will load statistics from the logs helping you find what caused the activity "
 "spike.</p>"
 msgstr ""
+"<b>モニタの使い方：</b><br/>「モニタ開始」をクリックすると、ブラウザは一定間隔で表示されている全てのグラフを更新します。「設定」のところより"
+"グラフを追加や再描画間隔の変更が行え、それぞれのグラフにある歯車のアイコンを通じて削除を行えます。<p>モニタリングしていてスパイク信号が見られることが"
+"あります。マウスの左ボタンを押したままグラフの上をドラッグするように移動させことで、グラフの任意の期間を選択できます。こうすることでログから統計の読み込"
+"みが行え、スパイク信号の原因を探ることができます。</p>"
 
 #: server_status.php:1375
 msgid ""
@@ -9860,6 +9859,9 @@ msgid ""
 "disable the general_log and empty its table once monitoring is not required "
 "any more."
 msgstr ""
+"<b>注意事項：</b>general_log を有効にすると、5～15% サーバの負荷が増加することがあります。ログから生成される統計は、負荷が集中す"
+"る作業であることを認識しておいてください。ですから、テーブルのモニタで必要としないのであれば、しばらくの間 general_log "
+"を無効にして空にしておくのが望ましいです。"
 
 #: server_status.php:1385
 msgid "CPU Usage"
@@ -9916,26 +9918,23 @@ msgid "Series in Chart:"
 msgstr "グラフの系列"
 
 #: server_status.php:1445
-#, fuzzy
 #| msgid "Loading"
 msgid "Loading logs"
-msgstr "読み込み中"
+msgstr "ログの読み込み"
 
 #: server_status.php:1448
-#, fuzzy
 #| msgid "Show statistics"
 msgid "Log statistics"
-msgstr "統計を表示する"
+msgstr "ログの統計"
 
 #: server_status.php:1449
-#, fuzzy
 #| msgid "Select page"
 msgid "Selected time range:"
-msgstr "ページを選択してください"
+msgstr "選択期間："
 
 #: server_status.php:1454
 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements"
-msgstr ""
+msgstr "SELECT、INSERT、UPDATE、DELETE 文のみ取得する"
 
 #: server_status.php:1459
 msgid "Remove variable data in INSERT statements for better grouping"
@@ -9945,7 +9944,7 @@ msgstr ""
 msgid ""
 "<p>Choose from which log you want the statistics to be generated from.</p> "
 "Results are grouped by query text."
-msgstr ""
+msgstr "<p>ログの統計元を選択することができます。</p>結果はクエリ文でグループ化されます。"
 
 #: server_status.php:1465
 #, fuzzy
diff --git a/po/pt_BR.po b/po/pt_BR.po
index c92c5d8688..3da0e23d7f 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-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-21 16:15+0200\n"
-"Last-Translator:  <teunome@gmail.com>\n"
+"PO-Revision-Date: 2011-07-30 02:20+0200\n"
+"Last-Translator: Julio Cesar Zuppa <juliozuppa@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"
@@ -1123,23 +1123,22 @@ msgstr "Conexões / Processos"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:87
-#, fuzzy
 #| msgid "Connections since last refresh"
 msgid "Questions since last refresh"
-msgstr "Conexões desde a última atualização"
+msgstr "Requisições desde a última atualização"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:89
 msgid "Questions (executed statements by the server)"
-msgstr ""
+msgstr "Requisições (Declarações executadas pelo servidor)"
 
 #: js/messages.php:91 server_status.php:617
 msgid "Query statistics"
-msgstr "Estatísticas de Query"
+msgstr "Estatísticas de Consultas"
 
 #: js/messages.php:94
 msgid "System CPU Usage"
-msgstr ""
+msgstr "Utilização da CPU pelo sistema"
 
 #: js/messages.php:95
 msgid "System memory"
@@ -1147,7 +1146,7 @@ msgstr "Memória do sistema"
 
 #: js/messages.php:96
 msgid "System swap"
-msgstr "Swap do sistema"
+msgstr "Área de Troca (Swap) do sistema"
 
 #: js/messages.php:97 libraries/common.lib.php:1274 server_status.php:1422
 msgid "MiB"
@@ -1163,10 +1162,9 @@ msgstr "Carga média"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:102
-#, fuzzy
 #| msgid "Versions"
 msgid "Questions"
-msgstr "Versões"
+msgstr "Requisições"
 
 #: js/messages.php:103 server_status.php:894
 msgid "Traffic"
@@ -1174,30 +1172,31 @@ msgstr "Tráfego"
 
 #: js/messages.php:104 libraries/server_links.inc.php:73
 #: server_status.php:1324
-#, fuzzy
 #| msgid "General relation features"
 msgid "Settings"
-msgstr "Recursos de relações gerais"
+msgstr "Configurações"
 
+# The word "chart" in brasilian portuguese can mean either "Table = tabela" or "Report = relatório" or "Chart = gráfico" or "Diagram = diagrama". So, it depends of the context.
 #: js/messages.php:105
 #, fuzzy
 #| msgid "Remove database"
 msgid "Remove chart"
-msgstr "Remover Banco de Dados"
+msgstr "Remover Gráfico/Tabela ou Relatório"
 
 #: js/messages.php:106
 msgid "Edit labels and series"
 msgstr "Editar rótulos e séries."
 
+# The word "chart" in brasilian portuguese can mean either "Table = tabela" or "Report = relatório" or "Chart = gráfico" or "Diagram = diagrama". So, it depends of the context.
 #: js/messages.php:107
 #, fuzzy
 #| msgid "Snap to grid"
 msgid "Add chart to grid"
-msgstr "Ajustar à grade"
+msgstr "Adicionar Gráfico/Tabela ou Relatório ajustado na grade"
 
 #: js/messages.php:109
 msgid "Please add at least one variable to the series"
-msgstr "Por favor adicione ao menos uma variável a série"
+msgstr "Por favor adicione no mínimo uma variável à série"
 
 #: js/messages.php:110 libraries/display_export.lib.php:306
 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1052
@@ -1208,39 +1207,37 @@ msgstr "Nenhum"
 
 #: js/messages.php:111
 msgid "Resume monitor"
-msgstr ""
+msgstr "Continuar o monitoramento"
 
 #: js/messages.php:112
 msgid "Pause monitor"
-msgstr ""
+msgstr "Pausar o monitoramento"
 
 #: js/messages.php:114
-#, fuzzy
 #| msgid "general_log and slow_query_log is enabled."
 msgid "general_log and slow_query_log are enabled."
-msgstr "general_log e slow_query_log estão ativados."
+msgstr "\"general_log\" e \"slow_query_log\" estão ativados."
 
 #: js/messages.php:115
 msgid "general_log is enabled."
-msgstr "general_log está ativado."
+msgstr "\"general_log\" está ativado."
 
 #: js/messages.php:116
 msgid "slow_query_log is enabled."
-msgstr "slow_query_log está ativado."
+msgstr "\"slow_query_log\" está ativado."
 
 #: js/messages.php:117
-#, fuzzy
 #| msgid "slow_query_log and general_log is disabled."
 msgid "slow_query_log and general_log are disabled."
-msgstr "slow_query_log e general_log estão desativados."
+msgstr "\"slow_query_log\" e \"general_log\" estão desativados."
 
 #: js/messages.php:118
 msgid "log_output is not set to TABLE."
-msgstr ""
+msgstr "\"log_output\" não está definido para a TABELA"
 
 #: js/messages.php:119
 msgid "log_output is set to TABLE."
-msgstr ""
+msgstr "\"log_output\" está definido para a TABELA"
 
 #: js/messages.php:120
 #, php-format
@@ -1249,14 +1246,14 @@ msgid ""
 "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
 "depending on your system."
 msgstr ""
-"slow_query_log está ativado, mas o servidor faz o log apenas de queries que "
-"demoram mais do que %d segundos. É aconselhado alterar essa long_query_time "
-"0-2 segundos, dependendo do seu sistema."
+"\"slow_query_log\" está ativado, mas o servidor registra (log) apenas "
+"consultas que demoram mais do que %d segundos. Então, é aconselhado definir "
+"\"long_query_time\" de 0-2 segundos, dependendo do seu sistema."
 
 #: js/messages.php:121
 #, php-format
 msgid "long_query_time is set to %d second(s)."
-msgstr "long_query_time está definida para %d segundo(s)."
+msgstr "\"long_query_time\" está definida para %d segundo(s)."
 
 #: js/messages.php:122
 msgid ""
@@ -1268,56 +1265,55 @@ msgstr ""
 
 #. l10n: %s is FILE or TABLE
 #: js/messages.php:124
-#, fuzzy, php-format
+#, php-format
 #| msgid "Save as file"
 msgid "Set log_output to %s"
-msgstr "Enviado"
+msgstr "Definir \"log_output\" para %s"
 
 #. l10n: Enable in this context means setting a status variable to ON
 #: js/messages.php:126
-#, fuzzy, php-format
+#, php-format
 #| msgid "Enabled"
 msgid "Enable %s"
-msgstr "Habilitado"
+msgstr "Habilitar %s"
 
 #. l10n: Disable in this context means setting a status variable to OFF
 #: js/messages.php:128
-#, fuzzy, php-format
+#, php-format
 #| msgid "Disabled"
 msgid "Disable %s"
-msgstr "Desabilitado"
+msgstr "Desabilitar %s"
 
 #. l10n: %d seconds
 #: js/messages.php:130
 #, php-format
 msgid "Set long_query_time to %ds"
-msgstr "Definir long_query_time para %ds"
+msgstr "Definir \"long_query_time\" para %ds"
 
 #: js/messages.php:131
 msgid ""
 "You can't change these variables. Please log in as root or contact your "
 "database administrator."
 msgstr ""
-"Você não pode alterar essas variáveis. Por favor faça o log como root ou "
-"entre em contato com o administrador."
+"Você não tem permissão para alterar essas variáveis. Por favor, autentique-"
+"se como usuário \"Root\" ou entre em contato com seu administrador do banco de "
+"dados."
 
 #: js/messages.php:132
-#, fuzzy
 #| msgid "General relation features"
 msgid "Change settings"
-msgstr "Recursos de relações gerais"
+msgstr "Alterar configurações"
 
 #: js/messages.php:133
-#, fuzzy
 #| msgid "General relation features"
 msgid "Current settings"
-msgstr "Recursos de relações gerais"
+msgstr "Configurações atuais"
 
+# The word "chart" in brasilian portuguese can mean either "Table = tabela" or "Report = relatório" or "Chart = gráfico" or "Diagram = diagrama". So, it depends of the context.
 #: js/messages.php:135 server_status.php:1382
-#, fuzzy
 #| msgid "Report title"
 msgid "Chart Title"
-msgstr "Título do Relatório"
+msgstr "Título do Relatório/Gráfico ou Tabela"
 
 #. l10n: As in differential values
 #: js/messages.php:137
diff --git a/po/sv.po b/po/sv.po
index 52fc29e988..e014c8a295 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -4,13 +4,13 @@ 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-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-07 21:24+0200\n"
+"PO-Revision-Date: 2011-07-31 21:19+0200\n"
 "Last-Translator:  <stefan@inkopsforum.se>\n"
 "Language-Team: swedish <sv@li.org>\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -1115,15 +1115,14 @@ msgstr "Förbindelser / Processer"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:87
-#, fuzzy
 #| msgid "Connections since last refresh"
 msgid "Questions since last refresh"
-msgstr "Anslutningar sedan förra uppdateringen"
+msgstr "Frågor sedan förra uppdateringen"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:89
 msgid "Questions (executed statements by the server)"
-msgstr ""
+msgstr "Frågor (utförda kommandon från servern)"
 
 #: js/messages.php:91 server_status.php:617
 msgid "Query statistics"
@@ -1131,15 +1130,15 @@ msgstr "Visa statistik"
 
 #: js/messages.php:94
 msgid "System CPU Usage"
-msgstr ""
+msgstr "System processoranvändning"
 
 #: js/messages.php:95
 msgid "System memory"
-msgstr ""
+msgstr "Systemminne"
 
 #: js/messages.php:96
 msgid "System swap"
-msgstr ""
+msgstr "System swap"
 
 #: js/messages.php:97 libraries/common.lib.php:1274 server_status.php:1422
 msgid "MiB"
@@ -1151,14 +1150,13 @@ msgstr "KiB"
 
 #: js/messages.php:100
 msgid "Average load"
-msgstr ""
+msgstr "Genomsnittlig belastning"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: js/messages.php:102
-#, fuzzy
 #| msgid "Versions"
 msgid "Questions"
-msgstr "Versioner"
+msgstr "Frågor"
 
 #: js/messages.php:103 server_status.php:894
 msgid "Traffic"
@@ -1170,24 +1168,22 @@ msgid "Settings"
 msgstr "Inställningar"
 
 #: js/messages.php:105
-#, fuzzy
 #| msgid "Remove database"
 msgid "Remove chart"
-msgstr "Radera databasen"
+msgstr "Ta bort diagram"
 
 #: js/messages.php:106
 msgid "Edit labels and series"
-msgstr ""
+msgstr "Redigera etiketter och serier"
 
 #: js/messages.php:107
-#, fuzzy
 #| msgid "Snap to grid"
 msgid "Add chart to grid"
-msgstr "Fäst vid rutnät"
+msgstr "Adders diagrammet till rutnätet"
 
 #: js/messages.php:109
 msgid "Please add at least one variable to the series"
-msgstr ""
+msgstr "Lägg till minst en variabel till serien"
 
 #: js/messages.php:110 libraries/display_export.lib.php:306
 #: libraries/display_tbl.lib.php:561 libraries/export/sql.php:1052
@@ -1198,35 +1194,35 @@ msgstr "Inget"
 
 #: js/messages.php:111
 msgid "Resume monitor"
-msgstr ""
+msgstr "Återuppta monitor"
 
 #: js/messages.php:112
 msgid "Pause monitor"
-msgstr ""
+msgstr "Pausa monitor"
 
 #: js/messages.php:114
 msgid "general_log and slow_query_log are enabled."
-msgstr ""
+msgstr "general_log och slow_query_log är aktiverade."
 
 #: js/messages.php:115
 msgid "general_log is enabled."
-msgstr ""
+msgstr "general_log är aktiverad."
 
 #: js/messages.php:116
 msgid "slow_query_log is enabled."
-msgstr ""
+msgstr "slow_query_log är aktiverad."
 
 #: js/messages.php:117
 msgid "slow_query_log and general_log are disabled."
-msgstr ""
+msgstr "slow_query_log och general_log är deaktiverade."
 
 #: js/messages.php:118
 msgid "log_output is not set to TABLE."
-msgstr ""
+msgstr "log_output är inte definierad som TABLE."
 
 #: js/messages.php:119
 msgid "log_output is set to TABLE."
-msgstr ""
+msgstr "log_output är definerad som TABLE."
 
 #: js/messages.php:120
 #, php-format
@@ -1235,92 +1231,94 @@ msgid ""
 "than %d seconds. It is advisable to set this long_query_time 0-2 seconds, "
 "depending on your system."
 msgstr ""
+"slow_query_log är aktiverad, men servern loggar endast frågor som tar längre "
+"tid än% d sekunder. Det är lämpligt att definiera long_query_time till 0-2 "
+"sekunder, beroende på ditt system."
 
 #: js/messages.php:121
 #, php-format
 msgid "long_query_time is set to %d second(s)."
-msgstr ""
+msgstr "long_query_time är definerad till %d sekund(er)."
 
 #: js/messages.php:122
 msgid ""
 "Following settings will be applied globally and reset to default on server "
 "restart:"
 msgstr ""
+"Följande inställningar kommer appliceras globalt och återställs till "
+"standardvärdet när servern startas om:"
 
 #. l10n: %s is FILE or TABLE
 #: js/messages.php:124
-#, fuzzy, php-format
+#, php-format
 #| msgid "Save output to a file"
 msgid "Set log_output to %s"
-msgstr "Spara utdata till en fil"
+msgstr "Sätt log_output till %s"
 
 #. l10n: Enable in this context means setting a status variable to ON
 #: js/messages.php:126
-#, fuzzy, php-format
+#, php-format
 #| msgid "Enabled"
 msgid "Enable %s"
-msgstr "Aktiverat"
+msgstr "Aktivera %s"
 
 #. l10n: Disable in this context means setting a status variable to OFF
 #: js/messages.php:128
-#, fuzzy, php-format
+#, php-format
 #| msgid "Disabled"
 msgid "Disable %s"
-msgstr "Inaktiverad"
+msgstr "Inaktivera %s"
 
 #. l10n: %d seconds
 #: js/messages.php:130
 #, php-format
 msgid "Set long_query_time to %ds"
-msgstr ""
+msgstr "Sätt long_query_time till %ds"
 
 #: js/messages.php:131
 msgid ""
 "You can't change these variables. Please log in as root or contact your "
 "database administrator."
 msgstr ""
+"Du kan inte ändra dessa variabler. Logga in som root eller kontakta din "
+"databasadministratör."
 
 #: js/messages.php:132
-#, fuzzy
 #| msgid "Manage your settings"
 msgid "Change settings"
-msgstr "Hantera dina inställningar"
+msgstr "Ändra inställningar"
 
 #: js/messages.php:133
-#, fuzzy
 #| msgid "More settings"
 msgid "Current settings"
-msgstr "Fler inställningar"
+msgstr "Nuvarande inställningar"
 
 #: js/messages.php:135 server_status.php:1382
-#, fuzzy
-#| msgid "Chart title"
 msgid "Chart Title"
 msgstr "Diagramtitel"
 
 #. l10n: As in differential values
 #: js/messages.php:137
-#, fuzzy
 #| msgid "Difference"
 msgid "Differential"
-msgstr "Skillnad"
+msgstr "Differential"
 
 #: js/messages.php:138
 #, php-format
 msgid "Divided by %s:"
-msgstr ""
+msgstr "Dividerat med %s:"
 
 #: js/messages.php:140
 msgid "From slow log"
-msgstr ""
+msgstr "Från långsam logg"
 
 #: js/messages.php:141
 msgid "From general log"
-msgstr ""
+msgstr "Från allmän logg"
 
 #: js/messages.php:142
 msgid "Analysing & loading logs. This may take a while."
-msgstr ""
+msgstr "Analyserar och laddar loggar. Detta kan ta lite tid."
 
 #: js/messages.php:143
 msgid ""
@@ -1328,6 +1326,9 @@ msgid ""
 "However only the SQL query itself has been used as a grouping criteria, so "
 "the other attributes of queries, such as start time, may differ."
 msgstr ""
+"Denna kolumn visar antalet identiska frågor som är grupperade tillsammans. "
+"Men endast SQL Text blir jämförd, följaktligen blir frågorna andra attribut "
+"som starttid kan variera."
 
 #: js/messages.php:144
 msgid ""
@@ -1335,24 +1336,24 @@ msgid ""
 "same table are also being grouped together, disregarding of the inserted "
 "data."
 msgstr ""
+"Sedan gruppering av INSERT frågor har valts, är INSERT frågor i samma tabell "
+"också grupperas tillsammans, oberoende av de infogade data."
 
 #: js/messages.php:145
 msgid "Log data loaded. Queries executed in this time span:"
-msgstr ""
+msgstr "Loggdata laddad. Frågorna utförda under denna tidsperiod:"
 
 #: js/messages.php:147
-#, fuzzy
 #| msgid "Jump to database"
 msgid "Jump to Log table"
-msgstr "Gå till daatabas"
+msgstr "Gå till tabellogg"
 
 #: js/messages.php:148
 msgid "Log analysed, but no data found in this time span."
-msgstr ""
+msgstr "Loggdata laddad. Frågorna exekverade under denna tidsperiod:"
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
-#, fuzzy
 #| msgid "Filter"
 msgid "Filters"
 msgstr "Filter"
@@ -1364,23 +1365,21 @@ msgstr "Filter"
 
 #: js/messages.php:154
 msgid "Filter queries by word/regexp:"
-msgstr ""
+msgstr "Filtrera frågor med ord/regexp:"
 
 #: js/messages.php:155
 msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr ""
+msgstr "Gruppfrågor, ignorera variabeldata i WHERE kommandon"
 
 #: js/messages.php:156
-#, fuzzy
 #| msgid "Number of inserted rows"
 msgid "Sum of grouped rows:"
-msgstr "Antal infogade rader"
+msgstr "Summan av grupperade rader:"
 
 #: js/messages.php:157
-#, fuzzy
 #| msgid "Total"
 msgid "Total:"
-msgstr "Total"
+msgstr "Totalt:"
 
 #: js/messages.php:161 libraries/tbl_properties.inc.php:780
 #: pmd_general.php:388 pmd_general.php:425 pmd_general.php:545
@@ -1519,10 +1518,9 @@ msgid "Change"
 msgstr "Ändra"
 
 #: js/messages.php:208
-#, fuzzy
 #| msgid "Maximum execution time"
 msgid "Query execution time"
-msgstr "Maximal exekveringstid"
+msgstr "Exekveringstid för frågor"
 
 #: js/messages.php:211
 msgid "Hide search criteria"
@@ -1538,10 +1536,9 @@ msgid "Ignore"
 msgstr "Ignorera"
 
 #: js/messages.php:218
-#, fuzzy
 #| msgid "Add column"
 msgid "Add columns"
-msgstr "Lägg till kolumn"
+msgstr "Addera kolumn"
 
 #: js/messages.php:221
 msgid "Select referenced key"
@@ -1858,13 +1855,12 @@ msgstr "Teckenstorlek"
 
 #: libraries/File.class.php:220
 msgid "File was not an uploaded file."
-msgstr ""
+msgstr "Filen var inte en uppladdad fil."
 
 #: libraries/File.class.php:259 libraries/File.class.php:388
-#, fuzzy
 #| msgid "Unknown error in file upload."
 msgid "Unknown error while uploading."
-msgstr "Okänt fel i filuppladdning."
+msgstr "Okänt fel vid uppladdning."
 
 #: libraries/File.class.php:277
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini."
@@ -1907,11 +1903,11 @@ msgstr "Fel vid flytt av uppladdad fil, se FAQ 1.11"
 
 #: libraries/File.class.php:507
 msgid "Error while moving uploaded file."
-msgstr ""
+msgstr "Fel när du flyttar uppladdad fil."
 
 #: libraries/File.class.php:515
 msgid "Cannot read (moved) upload file."
-msgstr ""
+msgstr "Kan inte läsa (flyttad) uppladdad fil."
 
 #: libraries/Index.class.php:418 tbl_relation.php:526
 msgid "No index defined!"
@@ -2461,10 +2457,9 @@ msgid "%s days, %s hours, %s minutes and %s seconds"
 msgstr "%s dagar, %s timmar, %s minuter och %s sekunder"
 
 #: libraries/common.lib.php:1856
-#, fuzzy
 #| msgid "Routine parameters"
 msgid "Missing parameter:"
-msgstr "Rutinparametrar"
+msgstr "Saknade parametrar:"
 
 #: libraries/common.lib.php:2162 libraries/common.lib.php:2165
 #: libraries/display_tbl.lib.php:299
@@ -2493,10 +2488,9 @@ msgid "The %s functionality is affected by a known bug, see %s"
 msgstr "Funktionaliteten för %s påverkas av en känd bugg, se %s"
 
 #: libraries/common.lib.php:2427
-#, fuzzy
 #| msgid "Click to select"
 msgid "Click to toggle"
-msgstr "Klicka för att markera"
+msgstr "Klicka för att växla"
 
 #: libraries/common.lib.php:2698 libraries/common.lib.php:2705
 #: libraries/common.lib.php:2894 libraries/config/setup.forms.php:296
@@ -6221,10 +6215,9 @@ msgid ""
 msgstr "Följande strukturer har antingen skapats eller ändrats. Här kan du"
 
 #: libraries/import.lib.php:1069
-#, fuzzy
 #| msgid "View a structure`s contents by clicking on its name"
 msgid "View a structure's contents by clicking on its name"
-msgstr "Visa en strukturs innehåll genom att klicka på dess namn"
+msgstr "Visa en strukturs innehåll genom att klicka på namnet"
 
 #: libraries/import.lib.php:1070
 msgid ""
@@ -6234,10 +6227,9 @@ msgstr ""
 "\" länk"
 
 #: libraries/import.lib.php:1071
-#, fuzzy
 #| msgid "Edit its structure by following the \"Structure\" link"
 msgid "Edit structure by following the \"Structure\" link"
-msgstr "Redigera dess struktur genom att följa \"Struktur\" länken"
+msgstr "Redigera strukturen genom att följa \"Structure\" länken"
 
 #: libraries/import.lib.php:1074
 msgid "Go to database"
@@ -6790,10 +6782,9 @@ msgid "The following query has failed: \"%s\""
 msgstr "Följande fråga har fallerat:  \"%s\""
 
 #: libraries/rte/rte_events.lib.php:116
-#, fuzzy
 #| msgid "Sorry, we failed to restore the dropped routine."
 msgid "Sorry, we failed to restore the dropped event."
-msgstr "Tyvärr, vi lyckades inte återställa den slängda rutinen."
+msgstr "Tyvärr kunde vi inte återställa tappade händelsen."
 
 #: libraries/rte/rte_events.lib.php:117 libraries/rte/rte_routines.lib.php:269
 #: libraries/rte/rte_triggers.lib.php:90
@@ -6801,16 +6792,16 @@ msgid "The backed up query was:"
 msgstr "Den säkerhetskopierade frågan var:"
 
 #: libraries/rte/rte_events.lib.php:121
-#, fuzzy, php-format
+#, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Event %1$s has been modified."
-msgstr "Rutinen %1$s har modifierats."
+msgstr "Händelsen %1$s har ändrats."
 
 #: libraries/rte/rte_events.lib.php:133
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %1$s has been created."
 msgid "Event %1$s has been created."
-msgstr "Tabell %1$s har skapats."
+msgstr "Händelsen %1$s har skapats."
 
 #: libraries/rte/rte_events.lib.php:141 libraries/rte/rte_routines.lib.php:294
 #: libraries/rte/rte_triggers.lib.php:114
@@ -6819,16 +6810,14 @@ msgstr ""
 "<b> Ett eller flera fel har inträffat under hanteringen av din begäran: </b>"
 
 #: libraries/rte/rte_events.lib.php:181
-#, fuzzy
 #| msgid "Create view"
 msgid "Create event"
-msgstr "Skapa vy"
+msgstr "Skapa händelse"
 
 #: libraries/rte/rte_events.lib.php:185
-#, fuzzy
 #| msgid "Edit server"
 msgid "Edit event"
-msgstr "Ändra server"
+msgstr "Editera händelse"
 
 #: libraries/rte/rte_events.lib.php:212 libraries/rte/rte_routines.lib.php:370
 #: libraries/rte/rte_routines.lib.php:1264
@@ -6843,10 +6832,9 @@ msgid "Details"
 msgstr "Detaljer"
 
 #: libraries/rte/rte_events.lib.php:374
-#, fuzzy
 #| msgid "Event type"
 msgid "Event name"
-msgstr "Händelsetyp"
+msgstr "Händelsenamn"
 
 #: libraries/rte/rte_events.lib.php:395 server_binlog.php:182
 msgid "Event type"
@@ -6858,22 +6846,19 @@ msgid "Change to %s"
 msgstr "Ändra till %s"
 
 #: libraries/rte/rte_events.lib.php:422
-#, fuzzy
 #| msgid "Execute"
 msgid "Execute at"
-msgstr "Utför"
+msgstr "Utför vid"
 
 #: libraries/rte/rte_events.lib.php:430
-#, fuzzy
 #| msgid "Execute"
 msgid "Execute every"
-msgstr "Utför"
+msgstr "Utför varje"
 
 #: libraries/rte/rte_events.lib.php:449
-#, fuzzy
 #| msgid "Startup"
 msgid "Start"
-msgstr "Uppstart"
+msgstr "Start"
 
 #: libraries/rte/rte_events.lib.php:465 libraries/rte/rte_routines.lib.php:912
 #: libraries/rte/rte_triggers.lib.php:348
@@ -6881,10 +6866,9 @@ msgid "Definition"
 msgstr "Definition"
 
 #: libraries/rte/rte_events.lib.php:471
-#, fuzzy
 #| msgid "complete inserts"
 msgid "On completion preserve"
-msgstr "kompletta infogningar"
+msgstr "Vid avslut, bevara"
 
 #: libraries/rte/rte_events.lib.php:475 libraries/rte/rte_routines.lib.php:922
 #: libraries/rte/rte_triggers.lib.php:354
@@ -6894,61 +6878,54 @@ msgstr "Definierare"
 #: libraries/rte/rte_events.lib.php:518 libraries/rte/rte_routines.lib.php:986
 #: libraries/rte/rte_triggers.lib.php:392
 msgid "The definer must be in the \"username@hostname\" format"
-msgstr ""
+msgstr "Defineraren måste vara i formatet: \"användarnamn@hostname\""
 
 #: libraries/rte/rte_events.lib.php:525
-#, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide an event name"
-msgstr "Du måste ange ett rutinnamn"
+msgstr "Du måste ange ett händelsenamn"
 
 #: libraries/rte/rte_events.lib.php:537
-#, fuzzy
 #| msgid "You must provide a name and a type for each routine parameter."
 msgid "You must provide a valid interval value for the event."
-msgstr "Du måste ange ett namn och en typ för varje rutinparameter."
+msgstr "Du måste ange ett giltigt intervall värde för händelsen."
 
 #: libraries/rte/rte_events.lib.php:549
-#, fuzzy
 #| msgid "You must provide a routine definition."
 msgid "You must provide a valid execution time for the event."
-msgstr "Du måste ange en rutindefinition."
+msgstr "Du måste ange en giltig exekveringstid för händelsen."
 
 #: libraries/rte/rte_events.lib.php:553
-#, fuzzy
 #| msgid "You must provide a name and a type for each routine parameter."
 msgid "You must provide a valid type for the event."
-msgstr "Du måste ange ett namn och en typ för varje rutinparameter."
+msgstr "Du måste ange en giltig typ för händelsen."
 
 #: libraries/rte/rte_events.lib.php:572
-#, fuzzy
 #| msgid "You must provide a routine definition."
 msgid "You must provide an event definition."
-msgstr "Du måste ange en rutindefinition."
+msgstr "Du måste ange en händelsedefinition."
 
 #: libraries/rte/rte_footer.lib.php:29
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #: libraries/rte/rte_footer.lib.php:91
 msgid "OFF"
-msgstr ""
+msgstr "OFF"
 
 #: libraries/rte/rte_footer.lib.php:96
 msgid "ON"
-msgstr ""
+msgstr "ON"
 
 #: libraries/rte/rte_footer.lib.php:108
-#, fuzzy
 #| msgid "The event scheduler is enabled"
 msgid "Event scheduler status"
-msgstr "Schemaläggaren är aktiverad"
+msgstr "Status för händelsehanteraren "
 
 #: libraries/rte/rte_list.lib.php:54
-#, fuzzy
 #| msgid "Return type"
 msgid "Returns"
-msgstr "Returtyp"
+msgstr "Returnerar"
 
 #: libraries/rte/rte_list.lib.php:62 libraries/rte/rte_triggers.lib.php:320
 #: server_status.php:1019 sql.php:943
@@ -7069,10 +7046,9 @@ msgid "You must provide a name and a type for each routine parameter."
 msgstr "Du måste ange ett namn och en typ för varje rutinparameter."
 
 #: libraries/rte/rte_routines.lib.php:1065
-#, fuzzy
 #| msgid "You must provide a name and a type for each routine parameter."
 msgid "You must provide a valid return type for the routine."
-msgstr "Du måste ange ett namn och en typ för varje rutinparameter."
+msgstr "Du måste ange en giltig returtyp för händelsen."
 
 #: libraries/rte/rte_routines.lib.php:1109
 msgid "You must provide a routine definition."
@@ -7106,70 +7082,61 @@ msgid "Function"
 msgstr "Funktion"
 
 #: libraries/rte/rte_triggers.lib.php:89
-#, fuzzy
 #| msgid "Sorry, we failed to restore the dropped routine."
 msgid "Sorry, we failed to restore the dropped trigger."
-msgstr "Tyvärr, vi lyckades inte återställa den slängda rutinen."
+msgstr "Tyvärr lyckades vi inte återställa den släppta triggern."
 
 #: libraries/rte/rte_triggers.lib.php:94
-#, fuzzy, php-format
+#, php-format
 #| msgid "Routine %1$s has been modified."
 msgid "Trigger %1$s has been modified."
-msgstr "Rutinen %1$s har modifierats."
+msgstr "Triggern %1$s har modifierats."
 
 #: libraries/rte/rte_triggers.lib.php:106
-#, fuzzy, php-format
+#, php-format
 #| msgid "Table %1$s has been created."
 msgid "Trigger %1$s has been created."
-msgstr "Tabell %1$s har skapats."
+msgstr "Triggern %1$s har skapats."
 
 #: libraries/rte/rte_triggers.lib.php:157
-#, fuzzy
 #| msgid "Create view"
 msgid "Create trigger"
-msgstr "Skapa vy"
+msgstr "Skapa trigger"
 
 #: libraries/rte/rte_triggers.lib.php:161
-#, fuzzy
 #| msgid "Add a trigger"
 msgid "Edit trigger"
-msgstr "Lägg till en ny Trigger"
+msgstr "Editera trigger"
 
 #: libraries/rte/rte_triggers.lib.php:301
-#, fuzzy
 #| msgid "Triggers"
 msgid "Trigger name"
-msgstr "Trigger"
+msgstr "Trigger namn"
 
 #: libraries/rte/rte_triggers.lib.php:399
-#, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide a trigger name"
-msgstr "Du måste ange ett rutinnamn"
+msgstr "Du måste ange ett triggernamn"
 
 #: libraries/rte/rte_triggers.lib.php:404
-#, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide a valid timing for the trigger"
-msgstr "Du måste ange ett rutinnamn"
+msgstr "Du måste ange en giltig tidsgräns för triggern"
 
 #: libraries/rte/rte_triggers.lib.php:409
-#, fuzzy
 #| msgid "You must provide a name and a type for each routine parameter."
 msgid "You must provide a valid event for the trigger"
-msgstr "Du måste ange ett namn och en typ för varje rutinparameter."
+msgstr "Du måste ange en giltig händelse för triggern"
 
 #: libraries/rte/rte_triggers.lib.php:415
-#, fuzzy
 #| msgid "You must provide a routine name"
 msgid "You must provide a valid table name"
-msgstr "Du måste ange ett rutinnamn"
+msgstr "Du måste ange ett giltigt tabellnamn"
 
 #: libraries/rte/rte_triggers.lib.php:421
-#, fuzzy
 #| msgid "You must provide a routine definition."
 msgid "You must provide a trigger definition."
-msgstr "Du måste ange en rutindefinition."
+msgstr "Du måste ange en trigger definition."
 
 #: libraries/rte/rte_words.lib.php:18
 msgid "Add routine"
@@ -7181,16 +7148,14 @@ msgid "Export of routine %s"
 msgstr "Exportera rutin %s"
 
 #: libraries/rte/rte_words.lib.php:21
-#, fuzzy
 #| msgid "Routines"
 msgid "routine"
-msgstr "Rutiner"
+msgstr "Rutin"
 
 #: libraries/rte/rte_words.lib.php:22
-#, fuzzy
 #| msgid "You do not have the necessary privileges to create a new routine"
 msgid "You do not have the necessary privileges to create a routine"
-msgstr "Du har inte tillräcklig behörighet för att skapa en ny rutin"
+msgstr "Du har inte den nödvändiga behörigheent att skapa en rutin"
 
 #: libraries/rte/rte_words.lib.php:23
 #, php-format
@@ -7202,10 +7167,9 @@ msgid "There are no routines to display."
 msgstr "Det finns inga rutiner att visa."
 
 #: libraries/rte/rte_words.lib.php:30
-#, fuzzy
 #| msgid "Add a trigger"
 msgid "Add trigger"
-msgstr "Lägg till en ny Trigger"
+msgstr "Lägg till trigger"
 
 #: libraries/rte/rte_words.lib.php:32
 #, php-format
@@ -7213,32 +7177,29 @@ msgid "Export of trigger %s"
 msgstr "Exportera trigger %s"
 
 #: libraries/rte/rte_words.lib.php:33
-#, fuzzy
 #| msgid "Triggers"
 msgid "trigger"
-msgstr "Trigger"
+msgstr "trigger"
 
 #: libraries/rte/rte_words.lib.php:34
-#, fuzzy
 #| msgid "You do not have the necessary privileges to create a new routine"
 msgid "You do not have the necessary privileges to create a trigger"
-msgstr "Du har inte tillräcklig behörighet för att skapa en ny rutin"
+msgstr "Du har inte den nödvändiga behörigheten att skapa en trigger"
 
 #: libraries/rte/rte_words.lib.php:35
-#, fuzzy, php-format
+#, php-format
 #| msgid "No routine with name %1$s found in database %2$s"
 msgid "No trigger with name %1$s found in database %2$s"
-msgstr "Ingen rutin med namnet %1$s finns i databasen %2$s"
+msgstr "Ingen trigger med namnet %1$s finns i databasen %2$s"
 
 #: libraries/rte/rte_words.lib.php:36
 msgid "There are no triggers to display."
 msgstr "Det finns inga triggers att visa"
 
 #: libraries/rte/rte_words.lib.php:42
-#, fuzzy
 #| msgid "Add an event"
 msgid "Add event"
-msgstr "Lägg till en ny händelse"
+msgstr "Lägg till händelse"
 
 #: libraries/rte/rte_words.lib.php:44
 #, php-format
@@ -7246,22 +7207,20 @@ msgid "Export of event %s"
 msgstr "Exportera händelse %s"
 
 #: libraries/rte/rte_words.lib.php:45
-#, fuzzy
 #| msgid "Event"
 msgid "event"
-msgstr "Händelse"
+msgstr "händelse"
 
 #: libraries/rte/rte_words.lib.php:46
-#, fuzzy
 #| msgid "You do not have the necessary privileges to create a new routine"
 msgid "You do not have the necessary privileges to create an event"
-msgstr "Du har inte tillräcklig behörighet för att skapa en ny rutin"
+msgstr "Du har inte tillräcklig behörighet för att skapa en händelse"
 
 #: libraries/rte/rte_words.lib.php:47
-#, fuzzy, php-format
+#, php-format
 #| msgid "No event with name %s found in database %s"
 msgid "No event with name %1$s found in database %2$s"
-msgstr "Ingen händelse med namnet %s finns i databasen %s"
+msgstr "Ingen händelse med namnet %1$s hittades i databasen %2$s"
 
 #: libraries/rte/rte_words.lib.php:48
 msgid "There are no events to display."
@@ -9105,10 +9064,9 @@ msgstr "Alla statusvariabler"
 
 #: server_status.php:619
 msgid "Monitor"
-msgstr ""
+msgstr "Övervaka"
 
 #: server_status.php:629 server_status.php:651
-#, fuzzy
 #| msgid "Refresh rate:"
 msgid "Refresh rate: "
 msgstr "Uppdateringsfrekvens:"
@@ -9131,10 +9089,10 @@ msgstr "Liknande länkar:"
 
 #. l10n: Questions is the name of a MySQL Status variable
 #: server_status.php:738
-#, fuzzy, php-format
+#, php-format
 #| msgid "Network traffic since startup: %s"
 msgid "Questions since startup: %s"
-msgstr "Nätverkstrafik sedan start:%s"
+msgstr "Frågor sedan start: %s"
 
 #: server_status.php:744 server_status.php:779 server_status.php:895
 #: server_status.php:940
@@ -9164,10 +9122,10 @@ msgid "Network traffic since startup: %s"
 msgstr "Nätverkstrafik sedan start:%s"
 
 #: server_status.php:852
-#, fuzzy, php-format
+#, php-format
 #| msgid "This MySQL server has been running for %s. It started up on %s."
 msgid "This MySQL server has been running for %1$s. It started up on %2$s."
-msgstr "Denna MySQL-server har varit igång i %s. Den startade den %s."
+msgstr "Denna MySQL-servern har varit igång i %1$s. Den startade den %2$s."
 
 #: server_status.php:862
 msgid ""
@@ -9244,6 +9202,8 @@ msgid ""
 "The number of connections that were aborted because the client died without "
 "closing the connection properly."
 msgstr ""
+"Antalet anslutningar som avbröts eftersom klienten dog utan att stänga "
+"anslutningen ordentligt."
 
 #: server_status.php:1076
 msgid "The number of failed attempts to connect to the MySQL server."
@@ -9900,49 +9860,44 @@ msgid "The number of threads that are not sleeping."
 msgstr "Antalet trådar som inte är vilande."
 
 #: server_status.php:1320
-#, fuzzy
 #| msgid "Start row"
 msgid "Start Monitor"
-msgstr "Starta rad"
+msgstr "Starta Monitor"
 
 #: server_status.php:1328
 msgid "Instructions/Setup"
-msgstr ""
+msgstr "Instruktioner/Setup"
 
 #: server_status.php:1332
 msgid "Done rearranging/editing charts"
-msgstr ""
+msgstr "Klar ändra/editera diagram"
 
 #: server_status.php:1339
-#, fuzzy
 #| msgid "Add parameter"
 msgid "Add chart"
-msgstr "Lägg till parameter"
+msgstr "Lägg till diagram"
 
 #: server_status.php:1341
 msgid "Rearrange/edit charts"
-msgstr ""
+msgstr "Ordna/editera diagram"
 
 #: server_status.php:1343
 msgid "Refresh rate:"
 msgstr "Uppdateringsfrekvens:"
 
 #: server_status.php:1346
-#, fuzzy
 #| msgid "Textarea columns"
 msgid "Chart columns:"
-msgstr "Textarea kolumner"
+msgstr "Visa kolumner:"
 
 #: server_status.php:1360
-#, fuzzy
 #| msgid "User for config auth"
 msgid "Clear monitor config"
-msgstr "Användare för config auth"
+msgstr "Rensa monitor config"
 
 #: server_status.php:1363
-#, fuzzy
 msgid "Monitor Instructions"
-msgstr "Information"
+msgstr "Övervaka instruktioner"
 
 #: server_status.php:1364
 msgid ""
@@ -9952,6 +9907,11 @@ msgid ""
 "enabled. Note however, that the general_log produces a lot of data and "
 "increases server load by up to 15%"
 msgstr ""
+"phpMyAdmin Monitor hjälpa dig optimera server konfigurationen och spåra tid "
+"intensivt \\ icke intensiva frågor. För de senare måste du ställa log_output "
+"till \"TABLE\" och ha antingen slow_query_log eller general_log aktiverat. "
+"Observera att general_log producerar mycket data och ökar lasten på servern "
+"med upp till 15%"
 
 #: server_status.php:1371
 msgid ""
@@ -9964,6 +9924,17 @@ msgid ""
 "will load statistics from the logs helping you find what caused the activity "
 "spike.</p>"
 msgstr ""
+"<b> Använda monitorn: </b><br/>\n"
+"  Ok, du är klar stt sätta igång! När du klickar på \"Start monitor\" kommer "
+"webbläsaren uppdatera alla visade diagram \n"
+"  med jämna mellanrum. Du kan lägga till diagram och ändra "
+"uppdateringsfrekvensen under \"Inställningar\", eller ta bort diagram \n"
+"  med tyngdpunkten ikonen på respektive diagram. \n"
+"  <p> När du får en plötslig topp i akviviteten, ävlj önskad tidsperiod på "
+"önskadt diagram genom att hålla ner \n"
+"  vänster musknapp och panorera över diagrammet. Detta kommer ladda "
+"statistik från loggarna vilka hjälper dig att hitta vad som orsakade \n"
+"  aktivitetstopp. </ p>"
 
 #: server_status.php:1375
 msgid ""
@@ -9971,112 +9942,109 @@ msgid ""
 "5-15%. Also be aware that generating statistics from the logs is a load "
 "intensive task, so it is advisable to select only a small time span and to "
 "disable the general_log and empty its table once monitoring is not required "
-"any more."
+"any more.\n"
 msgstr ""
+"<b>Observera:</b>\n"
+" Att aktivera general_log kan öka belastningen på servern med 5-15%. Var "
+"medveten om att generera statistik från loggarna är en \n"
+"belastningsintensiv uppgift, så det är klokt att välja en kort tidsperiod "
+"samt att inaktivera general_log och tömma tabellen när övervakningen inte "
+"behövs längre. \n"
 
 #: server_status.php:1385
-#, fuzzy
 #| msgid "Usage"
 msgid "CPU Usage"
-msgstr "Användning"
+msgstr "CPU Användning"
 
 #: server_status.php:1388
 msgid "Memory Usage"
-msgstr ""
+msgstr "Minnesanvändning"
 
 #: server_status.php:1391
-#, fuzzy
 #| msgid "Usage"
 msgid "Swap Usage"
-msgstr "Användning"
+msgstr "Swap användning"
 
 #: server_status.php:1394
-#, fuzzy
 #| msgid "All status variables"
 msgid "Status variable(s)"
 msgstr "Alla statusvariabler"
 
 #: server_status.php:1396
-#, fuzzy
 #| msgid "Select Tables"
 msgid "Select series:"
-msgstr "Välj tabeller"
+msgstr "Välj serier:"
 
 #: server_status.php:1398
 msgid "Commonly monitored"
-msgstr ""
+msgstr "Vanligen övervakade"
 
 #: server_status.php:1413
-#, fuzzy
 #| msgid "You must provide a routine name"
 msgid "or type variable name:"
-msgstr "Du måste ange ett rutinnamn"
+msgstr "eller skriv ett variabelnamn:"
 
 #: server_status.php:1417
 msgid "Display as differential value"
-msgstr ""
+msgstr "Visa som differensvärde"
 
 #: server_status.php:1419
 msgid "Apply a divisor"
-msgstr ""
+msgstr "Tillämpa en dividend"
 
 #: server_status.php:1426
 msgid "Append unit to data values"
-msgstr ""
+msgstr "Lägg till enhet till datavärdena"
 
 #: server_status.php:1432
-#, fuzzy
 #| msgid "Add a trigger"
 msgid "Add this series"
-msgstr "Lägg till en ny Trigger"
+msgstr "Lägg till denna serie"
 
 #: server_status.php:1434
 msgid "Clear series"
-msgstr ""
+msgstr "Rensa serier"
 
 #: server_status.php:1437
-#, fuzzy
 #| msgid "Series:"
 msgid "Series in Chart:"
-msgstr "Serie:"
+msgstr "Serier i diagram:"
 
 #: server_status.php:1445
-#, fuzzy
 #| msgid "Loading"
 msgid "Loading logs"
-msgstr "Laddar"
+msgstr "Läser in loggar"
 
 #: server_status.php:1448
-#, fuzzy
 #| msgid "Show statistics"
 msgid "Log statistics"
-msgstr "Visa statistik"
+msgstr "Logga statistik"
 
 #: server_status.php:1449
-#, fuzzy
 #| msgid "Select page"
 msgid "Selected time range:"
-msgstr "Välj sida"
+msgstr "Valt tidsintervall:"
 
 #: server_status.php:1454
 msgid "Only retrieve SELECT,INSERT,UPDATE and DELETE Statements"
-msgstr ""
+msgstr "Hämta endast SELECT, INSERT, UPDATE och DELETE kommandon"
 
 #: server_status.php:1459
 msgid "Remove variable data in INSERT statements for better grouping"
-msgstr ""
+msgstr "Ta bort variabeldata med INSERT kommandon för bättre gruppering"
 
 #: server_status.php:1462
 msgid ""
 "<p>Choose from which log you want the statistics to be generated from.</p> "
 "Results are grouped by query text."
 msgstr ""
+"<p>Välj den logg du vill att statistiken ska genereras från. </p>Resultaten "
+"grupperas efter frågetexten."
 
 #: server_status.php:1465
-#, fuzzy
 #| msgid "Query type"
 msgid "Query analyzer"
-msgstr "Fråge-typ"
+msgstr "Fråge analyserare"
 
 #: server_status.php:1501
 #, php-format
diff --git a/po/tr.po b/po/tr.po
index 92dbcba968..3e427ddc53 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,13 +4,13 @@ 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-30 14:14-0400\n"
-"PO-Revision-Date: 2011-07-25 19:31+0200\n"
+"PO-Revision-Date: 2011-08-02 10:45+0200\n"
 "Last-Translator: Burak Yavuz <hitowerdigit@hotmail.com>\n"
 "Language-Team: turkish <tr@li.org>\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Pootle 2.0.5\n"
 
@@ -1313,7 +1313,6 @@ msgid "Analysing & loading logs. This may take a while."
 msgstr "Günlükler çözümleniyor ve yükleniyor. Bu biraz zaman alabilir."
 
 #: js/messages.php:143
-#, fuzzy
 #| msgid ""
 #| "This columns shows the amount of identical queries that are grouped "
 #| "together. However only the SQL Text is being compared, thus the queries "
@@ -1324,8 +1323,8 @@ msgid ""
 "the other attributes of queries, such as start time, may differ."
 msgstr ""
 "Bu sütunlar birlikte gruplanmış özdeş sorguların miktarını gösterir. Ancak "
-"sadece SQL Metin karşılaştırılır, böylece başlama zamanı gibi sorgular diğer "
-"öznitelikler farklı olabilir."
+"sadece SQL Metnin kendisi gruplama kriteri olarak kullanılır, böylece "
+"başlama zamanı gibi, sorguların diğer öznitelikleri farklı olabilir."
 
 #: js/messages.php:144
 msgid ""
@@ -1346,10 +1345,9 @@ msgid "Jump to Log table"
 msgstr "Günlük tablosuna atla"
 
 #: js/messages.php:148
-#, fuzzy
 #| msgid "Log analysed, but not data found in this time span."
 msgid "Log analysed, but no data found in this time span."
-msgstr "Günlük çözümlendi, ama bu zaman aralığında bulunan veri yok."
+msgstr "Günlük çözümlendi, ama bu zaman aralığı içinde bulunan veri yok."
 
 #. l10n: A collection of available filters
 #: js/messages.php:151
@@ -1363,13 +1361,12 @@ msgstr "Süzgeç"
 
 #: js/messages.php:154
 msgid "Filter queries by word/regexp:"
-msgstr "Kelime/düzenli ifadeye göre sorguları süz"
+msgstr "Kelime/düzenli ifadeye göre sorguları süz:"
 
 #: js/messages.php:155
-#, fuzzy
 #| msgid "Group queries, ignoring variable data in WHERE statements"
 msgid "Group queries, ignoring variable data in WHERE clauses"
-msgstr "Sorguları grupla, WHERE ifadelerindeki değişken veri yoksayılıyor"
+msgstr "Grup sorguları, WHERE cümleciklerindeki değişken veri yoksayılıyor"
 
 #: js/messages.php:156
 msgid "Sum of grouped rows:"
@@ -8686,7 +8683,7 @@ msgstr "Kullanıcı gözden geçirme"
 #: server_privileges.php:1697 server_privileges.php:1889
 #: server_privileges.php:2239
 msgid "Grant"
-msgstr "Onayla"
+msgstr "Onaylı"
 
 #: server_privileges.php:1770
 msgid "Remove selected users"
@@ -9897,7 +9894,6 @@ msgid "Monitor Instructions"
 msgstr "İzleme Yönergeleri"
 
 #: server_status.php:1364
-#, fuzzy
 #| msgid ""
 #| "The phpMyAdmin Monitor can assist you in optimizing the server "
 #| "configuration and track down time intensive\n"
@@ -9914,14 +9910,12 @@ msgid ""
 "increases server load by up to 15%"
 msgstr ""
 "phpMyAdmin İzleyici sunucu yapılandırmasını uyarlamada ve yoğun sorgularda "
-"iz sürme süresinde size yardımcı\n"
-"olabilir. Sonrası için log_output'u 'TABLE'a ayarlamanız gerekecektir ve ya "
-"slow_query_log ya da general_log etkinleştirilir.\n"
-"Ancak unutmayın, general_log çok fazla veri üretir ve sunucu yükünü %15'e "
-"kadar arttırır"
+"iz sürme süresinde size yardımcı olabilir. Sonrası için log_output'u "
+"'TABLE'a ayarlamanız gerekecektir ve ya slow_query_log ya da general_log "
+"etkinleştirilir. Ancak unutmayın, general_log çok fazla veri üretir ve "
+"sunucu yükünü %15'e kadar arttırır"
 
 #: server_status.php:1371
-#, fuzzy
 #| msgid ""
 #| "<b>Using the monitor:</b><br/>\n"
 #| "        Ok, you are good to go! Once you click 'Start monitor' your "
@@ -9944,17 +9938,15 @@ msgid ""
 "will load statistics from the logs helping you find what caused the activity "
 "spike.</p>"
 msgstr ""
-"<b>İzleyici kullanımı:</b><br/>\n"
-"        Tamam, ilerlemeye hazırsınız! Bir kere 'İzlemeyi başlat'a "
-"tıkladığınızda tarayıcınız tüm görüntülenen\n"
-"        çizelgeleri düzenli aralıklarla yenileyecek. 'Ayarlar' altında "
-"çizelgeleri ekleyebilir ve yenileme oranını değiştirebilirsiniz\n"
-"        veya her çizelgenin kendi dişli çark simgesini kullanarak herhangi "
-"bir çizelgeyi kaldırabilirsiniz.\n"
-"        <p>When you get to see a sudden spike in activity, select the "
-"relevant time span on any chart by holding down the        left mouse button "
-"and panning over the chart. This will load statistics from the logs helping "
-"you find what caused the        activity spike.</p>"
+"<b>İzleyici kullanımı:</b><br/> Tamam, ilerlemeye hazırsınız! Bir kere "
+"'İzlemeyi başlat'a tıkladığınızda tarayıcınız tüm görüntülenen çizelgeleri "
+"düzenli aralıklarla yenileyecek. 'Ayarlar' altında çizelgeleri ekleyebilir "
+"ve yenileme oranını değiştirebilirsiniz veya her çizelgenin kendi dişli çark "
+"simgesini kullanarak herhangi bir çizelgeyi kaldırabilirsiniz. <p>Ani "
+"hareketlilik gördüğünüzde, herhangi bir çizlgede sol fare tuşunu basılı "
+"tutarak ve çizelge üzerinde kaydırarak ilgili zaman aralığını seçin. Bu, ani "
+"hareketlenmenin sebebini bulmanızda yardımcı olan istatistikleri günlükten "
+"yükleyecek.</p>"
 
 #: server_status.php:1375
 msgid ""
@@ -9964,6 +9956,11 @@ msgid ""
 "disable the general_log and empty its table once monitoring is not required "
 "any more."
 msgstr ""
+"<b>Lütfen unutmayın:</b> general_log'u etkinleştirmek sunucu yükünü %5-15 "
+"arttırabilir. Aynı zamanda günlükten oluşturulan istatistiklerin yoğun görev "
+"yükü olduğundan haberiniz olsun bu yüzden sadece küçük zaman aralıkları "
+"seçmek ve general_log'u etkisizleştirmek tavsiye edilir ve tablolarını bir "
+"defa boşaltmak daha fazla izlemeyi gerektirmez."
 
 #: server_status.php:1385
 msgid "CPU Usage"
diff --git a/server_collations.php b/server_collations.php
index ccd41d41d3..71508be791 100644
--- a/server_collations.php
+++ b/server_collations.php
@@ -49,7 +49,7 @@ require_once './libraries/mysql_charsets.lib.php';
  * Outputs the result
  */
 echo '<div id="div_mysql_charset_collations">' . "\n"
-   . '<table class="data">' . "\n"
+   . '<table class="data noclick">' . "\n"
    . '<tr><th>' . __('Collation') . '</th>' . "\n"
    . '    <th>' . __('Description') . '</th>' . "\n"
    . '</tr>' . "\n";
@@ -61,7 +61,7 @@ foreach ($mysql_charsets as $current_charset) {
     if ($i >= $table_row_count / 2) {
         $i = 0;
         echo '</table>' . "\n"
-           . '<table class="data">' . "\n"
+           . '<table class="data noclick">' . "\n"
            . '<tr><th>' . __('Collation') . '</th>' . "\n"
            . '    <th>' . __('Description') . '</th>' . "\n"
            . '</tr>' . "\n";
@@ -78,7 +78,7 @@ foreach ($mysql_charsets as $current_charset) {
     $odd_row = true;
     foreach ($mysql_collations[$current_charset] as $current_collation) {
         $i++;
-        echo '<tr class="noclick '
+        echo '<tr class="'
            . ($odd_row ? 'odd' : 'even')
            . ($mysql_default_collations[$current_charset] == $current_collation
                 ? ' marked'
diff --git a/server_engines.php b/server_engines.php
index c66877765f..4e5eeb3f0d 100644
--- a/server_engines.php
+++ b/server_engines.php
@@ -50,7 +50,7 @@ if (empty($_REQUEST['engine'])
     /**
      * Displays the table header
      */
-    echo '<table>' . "\n"
+    echo '<table class="noclick">' . "\n"
        . '<thead>' . "\n"
        . '<tr><th>' . __('Storage Engine') . '</th>' . "\n"
        . '    <th>' . __('Description') . '</th>' . "\n"
@@ -64,7 +64,7 @@ if (empty($_REQUEST['engine'])
      */
     $odd_row = true;
     foreach (PMA_StorageEngine::getStorageEngines() as $engine => $details) {
-        echo '<tr class="noclick '
+        echo '<tr class="'
            . ($odd_row ? 'odd' : 'even')
            . ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED'
                 ? ' disabled'
@@ -82,7 +82,7 @@ if (empty($_REQUEST['engine'])
     $PMA_Config = $GLOBALS['PMA_Config'];
     if ($PMA_Config->get('BLOBSTREAMING_PLUGINS_EXIST')) {
         // Special case for PBMS daemon which is not listed as an engine
-        echo '<tr class="noclick '
+        echo '<tr class="'
             . ($odd_row ? 'odd' : 'even')
             .  '">' . "\n"
             . '    <td><a href="./server_engines.php'
diff --git a/server_status.php b/server_status.php
index 7e4babdc34..877f0a5cf4 100644
--- a/server_status.php
+++ b/server_status.php
@@ -767,7 +767,7 @@ function printQueryStatistics() {
 
     ?>
 
-        <table id="serverstatusqueriesdetails" class="data sortable">
+        <table id="serverstatusqueriesdetails" class="data sortable noclick">
         <col class="namecol" />
         <col class="valuecol" span="3" />
         <thead>
@@ -799,7 +799,7 @@ function printQueryStatistics() {
             $other_sum += $value;
         else $chart_json[$name] = $value;
     ?>
-            <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>">
+            <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>">
                 <th class="name"><?php echo htmlspecialchars($name); ?></th>
                 <td class="value"><?php echo PMA_formatNumber($value, 5, 0, true); ?></td>
                 <td class="value"><?php echo
@@ -888,7 +888,7 @@ function printServerTraffic() {
     }
     ?>
 
-    <table id="serverstatustraffic" class="data">
+    <table id="serverstatustraffic" class="data noclick">
     <thead>
     <tr>
         <th colspan="2"><?php echo __('Traffic') . '&nbsp;' . PMA_showHint(__('On a busy server, the byte counters may overrun, so those statistics as reported by the MySQL server may be incorrect.')); ?></th>
@@ -896,7 +896,7 @@ function printServerTraffic() {
     </tr>
     </thead>
     <tbody>
-    <tr class="noclick odd">
+    <tr class="odd">
         <th class="name"><?php echo __('Received'); ?></th>
         <td class="value"><?php echo
             implode(' ',
@@ -906,7 +906,7 @@ function printServerTraffic() {
                 PMA_formatByteDown(
                     $server_status['Bytes_received'] * $hour_factor, 3, 1)); ?></td>
     </tr>
-    <tr class="noclick even">
+    <tr class="even">
         <th class="name"><?php echo __('Sent'); ?></th>
         <td class="value"><?php echo
             implode(' ',
@@ -916,7 +916,7 @@ function printServerTraffic() {
                 PMA_formatByteDown(
                     $server_status['Bytes_sent'] * $hour_factor, 3, 1)); ?></td>
     </tr>
-    <tr class="noclick odd">
+    <tr class="odd">
         <th class="name"><?php echo __('Total'); ?></th>
         <td class="value"><?php echo
             implode(' ',
@@ -933,7 +933,7 @@ function printServerTraffic() {
     </tbody>
     </table>
 
-    <table id="serverstatusconnections" class="data">
+    <table id="serverstatusconnections" class="data noclick">
     <thead>
     <tr>
         <th colspan="2"><?php echo __('Connections'); ?></th>
@@ -942,14 +942,14 @@ function printServerTraffic() {
     </tr>
     </thead>
     <tbody>
-    <tr class="noclick odd">
+    <tr class="odd">
         <th class="name"><?php echo __('max. concurrent connections'); ?></th>
         <td class="value"><?php echo
             PMA_formatNumber($server_status['Max_used_connections'], 0); ?>  </td>
         <td class="value">--- </td>
         <td class="value">--- </td>
     </tr>
-    <tr class="noclick even">
+    <tr class="even">
         <th class="name"><?php echo __('Failed attempts'); ?></th>
         <td class="value"><?php echo
             PMA_formatNumber($server_status['Aborted_connects'], 4, 1, true); ?></td>
@@ -963,7 +963,7 @@ function printServerTraffic() {
                 0, 2, true) . '%'
           : '--- '; ?></td>
     </tr>
-    <tr class="noclick odd">
+    <tr class="odd">
         <th class="name"><?php echo __('Aborted'); ?></th>
         <td class="value"><?php echo
             PMA_formatNumber($server_status['Aborted_clients'], 4, 1, true); ?></td>
@@ -977,7 +977,7 @@ function printServerTraffic() {
                 0, 2, true) . '%'
           : '--- '; ?></td>
     </tr>
-    <tr class="noclick even">
+    <tr class="even">
         <th class="name"><?php echo __('Total'); ?></th>
         <td class="value"><?php echo
             PMA_formatNumber($server_status['Connections'], 4, 0); ?></td>
@@ -1007,7 +1007,7 @@ function printServerTraffic() {
      * Displays the page
      */
     ?>
-    <table id="tableprocesslist" class="data clearfloat">
+    <table id="tableprocesslist" class="data clearfloat noclick">
     <thead>
     <tr>
         <th><?php echo __('Processes'); ?></th>
@@ -1046,7 +1046,7 @@ function printServerTraffic() {
         $url_params['kill'] = $process['Id'];
         $kill_process = 'server_status.php' . PMA_generate_common_url($url_params);
         ?>
-    <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>">
+    <tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>">
         <td><a href="<?php echo $kill_process ; ?>"><?php echo __('Kill'); ?></a></td>
         <td class="value"><?php echo $process['Id']; ?></td>
         <td><?php echo $process['User']; ?></td>
@@ -1055,7 +1055,19 @@ function printServerTraffic() {
         <td><?php echo $process['Command']; ?></td>
         <td class="value"><?php echo $process['Time']; ?></td>
         <td><?php echo (empty($process['State']) ? '---' : $process['State']); ?></td>
-        <td><?php echo (empty($process['Info']) ? '---' : PMA_SQP_formatHtml(PMA_SQP_parse($process['Info']))); ?></td>
+        <td>
+        <?php
+        if (empty($process['Info'])) {
+            echo '---';
+        } else {
+            if (empty($_REQUEST['full']) && strlen($process['Info']) > $GLOBALS['cfg']['MaxCharactersInDisplayedSQL']) {
+                echo htmlspecialchars(substr($process['Info'], 0, $GLOBALS['cfg']['MaxCharactersInDisplayedSQL'])) . '[...]';
+            } else {
+                echo PMA_SQP_formatHtml(PMA_SQP_parse($process['Info']));
+            }
+        }
+        ?>
+        </td>
     </tr>
         <?php
         $odd_row = ! $odd_row;
@@ -1239,7 +1251,7 @@ function printVariablesTable() {
     );
 
 ?>
-<table class="data sortable" id="serverstatusvariables">
+<table class="data sortable noclick" id="serverstatusvariables">
     <col class="namecol" />
     <col class="valuecol" />
     <col class="descrcol" />
@@ -1257,7 +1269,7 @@ function printVariablesTable() {
     foreach ($server_status as $name => $value) {
             $odd_row = !$odd_row;
 ?>
-        <tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; echo isset($allocationMap[$name])?' s_'.$allocationMap[$name]:''; ?>">
+        <tr class="<?php echo $odd_row ? 'odd' : 'even'; echo isset($allocationMap[$name])?' s_'.$allocationMap[$name]:''; ?>">
             <th class="name"><?php echo htmlspecialchars(str_replace('_',' ',$name)) . PMA_showMySQLDocu('server-status-variables', 'server-status-variables', false, 'statvar_' . $name); ?>
             </th>
             <td class="value"><?php
diff --git a/server_synchronize.php b/server_synchronize.php
index 6c23d97281..8f79897c73 100644
--- a/server_synchronize.php
+++ b/server_synchronize.php
@@ -251,33 +251,32 @@ if ((isset($_REQUEST['submit_connect']))) {
             /**
             * Displays the sub-heading and icons showing Structure Synchronization and Data Synchronization
             */
-            echo '<form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php">'
-            . PMA_generate_common_hidden_inputs('', '');
-            echo '<table id="serverstatustraffic" class="data" width = "40%">
+            ?>
+            <form name="synchronize_form" id="synchronize_form" method="post" action="server_synchronize.php">
+                <?php PMA_generate_common_hidden_inputs('', ''); ?>
+            <table width="40%">
             <tr>
-            <td>'
-            . '<img class="icon" src="' . $pmaThemeImage . 'new_struct.jpg" width="32"'
-            . ' height="32" alt="" />'
-            . __('Structure Synchronization')
-            .'</td>';
-            echo '<td>'
-            . '<img class="icon" src="' . $pmaThemeImage . 'new_data.jpg" width="32"'
-            . ' height="32" alt="" />'
-            . __('Data Synchronization')
-            . '</td>';
-            echo '</tr>
-            </table>';
-
+                <td>
+                    <img class="icon" src="<?php echo $pmaThemeImage; ?>new_struct.png" width="16" height="16" alt="" />
+                    <?php echo __('Structure Synchronization'); ?>
+                </td>
+                <td>
+                    <img class="icon" src="<?php echo $pmaThemeImage; ?>new_data.png" width="16" height="16" alt="" />
+                    <?php echo __('Data Synchronization'); ?>
+                </td>
+            </tr>
+            </table>
+            <?php
             /**
             * Displays the tables containing the source tables names, their difference with the target tables and target tables names
             */
-            PMA_syncDisplayHeaderSource($src_db);
-            $odd_row = false;
+            PMA_syncDisplayHeaderCompare($src_db, $trg_db);
+            $rows = array();
 
             /**
             * Display the matching tables' names and difference, first
             */
-            for($i = 0; $i < count($matching_tables); $i++) {
+            for ($i = 0; $i < count($matching_tables); $i++) {
                 /**
                 * Calculating the number of updates for each matching table
                 */
@@ -296,12 +295,7 @@ if ((isset($_REQUEST['submit_connect']))) {
                 } else {
                     $num_of_insertions = 0;
                 }
-                /**
-                * Displays the name of the matching table
-                */
-                $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-                echo '<td>' . htmlspecialchars($matching_tables[$i]) . '</td>
-                <td align="center">';
+
                 /**
                 * Calculating the number of alter columns, number of columns to be added, number of columns to be removed,
                 * number of index to be added and removed.
@@ -331,86 +325,70 @@ if ((isset($_REQUEST['submit_connect']))) {
                     $num_add_index += sizeof($alter_indexes_array[$i]);
                     $num_remove_index += sizeof($alter_indexes_array[$i]);
                 }
+
+                $btn_structure_params = null;
+                $btn_data_params = null;
+
                 /**
                 * Display the red button of structure synchronization if there exists any structure difference or index difference.
                 */
                 if (($num_alter_cols > 0) || ($num_insert_cols > 0) || ($num_remove_cols > 0) || ($num_add_index > 0) || ($num_remove_index > 0)) {
-
-                   echo '<img class="icon struct_img" src="' . $pmaThemeImage . 'new_struct.jpg" width="29"  height="29"
-                   alt="' . __('Click to select') . '"
-                   onclick="showDetails(' . "'MS" . $i . "','" . $num_alter_cols . "','" .$num_insert_cols .
-                   "','" . $num_remove_cols . "','" . $num_add_index . "','" . $num_remove_index . "'"
-                   . ', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')"/>';
+                    $btn_structure_params = array($i, $num_alter_cols, $num_insert_cols,
+                        $num_remove_cols, $num_add_index, $num_remove_index);
                 }
+
                 /**
                 * Display the green button of data synchronization if there exists any data difference.
                 */
                 if (isset($update_array[$i]) || isset($insert_array[$i])) {
                     if (isset($update_array[$i][0][$matching_tables_keys[$i][0]]) || isset($insert_array[$i][0][$matching_tables_keys[$i][0]])) {
-
-                        echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29"
-                        alt="' . __('Click to select') . '"
-                         onclick="showDetails('. "'MD" . $i . "','" . $num_of_updates . "','" . $num_of_insertions .
-                         "','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')" />';
+                        $btn_data_params = array($i, $num_of_updates, $num_of_insertions, null, null, null);
                     }
                 }
-                echo '</td>
-                </tr>';
+
+                $rows[] = array(
+                    'src_table_name' => $matching_tables[$i],
+                    'dst_table_name' => $matching_tables[$i],
+                    'btn_type' => 'M',
+                    'btn_structure' => $btn_structure_params,
+                    'btn_data' => $btn_data_params
+                );
             }
             /**
             * Displays the tables' names present in source but missing from target
             */
             for ($j = 0; $j < count($source_tables_uncommon); $j++) {
-                $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-                echo '<td> + ' . htmlspecialchars($source_tables_uncommon[$j]) . '</td> ';
-
-                echo '<td align="center"><img class="icon struct_img" src="' . $pmaThemeImage .  'new_struct.jpg" width="29"  height="29"
-                alt="' . __('Click to select') . '"
-                onclick="showDetails(' . "'US" . $j . "','" . null . "','" . null . "','" . null . "','" . null . "','" . null . "'" . ', this ,'
-                . "'" . htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')"/>';
-
-                if ($row_count[$j] > 0)
-                {
-                    echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29"
-                    alt="' . __('Click to select') . '"
-                    onclick="showDetails(' . "'UD" . $j . "','" . null . "','" . $row_count[$j] . "','" . null .
-                    "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')" />';
+                $row = array(
+                    'src_table_name' => '+ ' . $source_tables_uncommon[$j],
+                    'dst_table_name' => $source_tables_uncommon[$j] . ' (' . __('not present') . ')',
+                    'btn_type' => 'U',
+                    'btn_structure' => array($j, null, null, null, null, null),
+                    'btn_data' => null
+                );
+                if ($row_count[$j] > 0) {
+                    $row['btn_data'] = array($j, null, $row_count[$j], null, null, null);
                 }
-                echo '</td>
-                </tr>';
+                $rows[] = $row;
             }
             foreach ($target_tables_uncommon as $tbl_nc_name) {
-                $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-                echo '<td height="32">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </td><td></td>';
-                echo '</tr>';
+                $rows[] = array(
+                    'src_table_name' => '',
+                    'dst_table_name' => $tbl_nc_name);
             }
             /**
             * Displays the target tables names
             */
-            echo '</table>';
-
-            $odd_row = PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables);
-            foreach ($source_tables_uncommon as $tbl_nc_name) {
-                $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-                echo '<td height="32">' . htmlspecialchars($tbl_nc_name) . ' (' . __('not present') . ')</td>
-                </tr>';
-            }
-            foreach ($target_tables_uncommon as $tbl_nc_name) {
-                $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-                echo '<td> - ' . htmlspecialchars($tbl_nc_name) . '</td>';
-                echo '</tr>';
-            }
-            echo '</table>';
-            echo '</div>';
+            PMA_syncDisplayDataCompare($rows);
+            echo '</table>
+                </div>
+                </fieldset>';
 
             /**
             * This "list" div will contain a table and each row will depict information about structure/data diffrence in tables.
             * Rows will be generated dynamically as soon as the colored  buttons "D" or "S"  are clicked.
             */
 
-            echo '<div id="list" style = "overflow: auto; width: 1020px; height: 140px;
-            border-left: 1px gray solid; border-bottom: 1px gray solid;
-            padding:0px; margin: 0px">
+            echo '<fieldset style="padding:0"><div id="list" style="overflow:auto; height:140px; padding:1em">
 
             <table>
                 <thead>
@@ -433,7 +411,7 @@ if ((isset($_REQUEST['submit_connect']))) {
                 </thead>
                 <tbody></tbody>
             </table>
-            </div>';
+            </div></fieldset>';
             /**
             *  This fieldset displays the checkbox to confirm deletion of previous rows from target tables
             */
@@ -700,13 +678,9 @@ if (isset($_REQUEST['Table_ids'])) {
     echo '<form name="applied_difference" id="synchronize_form" method="post" action="server_synchronize.php">'
         . PMA_generate_common_hidden_inputs('', '');
 
-    PMA_syncDisplayHeaderSource($src_db);
-    $odd_row = false;
+    PMA_syncDisplayHeaderCompare($src_db, $trg_db);
+    $rows = array();
     for($i = 0; $i < count($matching_tables); $i++) {
-        $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-        echo '<td align="center">' . htmlspecialchars($matching_tables[$i]) . '</td>
-        <td align="center">';
-
         $num_alter_cols  = 0;
         $num_insert_cols = 0;
         $num_remove_cols = 0;
@@ -729,11 +703,12 @@ if (isset($_REQUEST['Table_ids'])) {
             $num_remove_index = sizeof($remove_indexes_array[$i]);
         }
 
+        $btn_structure_params = null;
+        $btn_data_params = null;
+
         if (($num_alter_cols > 0) || ($num_insert_cols > 0) || ($num_remove_cols > 0) || ($num_add_index > 0) || ($num_remove_index > 0)) {
-            echo '<img class="icon struct_img" src="' . $pmaThemeImage .  'new_struct.jpg" width="29"  height="29"
-            alt="' . __('Click to select') . '"
-            onclick="showDetails(' . "'MS" . $i . "','" . $num_alter_cols . "','" . $num_insert_cols . "','" . $num_remove_cols . "','" . $num_add_index . "','" . $num_remove_index . "'" .',
-            this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')"/>';
+            $btn_structure_params = array($i, $num_alter_cols, $num_insert_cols,
+                $num_remove_cols, $num_add_index, $num_remove_index);
         }
         if (!(in_array($i, $matching_table_data_diff))) {
 
@@ -757,18 +732,20 @@ if (isset($_REQUEST['Table_ids'])) {
             }
 
             if ((isset($matching_tables_keys[$i][0]) && isset($update_array[$i][0][$matching_tables_keys[$i][0]]))
-                || (isset($matching_tables_keys[$i][0]) && isset($insert_array[$i][0][$matching_tables_keys[$i][0]]))) {
-                echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29"
-                alt="' . __('Click to select') . '"
-                onclick="showDetails(' . "'MD" . $i . "','" . $num_of_updates . "','" . $num_of_insertions .
-                "','" . null . "','" . null . "','" . null . "'" .', this ,' . "'" . htmlspecialchars($matching_tables[$i]) . "'" . ')" />';
+                    || (isset($matching_tables_keys[$i][0]) && isset($insert_array[$i][0][$matching_tables_keys[$i][0]]))) {
+                $btn_data_params = array($i, $num_of_updates, $num_of_insertions,
+                    null, null, null);
             }
         } else {
             unset($update_array[$i]);
             unset($insert_array[$i]);
         }
-        echo '</td>
-        </tr>';
+        $rows[] = array(
+            'src_table_name' => $matching_tables[$i],
+            'btn_type' => 'M',
+            'btn_structure' => $btn_structure_params,
+            'btn_data' => $btn_data_params
+        );
     }
     /**
     * placing updated value of arrays in session
@@ -778,37 +755,39 @@ if (isset($_REQUEST['Table_ids'])) {
     $_SESSION['insert_array'] = $insert_array;
 
     for ($j = 0; $j < count($source_tables_uncommon); $j++) {
-        $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-        echo '<td align="center"> + ' . htmlspecialchars($source_tables_uncommon[$j]) . '</td>
-        <td align="center">';
+        $btn_structure_params = null;
+        $btn_data_params = null;
+
         /**
         * Display the difference only when it has not been applied
         */
         if (!(in_array($j, $uncommon_table_structure_diff))) {
             if (isset($uncommon_tables[$j])) {
-                echo '<img class="icon struct_img" src="' . $pmaThemeImage  . 'new_struct.jpg" width="29"  height="29"
-                alt="' . __('Click to select') . '"
-                onclick="showDetails(' . "'US" . $j . "','" . null . "','" . null . "','" . null . "','" . null . "','" . null . "'" . ', this ,' . "'" . htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')"/>' .' ';
+                $btn_structure_params = array($j, null, null, null, null, null);
             }
+            $dst_table_name = $source_tables_uncommon[$j] . ' (' .  __('not present') . ')';
         } else {
             unset($uncommon_tables[$j]);
+            $dst_table_name = $source_tables_uncommon[$j];
         }
         /**
         * Display the difference only when it has not been applied
         */
         if (!(in_array($j, $uncommon_table_data_diff))) {
-            if (isset($row_count[$j]) && ($row_count > 0)) {
-                echo '<img class="icon data_img" src="' . $pmaThemeImage . 'new_data.jpg" width="29" height="29"
-                alt="' . __('Click to select') . '"
-                onclick="showDetails(' . "'UD" . $j . "','" . null ."','" . $row_count[$j] ."','"
-                . null . "','" . null . "','" . null . "'" . ', this ,' . "'". htmlspecialchars($source_tables_uncommon[$j]) . "'" . ')" />';
+            if (isset($row_count[$j]) && ($row_count[$j] > 0)) {
+                $btn_data_params = array($j, null, $row_count[$j], null, null, null);
             }
         } else {
             unset($row_count[$j]);
         }
 
-        echo '</td>
-        </tr>';
+        $rows[] = array(
+            'src_table_name' => $source_tables_uncommon[$j],
+            'dst_table_name' => $dst_table_name,
+            'btn_type' => 'U',
+            'btn_structure' => $btn_structure_params,
+            'btn_data' => $btn_data_params
+        );
     }
     /**
     * placing the latest values of arrays in session
@@ -822,39 +801,21 @@ if (isset($_REQUEST['Table_ids'])) {
     * Displaying the target database tables
     */
     foreach ($target_tables_uncommon as $tbl_nc_name) {
-        $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-        echo '<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </td><td></td>';
-        echo '</tr>';
-    }
-    echo '</table>';
-    $odd_row = PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables);
-    foreach ($source_tables_uncommon as $tbl_nc_name) {
-        $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-        if (in_array($tbl_nc_name, $uncommon_tables)) {
-            echo '<td>' . htmlspecialchars($tbl_nc_name) . ' (' .  __('not present') . ')</td>';
-        } else {
-            echo '<td>' . htmlspecialchars($tbl_nc_name) . '</td>';
-        }
-        echo '
-        </tr>';
-    }
-    foreach ($target_tables_uncommon as $tbl_nc_name) {
-        $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-        echo '<td> - ' . htmlspecialchars($tbl_nc_name) . '</td>';
-        echo '</tr>';
+        $rows[] = array(
+            'src_table_name' => '',
+            'dst_table_name' => $tbl_nc_name);
     }
+    PMA_syncDisplayDataCompare($rows);
     echo '</table>
-    </div>';
+        </div>
+        </fieldset>';
 
     /**
     * This "list" div will contain a table and each row will depict information about structure/data diffrence in tables.
     * Rows will be generated dynamically as soon as the colored  buttons "D" or "S"  are clicked.
     */
 
-    echo '<div id="list" style = "overflow: auto; width: 1020px; height: 140px;
-          border-left: 1px gray solid; border-bottom: 1px gray solid;
-          padding:0px; margin: 0px">';
-
+    echo '<fieldset style="padding:0"><div id="list" style = "overflow:auto; height:140px; padding:1em">';
     echo '<table>
           <thead>
             <tr style="width: 100%;">
@@ -876,7 +837,7 @@ if (isset($_REQUEST['Table_ids'])) {
             </thead>
             <tbody></tbody>
          </table>
-        </div>';
+        </div></fieldset>';
 
     /**
     *  This fieldset displays the checkbox to confirm deletion of previous rows from target tables
@@ -938,40 +899,28 @@ if (isset($_REQUEST['synchronize_db'])) {
     /**
     * Displaying all the tables of source and target database and now no difference is there.
     */
-    PMA_syncDisplayHeaderSource($src_db);
-
-        $odd_row = false;
-        for($i = 0; $i < count($matching_tables); $i++)
-        {
-            $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-            echo '<td>' . htmlspecialchars($matching_tables[$i]) . '</td>
-            <td></td>
-            </tr>';
-        }
-        for ($j = 0; $j < count($source_tables_uncommon); $j++) {
-            $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-            echo '<td> + ' . htmlspecialchars($source_tables_uncommon[$j]) . '</td> ';
-            echo '<td></td>
-            </tr>';
-        }
-        foreach ($target_tables_uncommon as $tbl_nc_name) {
-            $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-            echo '<td>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; </td><td></td>';
-            echo '</tr>';
-        }
-        echo '</table>';
-        $odd_row = PMA_syncDisplayHeaderTargetAndMatchingTables($trg_db, $matching_tables);
-        foreach ($source_tables_uncommon as $tbl_nc_name) {
-            $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-            echo '<td>' . htmlspecialchars($tbl_nc_name) . ' </td>
-            </tr>';
-        }
-        foreach ($target_tables_uncommon as $tbl_nc_name) {
-            $odd_row = PMA_syncDisplayBeginTableRow($odd_row);
-            echo '<td>  ' . htmlspecialchars($tbl_nc_name) . '</td>';
-            echo '</tr>';
-        }
-    echo '</table> </div>';
+    PMA_syncDisplayHeaderCompare($src_db, $trg_db);
+    $rows = array();
+    for ($i = 0; $i < count($matching_tables); $i++)
+    {
+        $rows[] = array(
+            'src_table_name' => $matching_tables[$i],
+            'dst_table_name' => $matching_tables[$i]);
+    }
+    foreach ($source_tables_uncommon as $tbl_nc_name) {
+        $rows[] = array(
+            'src_table_name' => '+ ' + $tbl_nc_name,
+            'dst_table_name' => $tbl_nc_name);
+    }
+    foreach ($target_tables_uncommon as $tbl_nc_name) {
+        $rows[] = array(
+            'src_table_name' => '',
+            'dst_table_name' => $tbl_nc_name);
+    }
+    PMA_syncDisplayDataCompare($rows);
+    echo '</table>
+        </div>
+        </fieldset>';
 
     /**
     * connecting the source and target servers
@@ -1114,7 +1063,7 @@ if (isset($_REQUEST['synchronize_db'])) {
 
         $database_header .= PMA_showHint(PMA_sanitize(sprintf('%sAllowArbitraryServer%s', '[a@./Documentation.html#AllowArbitraryServer@_blank]', '[/a]')));
 ?>
-      <table id="serverconnection_<?php echo $type; ?>_remote" class="data">
+      <table id="serverconnection_<?php echo $type; ?>_remote" class="data noclick">
       <caption class="tblHeaders"><?php echo $database_header; ?></caption>
       <tr class="odd">
       <td colspan="2" style="text-align: center">
diff --git a/server_variables.php b/server_variables.php
index dcbe19267e..ceced1493e 100644
--- a/server_variables.php
+++ b/server_variables.php
@@ -102,7 +102,7 @@ isSuperuser = <?php echo PMA_isSuperuser()?'true':'false'; ?>;
     <input name="filterText" type="text" id="filterText" style="vertical-align: baseline;" />
 </div>
 </fieldset>
-<table id="serverVariables" class="data filteredData">
+<table id="serverVariables" class="data filteredData noclick">
 <thead>
 <tr><th><?php echo __('Variable'); ?></th>
     <th class="valueHeader">
@@ -118,7 +118,7 @@ echo __('Session value') . ' / ' . __('Global value');
 $odd_row = true;
 foreach ($serverVars as $name => $value) {
     ?>
-<tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?>">
+<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?>">
     <th nowrap="nowrap"><?php echo htmlspecialchars(str_replace('_', ' ', $name)); ?></th>
     <td class="value"><?php echo formatVariable($name,$value); ?></td>
     <td class="value"><?php
@@ -129,7 +129,7 @@ foreach ($serverVars as $name => $value) {
     if (isset($serverVarsSession[$name]) && $serverVarsSession[$name] != $value) {
         ?>
 </tr>
-<tr class="noclick <?php echo $odd_row ? 'odd' : 'even'; ?> ">
+<tr class="<?php echo $odd_row ? 'odd' : 'even'; ?> ">
     <td>(<?php echo __('Session value'); ?>)</td>
     <td class="value"><?php echo formatVariable($name,$serverVarsSession[$name]); ?></td>
     <td class="value"></td>
diff --git a/setup/frames/index.inc.php b/setup/frames/index.inc.php
index 83c6684742..6b170f06f1 100644
--- a/setup/frames/index.inc.php
+++ b/setup/frames/index.inc.php
@@ -57,9 +57,10 @@ if (!$is_https) {
     $text = __('You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!');
 
     if (!empty($_SERVER['REQUEST_URI']) && !empty($_SERVER['HTTP_HOST'])) {
+        $link = 'https://' . htmlspecialchars($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']);
         $strInsecureConnectionMsg2 = __('If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.');
-        $text .= ' ' . PMA_lang($strInsecureConnectionMsg2,
-            'https://' . htmlspecialchars($_SERVER['HTTP_HOST'] . $_SERVER['REQUEST_URI']));
+        $strInsecureConnectionMsg2 = sprintf($strInsecureConnectionMsg2, $link);
+        $text .= ' ' . PMA_lang($strInsecureConnectionMsg2);
     }
     messages_set('notice', 'no_https', __('Insecure connection'), $text);
 }
diff --git a/setup/lib/index.lib.php b/setup/lib/index.lib.php
index 9823cbd31e..334953f83f 100644
--- a/setup/lib/index.lib.php
+++ b/setup/lib/index.lib.php
@@ -115,14 +115,20 @@ function PMA_version_check()
             $data = curl_exec($ch);
             curl_close($ch);
         } else {
-            messages_set('error', $message_id, __('Version check'),
+            messages_set(
+                'error',
+                $message_id,
+                __('Version check'),
                 __('Neither URL wrapper nor CURL is available. Version check is not possible.'));
             return;
         }
     }
 
     if (empty($data)) {
-        messages_set('error', $message_id, __('Version check'),
+        messages_set(
+            'error',
+            $message_id,
+            __('Version check'),
             __('Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.'));
         return;
     }
@@ -139,14 +145,20 @@ function PMA_version_check()
 
     $version_upstream = version_to_int($version);
     if ($version_upstream === false) {
-        messages_set('error', $message_id, __('Version check'),
+        messages_set(
+            'error',
+            $message_id,
+            __('Version check'),
             __('Got invalid version string from server'));
         return;
     }
 
     $version_local = version_to_int($GLOBALS['PMA_Config']->get('PMA_VERSION'));
     if ($version_local === false) {
-        messages_set('error', $message_id, __('Version check'),
+        messages_set(
+            'error',
+            $message_id,
+            __('Version check'),
             __('Unparsable version string'));
         return;
     }
@@ -154,14 +166,23 @@ function PMA_version_check()
     if ($version_upstream > $version_local) {
         $version = htmlspecialchars($version);
         $date = htmlspecialchars($date);
-        messages_set('notice', $message_id, __('Version check'),
+        messages_set(
+            'notice',
+            $message_id,
+            __('Version check'),
             sprintf(__('A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.'), $version, $date));
     } else {
         if ($version_local % 100 == 0) {
-            messages_set('notice', $message_id, __('Version check'),
+            messages_set(
+                'notice',
+                $message_id,
+                __('Version check'),
                 PMA_sanitize(sprintf(__('You are using Git version, run [kbd]git pull[/kbd] :-)[br]The latest stable version is %s, released on %s.'), $version, $date)));
         } else {
-            messages_set('notice', $message_id, __('Version check'),
+            messages_set(
+                'notice',
+                $message_id,
+                __('Version check'),
                 __('No newer stable version is available'));
         }
     }
@@ -170,7 +191,7 @@ function PMA_version_check()
 /**
  * Calculates numerical equivalent of phpMyAdmin version string
  *
- * @param string  version
+ * @param string  $version
  * @return mixed  false on failure, integer on success
  */
 function version_to_int($version)
@@ -197,7 +218,10 @@ function version_to_int($version)
                 $added = 0;
                 break;
             default:
-                messages_set('notice', 'version_match', __('Version check'),
+                messages_set(
+                    'notice',
+                    'version_match',
+                    __('Version check'),
                     'Unknown version part: ' . htmlspecialchars($matches[6]));
                 $added = 0;
                 break;
@@ -292,7 +316,10 @@ function perform_config_checks()
         //
         if (!$cf->getValue("Servers/$i/ssl")) {
             $title = PMA_lang(PMA_lang_name('Servers/1/ssl')) . " ($server_name)";
-            messages_set('notice', "Servers/$i/ssl", $title,
+            messages_set(
+                'notice',
+                "Servers/$i/ssl",
+                $title,
                 __('You should use SSL connections if your web server supports it.'));
         }
 
@@ -302,7 +329,10 @@ function perform_config_checks()
         //
         if ($cf->getValue("Servers/$i/extension") == 'mysql') {
             $title = PMA_lang(PMA_lang_name('Servers/1/extension')) . " ($server_name)";
-            messages_set('notice', "Servers/$i/extension", $title,
+            messages_set(
+                'notice',
+                "Servers/$i/extension",
+                $title,
                 __('You should use mysqli for performance reasons.'));
         }
 
@@ -314,9 +344,12 @@ function perform_config_checks()
                 && $cf->getValue("Servers/$i/user") != ''
                 && $cf->getValue("Servers/$i/password") != '') {
             $title = PMA_lang(PMA_lang_name('Servers/1/auth_type')) . " ($server_name)";
-            messages_set('notice', "Servers/$i/auth_type", $title,
-                    PMA_lang($strServerAuthConfigMsg, $i) . ' ' .
-                            PMA_lang($strSecurityInfoMsg, $i));
+            messages_set(
+                'notice',
+                "Servers/$i/auth_type",
+                $title,
+                PMA_lang($strServerAuthConfigMsg, $i) . ' ' .
+                    PMA_lang($strSecurityInfoMsg, $i));
         }
 
         //
@@ -327,9 +360,12 @@ function perform_config_checks()
         if ($cf->getValue("Servers/$i/AllowRoot")
                 && $cf->getValue("Servers/$i/AllowNoPassword")) {
             $title = PMA_lang(PMA_lang_name('Servers/1/AllowNoPassword')) . " ($server_name)";
-            messages_set('notice', "Servers/$i/AllowNoPassword", $title,
-                    __('You allow for connecting to the server without a password.') . ' ' .
-                            PMA_lang($strSecurityInfoMsg, $i));
+            messages_set(
+                'notice',
+                "Servers/$i/AllowNoPassword",
+                $title,
+                __('You allow for connecting to the server without a password.') . ' ' .
+                    PMA_lang($strSecurityInfoMsg, $i));
         }
     }
 
@@ -340,7 +376,9 @@ function perform_config_checks()
     if ($cookie_auth_used) {
         if ($blowfish_secret_set) {
             // 'cookie' auth used, blowfish_secret was generated
-            messages_set('notice', 'blowfish_secret_created',
+            messages_set(
+                'notice',
+                'blowfish_secret_created',
                 PMA_lang(PMA_lang_name('blowfish_secret')),
                 $strBlowfishSecretMsg);
         } else {
@@ -358,7 +396,9 @@ function perform_config_checks()
                 $blowfish_warnings[] = PMA_lang(__('Key should contain letters, numbers [em]and[/em] special characters.'));
             }
             if (!empty($blowfish_warnings)) {
-                messages_set('error', 'blowfish_warnings' . count($blowfish_warnings),
+                messages_set(
+                    'error',
+                    'blowfish_warnings' . count($blowfish_warnings),
                     PMA_lang(PMA_lang_name('blowfish_secret')),
                     implode('<br />', $blowfish_warnings));
             }
@@ -370,7 +410,9 @@ function perform_config_checks()
     // should be enabled if possible
     //
     if (!$cf->getValue('ForceSSL')) {
-        messages_set('notice', 'ForceSSL',
+        messages_set(
+            'notice',
+            'ForceSSL',
             PMA_lang(PMA_lang_name('ForceSSL')),
             PMA_lang($strForceSSLNotice));
     }
@@ -380,7 +422,9 @@ function perform_config_checks()
     // should be disabled
     //
     if ($cf->getValue('AllowArbitraryServer')) {
-        messages_set('notice', 'AllowArbitraryServer',
+        messages_set(
+            'notice',
+            'AllowArbitraryServer',
             PMA_lang(PMA_lang_name('AllowArbitraryServer')),
             PMA_lang($strAllowArbitraryServerWarning));
     }
@@ -394,7 +438,9 @@ function perform_config_checks()
         $message_type = $cf->getValue('LoginCookieValidity') > ini_get('session.gc_maxlifetime')
             ? 'error'
             : 'notice';
-        messages_set($message_type, 'LoginCookieValidity',
+        messages_set(
+            $message_type,
+            'LoginCookieValidity',
             PMA_lang(PMA_lang_name('LoginCookieValidity')),
             PMA_lang($strLoginCookieValidityWarning));
     }
@@ -404,7 +450,9 @@ function perform_config_checks()
     // should be at most 1800 (30 min)
     //
     if ($cf->getValue('LoginCookieValidity') > 1800) {
-        messages_set('notice', 'LoginCookieValidity',
+        messages_set(
+            'notice',
+            'LoginCookieValidity',
             PMA_lang(PMA_lang_name('LoginCookieValidity')),
             PMA_lang($strLoginCookieValidityWarning2));
     }
@@ -415,7 +463,9 @@ function perform_config_checks()
     // LoginCookieValidity must be less or equal to LoginCookieStore
     //
     if ($cf->getValue('LoginCookieStore') != 0 && $cf->getValue('LoginCookieValidity') > $cf->getValue('LoginCookieStore')) {
-       messages_set('error', 'LoginCookieValidity',
+        messages_set(
+            'error',
+            'LoginCookieValidity',
             PMA_lang(PMA_lang_name('LoginCookieValidity')),
             PMA_lang($strLoginCookieValidityWarning3));
     }
@@ -425,7 +475,9 @@ function perform_config_checks()
     // should not be world-accessible
     //
     if ($cf->getValue('SaveDir') != '') {
-        messages_set('notice', 'SaveDir',
+        messages_set(
+            'notice',
+            'SaveDir',
             PMA_lang(PMA_lang_name('SaveDir')),
             PMA_lang($strDirectoryNotice));
     }
@@ -435,7 +487,9 @@ function perform_config_checks()
     // should not be world-accessible
     //
     if ($cf->getValue('TempDir') != '') {
-        messages_set('notice', 'TempDir',
+        messages_set(
+            'notice',
+            'TempDir',
             PMA_lang(PMA_lang_name('TempDir')),
             PMA_lang($strDirectoryNotice));
     }
@@ -446,7 +500,9 @@ function perform_config_checks()
     //
     if ($cf->getValue('GZipDump')
             && (@!function_exists('gzopen') || @!function_exists('gzencode'))) {
-        messages_set('error', 'GZipDump',
+        messages_set(
+            'error',
+            'GZipDump',
             PMA_lang(PMA_lang_name('GZipDump')),
             PMA_lang($strGZipDumpWarning, 'gzencode'));
     }
@@ -463,7 +519,9 @@ function perform_config_checks()
         $functions .= @function_exists('bzcompress')
                 ? ''
                 : ($functions ? ', ' : '') . 'bzcompress';
-        messages_set('error', 'BZipDump',
+        messages_set(
+            'error',
+            'BZipDump',
             PMA_lang(PMA_lang_name('BZipDump')),
             PMA_lang($strBZipDumpWarning, $functions));
     }
@@ -473,7 +531,9 @@ function perform_config_checks()
     // requires zip_open in import
     //
     if ($cf->getValue('ZipDump') && !@function_exists('zip_open')) {
-        messages_set('error', 'ZipDump_import',
+        messages_set(
+            'error',
+            'ZipDump_import',
             PMA_lang(PMA_lang_name('ZipDump')),
             PMA_lang($strZipDumpImportWarning, 'zip_open'));
     }
@@ -483,7 +543,9 @@ function perform_config_checks()
     // requires gzcompress in export
     //
     if ($cf->getValue('ZipDump') && !@function_exists('gzcompress')) {
-        messages_set('error', 'ZipDump_export',
+        messages_set(
+            'error',
+            'ZipDump_export',
             PMA_lang(PMA_lang_name('ZipDump')),
             PMA_lang($strZipDumpExportWarning, 'gzcompress'));
     }
diff --git a/tbl_alter.php b/tbl_alter.php
index 807a39ec80..6c46c9f2ee 100644
--- a/tbl_alter.php
+++ b/tbl_alter.php
@@ -130,9 +130,9 @@ if (isset($_REQUEST['do_save_data'])) {
             }
         }
 
-        if ( $GLOBALS['is_ajax_request'] == true) {
+        if ( $_REQUEST['ajax_request'] == true) {
             $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
-            PMA_ajaxResponse($message, $message->isSuccess(),$extra_data);
+            PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
         }
 
         $active_page = 'tbl_structure.php';
diff --git a/tbl_move_copy.php b/tbl_move_copy.php
index 330edcc0be..58d90f347f 100644
--- a/tbl_move_copy.php
+++ b/tbl_move_copy.php
@@ -65,6 +65,13 @@ if (PMA_isValid($_REQUEST['new_name'])) {
             $db        = $_REQUEST['target_db'];
             $table     = $_REQUEST['new_name'];
         }
+        
+        if ( $_REQUEST['ajax_request'] == true) {
+            $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
+            $extra_data['db'] = $GLOBALS['db'];
+            PMA_ajaxResponse($message, $message->isSuccess(), $extra_data);
+        }
+        
         $reload = 1;
     }
 } else {
diff --git a/tbl_operations.php b/tbl_operations.php
index 3481fd1cd6..3e9bdebc4d 100644
--- a/tbl_operations.php
+++ b/tbl_operations.php
@@ -229,7 +229,7 @@ if (isset($result) && empty($message_to_show)) {
         $_message = $result ? $message = PMA_Message::success(__('Your SQL query has been executed successfully')) : PMA_Message::error(__('Error'));
         // $result should exist, regardless of $_message
         $_type = $result ? 'success' : 'error';
-        if ( $GLOBALS['is_ajax_request'] == true) {
+        if ( $_REQUEST['ajax_request'] == true) {
             $extra_data['sql_query'] = PMA_showMessage(NULL, $sql_query);
             PMA_ajaxResponse($_message,$_message->isSuccess() ,$extra_data);
         }
@@ -238,7 +238,7 @@ if (isset($result) && empty($message_to_show)) {
         $_message = new PMA_Message;
         $_message->addMessages($warning_messages);
         $_message->isError(true);
-        if ( $GLOBALS['is_ajax_request'] == true) {
+        if ( $_REQUEST['ajax_request'] == true) {
             PMA_ajaxResponse($_message, false);
         }
         unset($warning_messages);
@@ -532,7 +532,7 @@ if (isset($possible_row_formats[$tbl_type])) {
 
 <!-- Copy table -->
 <div class="operations_half_width">
-<form method="post" action="tbl_operations.php"
+<form method="post" action="tbl_operations.php" name="copyTable" id="copyTable" <?php echo ($GLOBALS['cfg']['AjaxEnable'] ? ' class="ajax"' : '');?>
     onsubmit="return emptyFormElements(this, 'new_name')">
 <?php echo PMA_generate_common_hidden_inputs($GLOBALS['db'], $GLOBALS['table']); ?>
 <input type="hidden" name="reload" value="1" />
diff --git a/themes/original/img/new_data.jpg b/themes/original/img/new_data.jpg
deleted file mode 100644
index 08d30d34a7..0000000000
Binary files a/themes/original/img/new_data.jpg and /dev/null differ
diff --git a/themes/original/img/new_data.png b/themes/original/img/new_data.png
new file mode 100644
index 0000000000..65335718b4
Binary files /dev/null and b/themes/original/img/new_data.png differ
diff --git a/themes/original/img/new_data_hovered.jpg b/themes/original/img/new_data_hovered.jpg
deleted file mode 100644
index c385872add..0000000000
Binary files a/themes/original/img/new_data_hovered.jpg and /dev/null differ
diff --git a/themes/original/img/new_data_hovered.png b/themes/original/img/new_data_hovered.png
new file mode 100644
index 0000000000..b1cbdcdf5e
Binary files /dev/null and b/themes/original/img/new_data_hovered.png differ
diff --git a/themes/original/img/new_data_selected.jpg b/themes/original/img/new_data_selected.jpg
deleted file mode 100644
index caabf6767e..0000000000
Binary files a/themes/original/img/new_data_selected.jpg and /dev/null differ
diff --git a/themes/original/img/new_data_selected.png b/themes/original/img/new_data_selected.png
new file mode 100644
index 0000000000..39aa50fc3b
Binary files /dev/null and b/themes/original/img/new_data_selected.png differ
diff --git a/themes/original/img/new_data_selected_hovered.jpg b/themes/original/img/new_data_selected_hovered.jpg
deleted file mode 100644
index a34ba21944..0000000000
Binary files a/themes/original/img/new_data_selected_hovered.jpg and /dev/null differ
diff --git a/themes/original/img/new_data_selected_hovered.png b/themes/original/img/new_data_selected_hovered.png
new file mode 100644
index 0000000000..7105a2d289
Binary files /dev/null and b/themes/original/img/new_data_selected_hovered.png differ
diff --git a/themes/original/img/new_struct.jpg b/themes/original/img/new_struct.jpg
deleted file mode 100644
index 283a5e9698..0000000000
Binary files a/themes/original/img/new_struct.jpg and /dev/null differ
diff --git a/themes/original/img/new_struct.png b/themes/original/img/new_struct.png
new file mode 100644
index 0000000000..14f7969712
Binary files /dev/null and b/themes/original/img/new_struct.png differ
diff --git a/themes/original/img/new_struct_hovered.jpg b/themes/original/img/new_struct_hovered.jpg
deleted file mode 100644
index 7a7c70442f..0000000000
Binary files a/themes/original/img/new_struct_hovered.jpg and /dev/null differ
diff --git a/themes/original/img/new_struct_hovered.png b/themes/original/img/new_struct_hovered.png
new file mode 100644
index 0000000000..5746ac1666
Binary files /dev/null and b/themes/original/img/new_struct_hovered.png differ
diff --git a/themes/original/img/new_struct_selected.jpg b/themes/original/img/new_struct_selected.jpg
deleted file mode 100644
index 16b2b8cb3d..0000000000
Binary files a/themes/original/img/new_struct_selected.jpg and /dev/null differ
diff --git a/themes/original/img/new_struct_selected.png b/themes/original/img/new_struct_selected.png
new file mode 100644
index 0000000000..618ba81242
Binary files /dev/null and b/themes/original/img/new_struct_selected.png differ
diff --git a/themes/original/img/new_struct_selected_hovered.jpg b/themes/original/img/new_struct_selected_hovered.jpg
deleted file mode 100644
index 77a53715d4..0000000000
Binary files a/themes/original/img/new_struct_selected_hovered.jpg and /dev/null differ
diff --git a/themes/original/img/new_struct_selected_hovered.png b/themes/original/img/new_struct_selected_hovered.png
new file mode 100644
index 0000000000..4e0947e436
Binary files /dev/null and b/themes/original/img/new_struct_selected_hovered.png differ
diff --git a/themes/pmahomme/img/new_data.jpg b/themes/pmahomme/img/new_data.jpg
deleted file mode 100644
index 08d30d34a7..0000000000
Binary files a/themes/pmahomme/img/new_data.jpg and /dev/null differ
diff --git a/themes/pmahomme/img/new_data.png b/themes/pmahomme/img/new_data.png
new file mode 100644
index 0000000000..65335718b4
Binary files /dev/null and b/themes/pmahomme/img/new_data.png differ
diff --git a/themes/pmahomme/img/new_data_hovered.jpg b/themes/pmahomme/img/new_data_hovered.jpg
deleted file mode 100644
index c385872add..0000000000
Binary files a/themes/pmahomme/img/new_data_hovered.jpg and /dev/null differ
diff --git a/themes/pmahomme/img/new_data_hovered.png b/themes/pmahomme/img/new_data_hovered.png
new file mode 100644
index 0000000000..b1cbdcdf5e
Binary files /dev/null and b/themes/pmahomme/img/new_data_hovered.png differ
diff --git a/themes/pmahomme/img/new_data_selected.jpg b/themes/pmahomme/img/new_data_selected.jpg
deleted file mode 100644
index caabf6767e..0000000000
Binary files a/themes/pmahomme/img/new_data_selected.jpg and /dev/null differ
diff --git a/themes/pmahomme/img/new_data_selected.png b/themes/pmahomme/img/new_data_selected.png
new file mode 100644
index 0000000000..39aa50fc3b
Binary files /dev/null and b/themes/pmahomme/img/new_data_selected.png differ
diff --git a/themes/pmahomme/img/new_data_selected_hovered.jpg b/themes/pmahomme/img/new_data_selected_hovered.jpg
deleted file mode 100644
index a34ba21944..0000000000
Binary files a/themes/pmahomme/img/new_data_selected_hovered.jpg and /dev/null differ
diff --git a/themes/pmahomme/img/new_data_selected_hovered.png b/themes/pmahomme/img/new_data_selected_hovered.png
new file mode 100644
index 0000000000..7105a2d289
Binary files /dev/null and b/themes/pmahomme/img/new_data_selected_hovered.png differ
diff --git a/themes/pmahomme/img/new_struct.jpg b/themes/pmahomme/img/new_struct.jpg
deleted file mode 100644
index 283a5e9698..0000000000
Binary files a/themes/pmahomme/img/new_struct.jpg and /dev/null differ
diff --git a/themes/pmahomme/img/new_struct.png b/themes/pmahomme/img/new_struct.png
new file mode 100644
index 0000000000..14f7969712
Binary files /dev/null and b/themes/pmahomme/img/new_struct.png differ
diff --git a/themes/pmahomme/img/new_struct_hovered.jpg b/themes/pmahomme/img/new_struct_hovered.jpg
deleted file mode 100644
index 7a7c70442f..0000000000
Binary files a/themes/pmahomme/img/new_struct_hovered.jpg and /dev/null differ
diff --git a/themes/pmahomme/img/new_struct_hovered.png b/themes/pmahomme/img/new_struct_hovered.png
new file mode 100644
index 0000000000..5746ac1666
Binary files /dev/null and b/themes/pmahomme/img/new_struct_hovered.png differ
diff --git a/themes/pmahomme/img/new_struct_selected.jpg b/themes/pmahomme/img/new_struct_selected.jpg
deleted file mode 100644
index 16b2b8cb3d..0000000000
Binary files a/themes/pmahomme/img/new_struct_selected.jpg and /dev/null differ
diff --git a/themes/pmahomme/img/new_struct_selected.png b/themes/pmahomme/img/new_struct_selected.png
new file mode 100644
index 0000000000..618ba81242
Binary files /dev/null and b/themes/pmahomme/img/new_struct_selected.png differ
diff --git a/themes/pmahomme/img/new_struct_selected_hovered.jpg b/themes/pmahomme/img/new_struct_selected_hovered.jpg
deleted file mode 100644
index 77a53715d4..0000000000
Binary files a/themes/pmahomme/img/new_struct_selected_hovered.jpg and /dev/null differ
diff --git a/themes/pmahomme/img/new_struct_selected_hovered.png b/themes/pmahomme/img/new_struct_selected_hovered.png
new file mode 100644
index 0000000000..4e0947e436
Binary files /dev/null and b/themes/pmahomme/img/new_struct_selected_hovered.png differ