Merge branch 'QA_4_8' into STABLE

2018-08-22 09:44:28 -04:00 · 2018-08-22 09:44:28 -04:00 · 90de334dcf
commit 90de334dcf
parent a9bce51784 9e7fceca66
46 changed files with 4374 additions and 8108 deletions
--- a/22
+++ b/22
@ -1,6 +1,28 @@
 phpMyAdmin - ChangeLog
 ======================

+4.8.3 (2018-08-22)
+- issue #14314 Error when naming a database '0'
+- issue #14333 Fix NULL as default not shown
+- issue #14229 Fixes issue with recent table list
+- issue #14045 Fix slow performance on DB structure filtering
+- issue #14327 Fix Editing server variable not showing save or cancel option
+- issue #14377 Populate options for view create and edit
+- issue #14171 2FA configuration fails if PHP doesn't have GD support
+- issue #14390 Can't unhide tables
+- issue #14382 "Visualize GIS data" icon missing
+- issue #14435 Event scheduler status toggle doesn't work
+- issue #14365 View not working on multiple servers
+- issue #14207 Partition actions in table structure do not work
+- issue #14375 Fixes ERR_BLOCKED_BY_XSS_AUDITOR on export table
+- issue #14552 Blank message shown instead of MySQL error when adding trigger and other locations
+- issue #14525 Fix PHP 7.3 warning: "continue" in "switch" is equal to "break"
+- issue #14554 Icon missing when creating a new trigger, routine, and event
+- issue #14422 Table comment not showing since 4.8.1
+- issue #14426 Drop table doesn't work when you copy tables to another database
+- issue #14581 Escaped HTML in 'Add a new server' setup
+- issue #14548 [security] HTML injection in import warning messages, see PMASA-2018-5
+
 4.8.2 (2018-06-21)
 - issue #14370 WHERE 0 causes Fatal error
 - issue #14225 Fix missing index icon
--- a/2
+++ b/2
@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================

-Version 4.8.2
+Version 4.8.3

 A web interface for MySQL and MariaDB.

--- a/doc/conf.py
+++ b/doc/conf.py
@ -51,7 +51,7 @@ copyright = u'2012 - 2018, The phpMyAdmin devel team'
 # built documents.
 #
 # The short X.Y version.
-version = '4.8.2'
+version = '4.8.3'
 # The full version, including alpha/beta/rc tags.
 release = version

--- a/js/functions.js
+++ b/js/functions.js
@ -155,7 +155,7 @@ function PMA_addDatepicker ($this_element, type, options) {
            }
        }
    };
-    if (type == "time") {
+    if (type == 'time') {
        $this_element.timepicker($.extend(defaultOptions, options));
        // Add a tip regarding entering MySQL allowed-values for TIME data-type
        PMA_tooltip($this_element, 'input', PMA_messages.strMysqlAllowedValuesTipTime);
@ -674,7 +674,7 @@ function confirmLink (theLink, theSqlQuery) {
    if (is_confirmed) {
        if (typeof(theLink.href) !== 'undefined') {
            theLink.href += PMA_commonParams.get('arg_separator') + 'is_js_confirmed=1';
-        } else if (typeof(theLink.form) != 'undefined') {
+        } else if (typeof(theLink.form) !== 'undefined') {
            theLink.form.action += '?is_js_confirmed=1';
        }
    }
@ -3738,9 +3738,9 @@ function indexEditorDialog (url, title, callback_success, callback_failure) {
        var $form = $('#index_frm');
        var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
        PMA_prepareForAjaxRequest($form);
-        //User wants to submit the form
-        $.post($form.attr('action'), $form.serialize() + PMA_commonParams.get('arg_separator') + "do_save_data=1", function (data) {
-            var $sqlqueryresults = $(".sqlqueryresults");
+        // User wants to submit the form
+        $.post($form.attr('action'), $form.serialize() + PMA_commonParams.get('arg_separator') + 'do_save_data=1', function (data) {
+            var $sqlqueryresults = $('.sqlqueryresults');
            if ($sqlqueryresults.length !== 0) {
                $sqlqueryresults.remove();
            }
@ -4032,8 +4032,8 @@ var toggleButton = function ($obj) {
            addClass = 'on';
        }

-        var params = { 'ajax_request': true };
-        $.post(url, params, function (data) {
+        var parts = url.split('?');
+        $.post(parts[0], parts[1] + '&ajax_request=true', function (data) {
            if (typeof data !== 'undefined' && data.success === true) {
                PMA_ajaxRemoveMessage($msg);
                $container
@ -4543,7 +4543,8 @@ function PMA_createViewDialog ($this) {
    var $msg = PMA_ajaxShowMessage();
    var syntaxHighlighter = null;
    var sep = PMA_commonParams.get('arg_separator');
-    $.get($this.attr('href') + sep + 'ajax_request=1' + sep + 'ajax_dialog=1', function (data) {
+    params = $this.getPostData();
+    $.get($this.attr('href') + sep + 'ajax_request=1' + sep + 'ajax_dialog=1' + sep + params, function (data) {
        if (typeof data !== 'undefined' && data.success === true) {
            PMA_ajaxRemoveMessage($msg);
            var buttonOptions = {};
@ -4700,18 +4701,20 @@ $(document).on('keyup', '#filterText', function () {
    var count = 0;
    $('[data-filter-row]').each(function () {
        var $row = $(this);
-        console.log($row);
        /* Can not use data() here as it does magic conversion to int for numeric values */
        if ($row.attr('data-filter-row').indexOf(filterInput) > -1) {
            count += 1;
            $row.show();
-            $row.find('input.checkall').removeClass('row-hidden').trigger('change');
+            $row.find('input.checkall').removeClass('row-hidden');
        } else {
            $row.hide();
-            $row.find('input.checkall').addClass('row-hidden').prop('checked', false).trigger('change');
+            $row.find('input.checkall').addClass('row-hidden').prop('checked', false);
            $row.removeClass('marked');
        }
    });
+    setTimeout(function () {
+        $(checkboxes_sel).trigger('change');
+    }, 300);
    $('#filter-rows-count').html(count);
 });
 AJAX.registerOnload('functions.js', function () {
@ -4940,7 +4943,7 @@ AJAX.registerOnload('functions.js', function () {
 *                  .attr(name, value) - Sets a particular attribute of the IMG
 *                                       tag to the given value
 */
-function PMA_getImage(image, alternate, attributes) {
+function PMA_getImage (image, alternate, attributes) {
    // custom image object, it will eventually be returned by this functions
    var retval = {
        data: {
@ -5020,18 +5023,17 @@ function PMA_getImage(image, alternate, attributes) {
 * @param  {object}     value       Configuration value.
 * @param  {boolean}    only_local  Configuration type.
 */
-function configSet(key, value, only_local)
-{
+function configSet (key, value, only_local) {
    only_local = (typeof only_local !== 'undefined') ? only_local : false;
    var serialized = JSON.stringify(value);
    localStorage.setItem(key, serialized);
    $.ajax({
-        url: "ajax.php",
-        type: "POST",
-        dataType: "json",
+        url: 'ajax.php',
+        type: 'POST',
+        dataType: 'json',
        data: {
            key: key,
-            type: "config-set",
+            type: 'config-set',
            server: PMA_commonParams.get('server'),
            value: serialized,
        },
@ -5058,8 +5060,7 @@ function configSet(key, value, only_local)
 *
 * @return {object}                 Configuration value.
 */
-function configGet(key, cached)
-{
+function configGet (key, cached) {
    cached = (typeof cached !== 'undefined') ? cached : true;
    var value = localStorage.getItem(key);
    if (cached && value !== undefined && value !== null) {
@ -5073,11 +5074,11 @@ function configGet(key, cached)
        // processing cannot continue until that value is found.
        // Another solution is to provide a callback as a parameter.
        async: false,
-        url: "ajax.php",
-        type: "POST",
-        dataType: "json",
+        url: 'ajax.php',
+        type: 'POST',
+        dataType: 'json',
        data: {
-            type: "config-get",
+            type: 'config-get',
            server: PMA_commonParams.get('server'),
            key: key
        },
@ -5097,7 +5098,7 @@ function configGet(key, cached)
 /**
 * Return POST data as stored by Util::linkOrButton
 */
-jQuery.fn.getPostData = function() {
+jQuery.fn.getPostData = function () {
    var dataPost = this.attr('data-post');
    // Strip possible leading ?
    if (dataPost !== undefined && dataPost.substring(0,1) == '?') {
--- a/js/server_variables.js
+++ b/js/server_variables.js
@ -14,7 +14,7 @@ AJAX.registerOnload('server_variables.js', function () {
    var $cancelLink = $('a.cancelLink');

    $('#serverVariables').find('.var-name').find('a').append(
-        $('#docImage').clone().show()
+        $('#docImage').clone().css('display', 'inline-block')
    );

    /* Launches the variable editor */
@ -29,11 +29,11 @@ AJAX.registerOnload('server_variables.js', function () {
        var $cell = $link.parent();
        var $valueCell = $link.parents('.var-row').find('.var-value');
        var varName = $link.data('variable');
-        var $mySaveLink = $saveLink.clone().show();
-        var $myCancelLink = $cancelLink.clone().show();
+
+        var $mySaveLink = $saveLink.clone().css('display', 'inline-block');
+        var $myCancelLink = $cancelLink.clone().css('display', 'inline-block');
        var $msgbox = PMA_ajaxShowMessage();
        var $myEditLink = $cell.find('a.editLink');
-
        $cell.addClass('edit'); // variable is being edited
        $myEditLink.remove(); // remove edit link

@ -87,7 +87,9 @@ AJAX.registerOnload('server_variables.js', function () {
                    );
                    // Save and replace content
                $cell
-                    .html($links);
+                    .html($links)
+                    .children()
+                    .css('display', 'flex');
                $valueCell
                    .data('content', $valueCell.html())
                    .html($editor)
--- a/js/tbl_structure.js
+++ b/js/tbl_structure.js
@ -421,10 +421,7 @@ AJAX.registerOnload('tbl_structure.js', function () {
        var $link = $(this);

        function submitPartitionAction (url) {
-            var params = {
-                'ajax_request' : true,
-                'ajax_page_request' : true
-            };
+            var params = 'ajax_request=true&ajax_page_request=true&' + $link.getPostData();
            PMA_ajaxShowMessage();
            AJAX.source = $link;
            $.post(url, params, AJAX.responseHandler);
--- a/libraries/classes/Config.php
+++ b/libraries/classes/Config.php
@ -116,7 +116,7 @@ class Config
     */
    public function checkSystem()
    {
-        $this->set('PMA_VERSION', '4.8.2');
+        $this->set('PMA_VERSION', '4.8.3');
        /* Major version */
        $this->set(
            'PMA_MAJOR_VERSION',
--- a/libraries/classes/Config/FormDisplay.php
+++ b/libraries/classes/Config/FormDisplay.php
@ -655,7 +655,8 @@ class FormDisplay
                    if (! $successfully_validated) {
                        $this->_errors[$work_path][] = __('Incorrect value!');
                        $result = false;
-                        continue;
+                        // "continue" for the $form->fields foreach-loop
+                        continue 2;
                    }
                    break;
                case 'string':
--- a/libraries/classes/Controllers/Server/ServerDatabasesController.php
+++ b/libraries/classes/Controllers/Server/ServerDatabasesController.php
@ -72,7 +72,7 @@ class ServerDatabasesController extends Controller

        include_once 'libraries/replication.inc.php';

-        if (! empty($_POST['new_db'])
+        if (isset($_POST['new_db'])
            && $response->isAjax()
        ) {
            $this->createDatabaseAction();
--- a/libraries/classes/DatabaseInterface.php
+++ b/libraries/classes/DatabaseInterface.php
@ -876,7 +876,7 @@ class DatabaseInterface
                                           AS SCHEMA_DATA_FREE';
            }
            $sql .= '
-                   FROM `information_schema`.SCHEMATA s';
+                   FROM `information_schema`.SCHEMATA s ';
            if ($force_stats) {
                $sql .= '
                    LEFT JOIN `information_schema`.TABLES t
--- a/libraries/classes/Display/Results.php
+++ b/libraries/classes/Display/Results.php
@ -5019,7 +5019,9 @@ class Results
                        'tbl_gis_visualization.php'
                        . Url::getCommon($_url_params),
                        Util::getIcon(
-                            'b_globe.gif', __('Visualize GIS data'), true
+                            'b_globe',
+                            __('Visualize GIS data'),
+                            true
                        )
                    )
                    . "\n";
--- a/libraries/classes/Export.php
+++ b/libraries/classes/Export.php
@ -520,11 +520,11 @@ class Export
        foreach($_POST as $name => $value) {
            if (is_array($value)) {
                foreach($value as $val) {
-                    $refreshButton .= '<input type="hidden" name="' . $name . '[]" value="' . $val . '">';
+                    $refreshButton .= '<input type="hidden" name="' . urlencode((string) $name) . '[]" value="' . urlencode((string) $val) . '">';
                }
            }
            else {
-                $refreshButton .= '<input type="hidden" name="' . $name . '" value="' . $value . '">';
+                $refreshButton .= '<input type="hidden" name="' . urlencode((string) $name) . '" value="' . urlencode((string) $value) . '">';
            }
        }
        $refreshButton .= '</form>';
--- a/libraries/classes/Header.php
+++ b/libraries/classes/Header.php
@ -474,7 +474,7 @@ class Header
                $retval .= '<div id="page_content">';
                $retval .= $this->getMessage();
            }
-            if ($this->_isEnabled && isset($_REQUEST['recent_table']) && strlen($_REQUEST['recent_table'])) {
+            if ($this->_isEnabled && empty($_REQUEST['recent_table'])) {
                $retval .= $this->_addRecentTable(
                    $GLOBALS['db'],
                    $GLOBALS['table']
--- a/libraries/classes/MultSubmits.php
+++ b/libraries/classes/MultSubmits.php
@ -401,7 +401,7 @@ class MultSubmits
        $html .= '<label for="what_data">' . __('Structure and data') . '</label><br>';
        $html .= '<input type="radio" id ="what_dataonly" value="dataonly" name="what"/>';
        $html .= '<label for="what_dataonly">' . __('Data only') . '</label><br><br>';
-        $html .= '<input type="checkbox" id="checkbox_drop" value="1" name="drop_if_exists"/>';
+        $html .= '<input type="checkbox" id="checkbox_drop" value="true" name="drop_if_exists"/>';
        $html .= '<label for="checkbox_drop">' . __('Add DROP TABLE') . '</label><br>';
        $html .= '<input type="checkbox" id="checkbox_auto_increment_cp" value="1" name="sql_auto_increment"/>';
        $html .= '<label for="checkbox_auto_increment_cp">' . __('Add AUTO INCREMENT value') . '</label><br>';
--- a/libraries/classes/Navigation/Navigation.php
+++ b/libraries/classes/Navigation/Navigation.php
@ -233,8 +233,8 @@ class Navigation
                        $html .= '<td style="width:80px"><a href="navigation.php'
                            . Url::getCommon($params) . '"'
                            . ' class="unhideNavItem ajax">'
-                            . Util::getIcon('show.png', __('Show'))
-                            .  '</a></td>';
+                            . Util::getIcon('show', __('Show'))
+                            . '</a></td>';
                    }
                    $html .= '</tbody></table>';
                    $first = false;
--- a/libraries/classes/Plugins/TwoFactor/Application.php
+++ b/libraries/classes/Plugins/TwoFactor/Application.php
@ -91,15 +91,30 @@ class Application extends TwoFactorPlugin
    public function setup()
    {
        $secret = $this->_twofactor->config['settings']['secret'];
-        $inlineUrl = $this->_google2fa->getQRCodeInline(
-            'phpMyAdmin (' . $this->getAppId(false) . ')',
-            $this->_twofactor->user,
-            $secret
-        );
-        return Template::get('login/twofactor/application_configure')->render([
-            'image' => $inlineUrl,
-            'secret' => $secret
-        ]);
+        $renderArray = ['secret' => $secret];
+        if (extension_loaded('gd')) {
+            $inlineUrl = $this->_google2fa->getQRCodeInline(
+                'phpMyAdmin (' . $this->getAppId(false) . ')',
+                $this->_twofactor->user,
+                $secret
+            );
+            $renderArray['image'] = $inlineUrl;
+        } else {
+            $inlineUrl = $this->_google2fa->getQRCodeUrl(
+                'phpMyAdmin (' . $this->getAppId(false) . ')',
+                $this->_twofactor->user,
+                $secret
+            );
+            trigger_error(
+                __(
+                    'The gd PHP extension was not found.'
+                    . ' The QRcode can not be displayed without the gd PHP extension.'
+                ),
+                E_USER_WARNING
+            );
+            $renderArray['url'] = $inlineUrl;
+        }
+        return Template::get('login/twofactor/application_configure')->render($renderArray);
    }

    /**
--- a/libraries/classes/Rte/Events.php
+++ b/libraries/classes/Rte/Events.php
@ -123,7 +123,7 @@ class Events
                            htmlspecialchars($drop_item)
                        )
                        . '<br />'
-                        . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
+                        . __('MySQL said: ') . $GLOBALS['dbi']->getError();
                    } else {
                        $result = $GLOBALS['dbi']->tryQuery($item_query);
                        if (! $result) {
@ -132,7 +132,7 @@ class Events
                                htmlspecialchars($item_query)
                            )
                            . '<br />'
-                            . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
+                            . __('MySQL said: ') . $GLOBALS['dbi']->getError();
                            // We dropped the old item, but were unable to create
                            // the new one. Try to restore the backup query
                            $result = $GLOBALS['dbi']->tryQuery($create_item);
@ -163,7 +163,7 @@ class Events
                            htmlspecialchars($item_query)
                        )
                        . '<br /><br />'
-                        . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
+                        . __('MySQL said: ') . $GLOBALS['dbi']->getError();
                    } else {
                        $message = Message::success(
                            __('Event %1$s has been created.')
--- a/libraries/classes/Rte/Footer.php
+++ b/libraries/classes/Rte/Footer.php
@ -30,7 +30,7 @@ class Footer
    {
        global $db, $table, $url_query;

-        $icon = mb_strtolower($name) . '_add.png';
+        $icon = mb_strtolower($name) . '_add';
        $retval  = "";
        $retval .= "<!-- ADD " . $name . " FORM START -->\n";
        $retval .= "<fieldset class='left'>\n";
--- a/libraries/classes/Rte/General.php
+++ b/libraries/classes/Rte/General.php
@ -45,7 +45,7 @@ class General
        $errors[] = $error . '<br />'
            . __('The backed up query was:')
            . "\"" . htmlspecialchars($createStatement) . "\"" . '<br />'
-            . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
+            . __('MySQL said: ') . $GLOBALS['dbi']->getError();

        return $errors;
    }
--- a/libraries/classes/Rte/Routines.php
+++ b/libraries/classes/Rte/Routines.php
@ -241,7 +241,7 @@ class Routines
                            htmlspecialchars($drop_routine)
                        )
                        . '<br />'
-                        . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
+                        . __('MySQL said: ') . $GLOBALS['dbi']->getError();
                    } else {
                        list($newErrors, $message) = self::create(
                            $routine_query,
@ -268,7 +268,7 @@ class Routines
                        htmlspecialchars($routine_query)
                    )
                    . '<br /><br />'
-                    . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
+                    . __('MySQL said: ') . $GLOBALS['dbi']->getError();
                } else {
                    $message = Message::success(
                        __('Routine %1$s has been created.')
@ -382,7 +382,7 @@ class Routines
                htmlspecialchars($routine_query)
            )
            . '<br />'
-            . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
+            . __('MySQL said: ') . $GLOBALS['dbi']->getError();
            // We dropped the old routine,
            // but were unable to create the new one
            // Try to restore the backup query
@ -1495,7 +1495,7 @@ class Routines
                        htmlspecialchars($multiple_query)
                    )
                    . '<br /><br />'
-                    . __('MySQL said: ') . $GLOBALS['dbi']->getError(null)
+                    . __('MySQL said: ') . $GLOBALS['dbi']->getError()
                );
            }

--- a/libraries/classes/Rte/Triggers.php
+++ b/libraries/classes/Rte/Triggers.php
@ -98,7 +98,7 @@ class Triggers
                            htmlspecialchars($drop_item)
                        )
                        . '<br />'
-                        . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
+                        . __('MySQL said: ') . $GLOBALS['dbi']->getError();
                    } else {
                        $result = $GLOBALS['dbi']->tryQuery($item_query);
                        if (! $result) {
@ -107,7 +107,7 @@ class Triggers
                                htmlspecialchars($item_query)
                            )
                            . '<br />'
-                            . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
+                            . __('MySQL said: ') . $GLOBALS['dbi']->getError();
                            // We dropped the old item, but were unable to create the
                            // new one. Try to restore the backup query.
                            $result = $GLOBALS['dbi']->tryQuery($create_item);
@ -139,7 +139,7 @@ class Triggers
                            htmlspecialchars($item_query)
                        )
                        . '<br /><br />'
-                        . __('MySQL said: ') . $GLOBALS['dbi']->getError(null);
+                        . __('MySQL said: ') . $GLOBALS['dbi']->getError();
                    } else {
                        $message = Message::success(
                            __('Trigger %1$s has been created.')
--- a/libraries/classes/Sql.php
+++ b/libraries/classes/Sql.php
@ -2257,7 +2257,7 @@ EOT;
        Util::handleDisableFKCheckCleanup($default_fk_check);

        foreach ($warning_messages as $warning) {
-            $message = Message::notice($warning);
+            $message = Message::notice(Message::sanitize($warning));
            $html_output .= $message->getDisplay();
        }

--- a/libraries/classes/Table.php
+++ b/libraries/classes/Table.php
@ -365,7 +365,7 @@ class Table
     * @return string Return comment info if it is set for the selected table or return blank.
     */
    public function getComment() {
-        $table_comment = $this->getStatusInfo('COMMENT', false, true);
+        $table_comment = $this->getStatusInfo('TABLE_COMMENT', false, true);
        if ($table_comment === false) {
            return '';
        }
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "phpmyadmin",
-  "version": "4.8.0-dev",
+  "version": "4.8.3",
  "description": "A web interface for MySQL and MariaDB",
  "repository": "https://github.com/phpmyadmin/phpmyadmin.git",
  "author": "The phpMyAdmin Team <developers@phpmyadmin.net> (https://www.phpmyadmin.net/team/)",
--- a/po/cs.po
+++ b/po/cs.po
@ -6,7 +6,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.8.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-02-12 16:30+0100\n"
-"PO-Revision-Date: 2018-05-24 22:35+0000\n"
+"PO-Revision-Date: 2018-07-23 11:06+0000\n"
 "Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Czech <https://hosted.weblate.org/projects/phpmyadmin/4-8/cs/>"
 "\n"
@ -15,7 +15,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-"X-Generator: Weblate 3.0-dev\n"
+"X-Generator: Weblate 3.1-dev\n"

 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@ -1756,6 +1756,8 @@ msgid ""
 "It seems that the connection to server has been lost. Please check your "
 "network connectivity and server status."
 msgstr ""
+"Připojení k serveru bylo ztraceno. Prosím, zkontrolujte Vaše síťové "
+"připojení a stav serveru."

 #: js/messages.php:369
 #: libraries/classes/Controllers/Server/ServerDatabasesController.php:188
@ -2670,12 +2672,12 @@ msgstr "Silné"

 #: js/messages.php:746
 msgid "Timed out waiting for security key activation."
-msgstr ""
+msgstr "Vypršel čas pro aktivaci bezpečnostního klíče."

 #: js/messages.php:747
 #, php-format
 msgid "Failed security key activation (%s)."
-msgstr ""
+msgstr "Selhala aktivace bezpečnostního klíče (%s)."

 #: js/messages.php:776
 msgctxt "Previous month"
@ -3458,7 +3460,7 @@ msgstr "Islandština"
 #: libraries/classes/Charsets.php:491
 msgctxt "Collation"
 msgid "Classical Latin"
-msgstr ""
+msgstr "Latina (klasická)"

 #: libraries/classes/Charsets.php:495
 #, fuzzy
@ -3521,7 +3523,7 @@ msgstr "Španělština"
 #: libraries/classes/Charsets.php:543 libraries/classes/Charsets.php:593
 msgctxt "Collation"
 msgid "Spanish (traditional)"
-msgstr ""
+msgstr "Španělština (tradiční)"

 #: libraries/classes/Charsets.php:562
 #, fuzzy
@ -7112,7 +7114,7 @@ msgstr "Server neodpovídá."

 #: libraries/classes/DatabaseInterface.php:2131
 msgid "Logout and try as another user."
-msgstr ""
+msgstr "Odhlásit se a zkusit přihlásit se jako jiný uživatel."

 #: libraries/classes/DatabaseInterface.php:2137
 msgid "Please check privileges of directory containing database."
@ -7167,7 +7169,7 @@ msgstr "Heslo:"

 #: libraries/classes/Display/ChangePassword.php:79
 msgid "Enter:"
-msgstr ""
+msgstr "Vložit:"

 #: libraries/classes/Display/ChangePassword.php:86
 #: libraries/classes/ReplicationGui.php:878
@ -7216,7 +7218,7 @@ msgstr ""

 #: libraries/classes/Display/Export.php:558
 msgid "Defined aliases"
-msgstr ""
+msgstr "Definované aliasy"

 #: libraries/classes/Display/Export.php:614
 #: templates/display/export/options_output.twig:7
@ -8140,7 +8142,7 @@ msgstr "Pohled"
 #: libraries/classes/Menu.php:290 libraries/classes/Menu.php:309
 #, php-format
 msgid "“%s”"
-msgstr ""
+msgstr "„%s“"

 #: libraries/classes/Menu.php:344
 #: libraries/classes/Navigation/Nodes/NodeTable.php:300
@ -9201,6 +9203,8 @@ msgstr "Nepodařilo se přihlášení k MySQL serveru"
 #: libraries/classes/Plugins/AuthenticationPlugin.php:335
 msgid "You have enabled two factor authentication, please confirm your login."
 msgstr ""
+"Aktivovali jste dvoustupňové ověřování. Potvrďte, prosím, své přihlašovací "
+"údaje."

 #: libraries/classes/Plugins/Export/ExportCodegen.php:101
 #: templates/display/import/import.twig:168
@ -9719,7 +9723,7 @@ msgstr "Tabulka:"

 #: libraries/classes/Plugins/Export/Helpers/Pdf.php:120
 msgid "Purpose:"
-msgstr ""
+msgstr "Účel:"

 #: libraries/classes/Plugins/Export/Helpers/Pdf.php:501
 msgid "MIME"
--- a/po/de.po
+++ b/po/de.po
@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-02-12 16:30+0100\n"
-"PO-Revision-Date: 2018-04-29 13:54+0000\n"
-"Last-Translator: ssantos <ssantos@web.de>\n"
+"PO-Revision-Date: 2018-08-15 04:10+0000\n"
+"Last-Translator: BO41 <lukasw41@gmail.com>\n"
 "Language-Team: German <https://hosted.weblate.org/projects/phpmyadmin/4-8/de/"
 ">\n"
 "Language: de\n"
@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.0-dev\n"
+"X-Generator: Weblate 3.2-dev\n"

 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
--- a/po/es.po
+++ b/po/es.po
@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.8.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-02-12 16:30+0100\n"
-"PO-Revision-Date: 2018-01-08 13:02+0000\n"
-"Last-Translator: Guillermo Lengemann <omerta@unefa-glug.org.ve>\n"
-"Language-Team: Spanish <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/es/>\n"
+"PO-Revision-Date: 2018-07-22 06:41+0000\n"
+"Last-Translator: Jon Echeve <dragonportis1@gmail.com>\n"
+"Language-Team: Spanish <https://hosted.weblate.org/projects/phpmyadmin/4-8/"
+"es/>\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.19-dev\n"
+"X-Generator: Weblate 3.1-dev\n"

 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@ -9222,6 +9222,8 @@ msgstr "El servidor MySQL no autorizó su acceso"
 #: libraries/classes/Plugins/AuthenticationPlugin.php:335
 msgid "You have enabled two factor authentication, please confirm your login."
 msgstr ""
+"Ha habilitado la autenticación de dos factores, confirme su inicio de sesión "
+"por favor."

 #: libraries/classes/Plugins/Export/ExportCodegen.php:101
 #: templates/display/import/import.twig:168
--- a/po/et.po
+++ b/po/et.po
@ -6,16 +6,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.8.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-02-12 16:30+0100\n"
-"PO-Revision-Date: 2018-01-26 16:40+0000\n"
+"PO-Revision-Date: 2018-08-17 19:36+0000\n"
 "Last-Translator: Kristjan Räts <kristjanrats@gmail.com>\n"
-"Language-Team: Estonian <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/et/>\n"
+"Language-Team: Estonian <https://hosted.weblate.org/projects/phpmyadmin/4-8/"
+"et/>\n"
 "Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.19-dev\n"
+"X-Generator: Weblate 3.2-dev\n"

 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@ -14831,7 +14831,7 @@ msgstr "Muuda partitsioneerimist"
 #: templates/table/structure/display_structure.twig:191
 #: templates/table/structure/display_partitions.twig:4
 msgid "Partitions"
-msgstr "Partitsioonid"
+msgstr "Jaotised"

 #: templates/encoding/kanji_encoding_form.twig:6
 msgctxt "None encoding conversion"
--- a/po/fr.po
+++ b/po/fr.po
@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin-docs 4.0.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-02-12 16:30+0100\n"
-"PO-Revision-Date: 2018-04-14 22:37+0000\n"
-"Last-Translator: anonymous <>\n"
+"PO-Revision-Date: 2018-07-08 23:37+0000\n"
+"Last-Translator: Olivier Humbert <trebmuh@tuxfamily.org>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/phpmyadmin/4-8/fr/"
 ">\n"
 "Language: fr\n"
@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.0-dev\n"
+"X-Generator: Weblate 3.1-dev\n"

 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@ -10049,7 +10049,7 @@ msgid ""
 "specifies how often space will be added (defaults to 2 nibbles)."
 msgstr ""
 "Affiche une représentation hexadécimale des données. Le premier paramètre "
-"est optionnel et spécifie à quel intervalle un espace sera ajouté (par "
+"est optionnel et spécifie à quel intervalle une espace sera ajoutée (par "
 "défaut, à chaque 2 « nibbles »)."

 #: libraries/classes/Plugins/Transformations/Abs/ImageLinkTransformationsPlugin.php:32
--- a/po/he.po
+++ b/po/he.po
@ -4,7 +4,7 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.8.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-02-12 16:30+0100\n"
-"PO-Revision-Date: 2018-06-15 13:38+0000\n"
+"PO-Revision-Date: 2018-07-26 11:48+0000\n"
 "Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
 "Language-Team: Hebrew <https://hosted.weblate.org/projects/phpmyadmin/4-8/he/"
 ">\n"
@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 3.0.1\n"
+"X-Generator: Weblate 3.1-dev\n"

 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@ -9766,7 +9766,7 @@ msgstr "שינויי צורה זמינים"

 #: libraries/classes/Relation.php:208
 msgid "Please see the documentation on how to update your column_info table."
-msgstr ""
+msgstr "נא לעיין בתיעוד על אופן עדכון טבלת ה־column_info שלך."

 #: libraries/classes/Relation.php:224 libraries/classes/SqlQueryForm.php:401
 msgid "Bookmarked SQL query"
@ -9792,17 +9792,15 @@ msgstr ""

 #: libraries/classes/Relation.php:290
 msgid "User preferences"
-msgstr ""
+msgstr "העדפות משתמש"

 #: libraries/classes/Relation.php:307
-#, fuzzy
-#| msgid "Modifications have been saved"
 msgid "Configurable menus"
-msgstr "שינויים נשמרו"
+msgstr "תפריטים שניתן להגדיר"

 #: libraries/classes/Relation.php:318
 msgid "Hide/show navigation items"
-msgstr ""
+msgstr "הסתרה/הצגה של פריטי ניווט"

 #: libraries/classes/Relation.php:329
 msgid "Saving Query-By-Example searches"
@ -9810,7 +9808,7 @@ msgstr ""

 #: libraries/classes/Relation.php:340
 msgid "Managing Central list of columns"
-msgstr ""
+msgstr "ניהול רשימה מרכזית של עמודות"

 #: libraries/classes/Relation.php:351
 #, fuzzy
@ -9826,16 +9824,16 @@ msgstr "סוג הייצוא שגוי"

 #: libraries/classes/Relation.php:370
 msgid "Quick steps to set up advanced features:"
-msgstr ""
+msgstr "צעדים מהירים להגדרת תכונות מתקדמות:"

 #: libraries/classes/Relation.php:376
 #, php-format
 msgid "Create the needed tables with the <code>%screate_tables.sql</code>."
-msgstr ""
+msgstr "יצירת הטבלאות הנחוצות עם <code>%screate_tables.sql</code>."

 #: libraries/classes/Relation.php:381
 msgid "Create a pma user and give access to these tables."
-msgstr ""
+msgstr "יצירת משתמש pma והענקת גישה לטבלאות האלה."

 #: libraries/classes/Relation.php:384
 msgid ""
@ -9845,7 +9843,7 @@ msgstr ""

 #: libraries/classes/Relation.php:389
 msgid "Re-login to phpMyAdmin to load the updated configuration file."
-msgstr ""
+msgstr "כניסה מחדש ל־phpMyAdmin כדי לטעון את קובץ התצורה המעודכן."

 #: libraries/classes/Relation.php:1704
 msgid "no description"
@ -9863,13 +9861,13 @@ msgstr ""
 msgid ""
 "%sCreate%s a database named 'phpmyadmin' and setup the phpMyAdmin "
 "configuration storage there."
-msgstr ""
+msgstr "%sיצירת%s מסד נתונים בשם ‚phpmyadmin’ והגדרת האחסון של phpMyAdmin שם."

 #: libraries/classes/Relation.php:2018
 #, php-format
 msgid ""
 "%sCreate%s the phpMyAdmin configuration storage in the current database."
-msgstr ""
+msgstr "%sיצירת%s אחסון התצורה של phpMyAdmin במסד הנתונים הנוכחי."

 #: libraries/classes/Relation.php:2026
 #, php-format
@ -10361,32 +10359,30 @@ msgstr ""

 #: libraries/classes/Rte/Events.php:624
 msgid "You must provide an event definition."
-msgstr ""
+msgstr "עליך לציין הגדרת אירוע."

 #: libraries/classes/Rte/Export.php:54 libraries/classes/Rte/General.php:84
 #: libraries/classes/Rte/Routines.php:172
 #: libraries/classes/Rte/Routines.php:1329
 #: libraries/classes/Rte/Routines.php:1539
-#, fuzzy
-#| msgid "Processes"
 msgid "Error in processing request:"
-msgstr "תהליכים"
+msgstr "שגיאה בעיבוד הבקשה:"

 #: libraries/classes/Rte/Footer.php:102
 msgid "OFF"
-msgstr ""
+msgstr "כבוי"

 #: libraries/classes/Rte/Footer.php:107
 msgid "ON"
-msgstr ""
+msgstr "פעיל"

 #: libraries/classes/Rte/Footer.php:119
 msgid "Event scheduler status"
-msgstr ""
+msgstr "מצב מתזמן אירועים"

 #: libraries/classes/Rte/General.php:46
 msgid "The backed up query was:"
-msgstr ""
+msgstr "השאילתה שגובתה היא:"

 #: libraries/classes/Rte/Routines.php:92
 msgid ""
@ -16904,6 +16900,9 @@ msgid ""
 "writers for a given table. See also <a href=\"https://dev.mysql.com/doc/"
 "refman/5.5/en/concurrent-inserts.html\">MySQL Documentation</a>"
 msgstr ""
+"הגדרת {concurrent_insert} ל־1 מקטינה את המחלוקת בין הקוראים והכותבים לטבלה "
+"מסוימת. ניתן גם לעיין ב<a href=\"https://dev.mysql.com/doc/refman/5.5/en/"
+"concurrent-inserts.html\">תיעוד של MySQL</a>"

 #: libraries/advisory_rules.txt:446
 msgid "concurrent_insert is set to 0"
--- a/po/hr.po
+++ b/po/hr.po
@ -4,17 +4,17 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.8.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-02-12 16:30+0100\n"
-"PO-Revision-Date: 2018-03-23 05:43+0000\n"
+"PO-Revision-Date: 2018-07-03 23:16+0000\n"
 "Last-Translator: Marino <mrabach@gmail.com>\n"
-"Language-Team: Croatian <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/hr/>\n"
+"Language-Team: Croatian <https://hosted.weblate.org/projects/phpmyadmin/4-8/"
+"hr/>\n"
 "Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
 "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 2.20-dev\n"
+"X-Generator: Weblate 3.1-dev\n"

 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@ -26,12 +26,12 @@ msgid ""
 "The %s file is not available on this system, please visit %s for more "
 "information."
 msgstr ""
-"Datoteka %s nije dostupna na na ovom sistemu, molimo posjetite "
-"www.phpmyadmin.net%s za više informacija."
+"Datoteka %s nije dostupna na ovom sistemu, molimo posjetite %s za više "
+"informacija."

 #: db_central_columns.php:127
 msgid "The central list of columns for the current database is empty."
-msgstr ""
+msgstr "Središnji popis stupaca za trenutnu bazu podataka je prazan"

 #: db_central_columns.php:156
 #, fuzzy
@ -315,6 +315,8 @@ msgstr "Naziv baze podataka je prazan!"
 #: db_operations.php:67
 msgid "Cannot copy database to the same name. Change the name and try again."
 msgstr ""
+"Nije moguće kopirati bazu podataka jednakog naziva. Promijenite naziv i "
+"pokušajte ponovo."

 #: db_operations.php:154
 #, fuzzy, php-format
@ -323,10 +325,9 @@ msgid "Database %1$s has been renamed to %2$s."
 msgstr "Baza podataka %1$s preimenovana je u %2$s"

 #: db_operations.php:166
-#, fuzzy, php-format
-#| msgid "Database %s has been copied to %s."
+#, php-format
 msgid "Database %1$s has been copied to %2$s."
-msgstr "Baza podataka %s kopirana je u %s"
+msgstr "Baza podataka %1$s je kopirana u %2$s"

 #: db_operations.php:294
 #, fuzzy, php-format
@ -340,10 +341,8 @@ msgstr ""
 "razloge, kliknite %sovdje%s."

 #: db_qbe.php:130
-#, fuzzy
-#| msgid "You have to choose at least one column to display"
 msgid "You have to choose at least one column to display!"
-msgstr "Morate odabrati najmanje jedan stupac za prikazivanje"
+msgstr "Morate odabrati najmanje jedan stupac za prikazivanje!"

 #: db_qbe.php:148
 #, php-format
--- a/po/lt.po
+++ b/po/lt.po
@ -4,10 +4,10 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.8.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-02-12 16:30+0100\n"
-"PO-Revision-Date: 2018-02-01 13:38+0000\n"
-"Last-Translator: Edgaras Janušauskas <edgaras.janusauskas@gmail.com>\n"
+"PO-Revision-Date: 2018-07-23 11:06+0000\n"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Lithuanian <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/lt/>\n"
+"4-8/lt/>\n"
 "Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@ -15,7 +15,7 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n % 10 == 1 && (n % 100 < 11 || n % 100 > "
 "19)) ? 0 : ((n % 10 >= 2 && n % 10 <= 9 && (n % 100 < 11 || n % 100 > 19)) ? "
 "1 : 2);\n"
-"X-Generator: Weblate 2.19-dev\n"
+"X-Generator: Weblate 3.1-dev\n"

 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@ -585,13 +585,12 @@ msgid "Bookmark %s has been created."
 msgstr "Žymė %s sukurta."

 #: import.php:595
-#, fuzzy, php-format
+#, php-format
 msgid "Import has been successfully finished, %d query executed."
 msgid_plural "Import has been successfully finished, %d queries executed."
-msgstr[0] "Importavimas sėkmingai baigtas, įvykdyta %d užklausa."
-msgstr[1] "Importavimas sėkmingai baigtas, įvykdyta %d užklausos."
-msgstr[2] "Importavimas sėkmingai baigtas, įvykdyta %d užklausų."
-msgstr[3] ""
+msgstr[0] "Importavimas sėkmingai baigtas, užklausa %d įvykdyta."
+msgstr[1] "Importavimas sėkmingai baigtas, užklausos %d įvykdytos."
+msgstr[2] "Importavimas sėkmingai baigtas, iš viso įvykdyta %d užklausų."

 #: import.php:626
 #, php-format
@ -617,7 +616,7 @@ msgstr "„DROP DATABASE“ komandos įvykdyti negalima."

 #: import_status.php:107
 msgid "Could not load the progress of the import."
-msgstr ""
+msgstr "Nepavyko įkelti importo ."

 #: import_status.php:116 js/messages.php:457 js/messages.php:622
 #: libraries/classes/Export.php:514
@ -631,13 +630,13 @@ msgid ""
 "You were logged out from one server, to logout completely from phpMyAdmin, "
 "you need to logout from all servers."
 msgstr ""
+"Jūs atsijungėte iš vieno serverio, kad visiškai išeitumėte iš phpMyAdmin, "
+"turite atsijungti iš visų serverių."

 #: index.php:193 libraries/classes/Footer.php:75
 #: libraries/classes/Plugins/Auth/AuthenticationCookie.php:115
-#, fuzzy
-#| msgid "phpMyAdmin homepage"
 msgid "phpMyAdmin Demo Server"
-msgstr "phpMyAdmin tinklalapis"
+msgstr "phpMyAdmin Demonstracinis Serveris"

 #: index.php:197 libraries/classes/Plugins/Auth/AuthenticationCookie.php:118
 #, php-format
@ -646,6 +645,9 @@ msgid ""
 "change root, debian-sys-maint and pma users. More information is available "
 "at %s."
 msgstr ""
+"Jūs naudojate demonstracinį serverį. Čia galite daryti ką norite, bet "
+"nepakeiskite admistratoriaus root, debian-sys-maint ir pma vartotojų. "
+"Daugiau informacijos galima rasti čia adresu %s."

 #: index.php:207
 msgid "General settings"
@ -679,16 +681,12 @@ msgid "Server:"
 msgstr "Darbinė stotis:"

 #: index.php:338
-#, fuzzy
-#| msgid "Server port"
 msgid "Server type:"
-msgstr "Serverio jungtis"
+msgstr "Serverio tipas :"

 #: index.php:342
-#, fuzzy
-#| msgid "Insecure connection"
 msgid "Server connection:"
-msgstr "Nesaugus susijungimas"
+msgstr "Serverio prisijungimas :"

 #: index.php:346 libraries/classes/Plugins/Export/ExportLatex.php:223
 #: libraries/classes/Plugins/Export/ExportSql.php:704
@ -705,10 +703,8 @@ msgid "Protocol version:"
 msgstr "Protokolo versija"

 #: index.php:356
-#, fuzzy
-#| msgid "User"
 msgid "User:"
-msgstr "Naudotojas"
+msgstr "Vartotojas :"

 #: index.php:361
 #, fuzzy
@ -774,7 +770,7 @@ msgstr "Pakeitimų sąrašas"

 #: index.php:482 templates/server/plugins/section.twig:13
 msgid "License"
-msgstr ""
+msgstr "Licencija"

 #: index.php:502
 msgid ""
@ -3367,11 +3363,11 @@ msgstr "Negalėjo išsaugoti paskiausios lentelės"

 #: libraries/classes/CentralColumns.php:618
 msgid "YES"
-msgstr ""
+msgstr "Taip"

 #: libraries/classes/CentralColumns.php:618
 msgid "NO"
-msgstr ""
+msgstr "Ne"

 #: libraries/classes/CentralColumns.php:749
 #: libraries/classes/Display/Results.php:961
@ -18045,9 +18041,8 @@ msgid "The current query cache hit rate of %s%% is below 20%%"
 msgstr "Rūšiavimo buferio dydis"

 #: libraries/advisory_rules.txt:167
-#, fuzzy
 msgid "Query Cache usage"
-msgstr "Užklausų saugykla"
+msgstr "Užklausų pagreitinimo (kešo) naudojamumas"

 #: libraries/advisory_rules.txt:170
 #, php-format
--- a/po/ml.po
+++ b/po/ml.po
@ -6,16 +6,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.8.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-02-12 16:30+0100\n"
-"PO-Revision-Date: 2016-05-24 05:48+0000\n"
-"Last-Translator: GIMMY <thozhalay@gmail.com>\n"
-"Language-Team: Malayalam <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/ml/>\n"
+"PO-Revision-Date: 2018-07-03 23:16+0000\n"
+"Last-Translator: Aswani Prakash <aswani15prakash@gmail.com>\n"
+"Language-Team: Malayalam <https://hosted.weblate.org/projects/phpmyadmin/4-8/"
+"ml/>\n"
 "Language: ml\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 2.7-dev\n"
+"X-Generator: Weblate 3.1-dev\n"

 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@ -27,10 +27,11 @@ msgid ""
 "The %s file is not available on this system, please visit %s for more "
 "information."
 msgstr ""
+"%s ഫയൽ ഈ സിസ്റ്റത്തിൽ ലഭ്യമല്ല, അധികമറിയുന്നതിന് ദയവായി %s -ലേക്ക് പോവുക."

 #: db_central_columns.php:127
 msgid "The central list of columns for the current database is empty."
-msgstr ""
+msgstr "നിലവിലുള്ള ഡാറ്റാബേസിലെ കോളങ്ങളുടെ കേന്ദ്ര പട്ടിക ശൂന്യമാണ്."

 #: db_central_columns.php:156
 msgid "Click to sort."
@ -39,7 +40,7 @@ msgstr ""
 #: db_central_columns.php:175
 #, php-format
 msgid "Showing rows %1$s - %2$s."
-msgstr ""
+msgstr "പ്രദർശിപ്പിച്ചിരിക്കുന്ന റോ-കൾ %1$s - %2$s."

 #: db_datadict.php:59 libraries/classes/Operations.php:47
 msgid "Database comment"
@ -184,7 +185,7 @@ msgstr "അഭിപ്രായങ്ങൾ"
 #: templates/columns_definitions/column_indexes.twig:4
 #: templates/table/tracking/structure_snapshot_columns.twig:25
 msgid "Primary"
-msgstr ""
+msgstr "പ്രാഥമികം"

 #: db_datadict.php:164 js/messages.php:380
 #: libraries/classes/CentralColumns.php:1051
--- a/po/pt.po
+++ b/po/pt.po
@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.8.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-02-12 16:30+0100\n"
-"PO-Revision-Date: 2018-03-18 15:40+0000\n"
-"Last-Translator: Nuno Marques <nunosil@gmail.com>\n"
+"PO-Revision-Date: 2018-07-23 11:06+0000\n"
+"Last-Translator: Michal Čihař <michal@cihar.com>\n"
 "Language-Team: Portuguese <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/pt/>\n"
+"4-8/pt/>\n"
 "Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 2.20-dev\n"
+"X-Generator: Weblate 3.1-dev\n"

 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@ -3713,10 +3713,8 @@ msgstr ""
 "CodeMirror seja ativado."

 #: libraries/classes/Config/Descriptions.php:127
-#, fuzzy
-#| msgid "Enable SQL Validator"
 msgid "Enable linter"
-msgstr "Activar SQL Validator"
+msgstr "Activar Validador de SQL"

 #: libraries/classes/Config/Descriptions.php:130
 msgid ""
@ -3840,10 +3838,8 @@ msgid "Whether the table structure actions should be hidden."
 msgstr "Se as acções da estrutura da tabela devem ser escondidas."

 #: libraries/classes/Config/Descriptions.php:189
-#, fuzzy
-#| msgid "Table comments"
 msgid "Show column comments"
-msgstr "Comentários da tabela"
+msgstr "Mostrar comentários da coluna"

 #: libraries/classes/Config/Descriptions.php:191
 msgid "Whether column comments should be shown in table structure view"
@ -3874,54 +3870,41 @@ msgid ""
 "Values for options list for default transformations. These will be "
 "overwritten if transformation is filled in at table structure page."
 msgstr ""
+"Valores para a lista de opções de transformações padrão. Estas serão "
+"substituídas se a transformação for preenchida na pagina da estrutura da "
+"tabela."

 #: libraries/classes/Config/Descriptions.php:199
-#, fuzzy
-#| msgid "Transformation options"
 msgid "Default transformations for Substring"
-msgstr "Opções de tranformação"
+msgstr "Transformações para Substrings padrão"

 #: libraries/classes/Config/Descriptions.php:203
-#, fuzzy
-#| msgid "Default sorting order"
 msgid "Default transformations for Bool2Text"
-msgstr "Ordenação padrão"
+msgstr "Transformações para Bool2Text padrão"

 #: libraries/classes/Config/Descriptions.php:207
-#, fuzzy
-#| msgid "Default sorting order"
 msgid "Default transformations for External"
-msgstr "Ordenação padrão"
+msgstr "Transformações para External padrão"

 #: libraries/classes/Config/Descriptions.php:211
-#, fuzzy
-#| msgid "Transformation options"
 msgid "Default transformations for PreApPend"
-msgstr "Opções de tranformação"
+msgstr "Transformações para PreApPend padrão"

 #: libraries/classes/Config/Descriptions.php:215
-#, fuzzy
-#| msgid "Default sorting order"
 msgid "Default transformations for DateFormat"
-msgstr "Ordenação padrão"
+msgstr "Transformações para DateFormat padrão"

 #: libraries/classes/Config/Descriptions.php:219
-#, fuzzy
-#| msgid "Transformation options"
 msgid "Default transformations for Inline"
-msgstr "Opções de tranformação"
+msgstr "Transformações para Inline padrão"

 #: libraries/classes/Config/Descriptions.php:223
-#, fuzzy
-#| msgid "Transformation options"
 msgid "Default transformations for TextImageLink"
-msgstr "Opções de tranformação"
+msgstr "Transformações para TextImageLink padrão"

 #: libraries/classes/Config/Descriptions.php:227
-#, fuzzy
-#| msgid "Transformation options"
 msgid "Default transformations for TextLink"
-msgstr "Opções de tranformação"
+msgstr "Transformações para TextLink padrão"

 #: libraries/classes/Config/Descriptions.php:232
 msgid "Show server listing as a list instead of a drop down."
@ -3958,10 +3941,9 @@ msgstr "Tempo máximo de execução"

 #: libraries/classes/Config/Descriptions.php:251
 #: templates/display/export/options_output.twig:17
-#, fuzzy, php-format
-#| msgid "Statements"
+#, php-format
 msgid "Use %s statement"
-msgstr "Itens"
+msgstr "Use a instrução %s"

 #: libraries/classes/Config/Descriptions.php:254 prefs_manage.php:307
 msgid "Save as file"
@ -4104,8 +4086,6 @@ msgstr "Tipo MIME"
 #: libraries/classes/Config/Descriptions.php:314
 #: libraries/classes/Config/Descriptions.php:338
 #: libraries/classes/Config/Descriptions.php:403
-#, fuzzy
-#| msgid "Relations"
 msgid "Relationships"
 msgstr "Relações"

@ -4126,10 +4106,8 @@ msgid "Overwrite existing file(s)"
 msgstr "Substituir o(s) ficheiro(s) existente(s)"

 #: libraries/classes/Config/Descriptions.php:346
-#, fuzzy
-#| msgid "horizontal (rotated headers)"
 msgid "Export as separate files"
-msgstr "horizontal (cabeçalhos rodados)"
+msgstr "Exportar como ficheiros separados"

 #: libraries/classes/Config/Descriptions.php:352
 msgid "Remember file name template"
@ -7095,7 +7073,7 @@ msgstr "Único"
 #: libraries/classes/Controllers/Table/TableStructureController.php:1202
 #: templates/columns_definitions/column_indexes.twig:20
 msgid "Spatial"
-msgstr ""
+msgstr "Espacial"

 #: libraries/classes/Controllers/Table/TableStructureController.php:1198
 #: libraries/classes/Controllers/Table/TableStructureController.php:1203
@ -9637,10 +9615,8 @@ msgstr "Data de Criação"
 #: libraries/classes/Plugins/Export/ExportLatex.php:224
 #: libraries/classes/Plugins/Export/ExportSql.php:706
 #: libraries/classes/Plugins/Export/ExportXml.php:244
-#, fuzzy
-#| msgid "PHP Version"
 msgid "PHP Version:"
-msgstr "versão do PHP"
+msgstr "versão do PHP:"

 #: libraries/classes/Plugins/Export/ExportLatex.php:254
 #: libraries/classes/Plugins/Export/ExportSql.php:895
@ -17269,9 +17245,8 @@ msgid "The current query cache hit rate of %s%% is below 20%%"
 msgstr ""

 #: libraries/advisory_rules.txt:167
-#, fuzzy
 msgid "Query Cache usage"
-msgstr "Tipo de Query"
+msgstr "Utilização da cache de comandos"

 #: libraries/advisory_rules.txt:170
 #, php-format
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.8.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-02-12 16:30+0100\n"
-"PO-Revision-Date: 2018-04-16 18:41+0000\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"PO-Revision-Date: 2018-07-27 08:19+0000\n"
+"Last-Translator: Wolterhon <hotmottot.1@gmail.com>\n"
 "Language-Team: Russian <https://hosted.weblate.org/projects/phpmyadmin/4-8/"
 "ru/>\n"
 "Language: ru\n"
@ -14,7 +14,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<="
 "4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Weblate 3.0-dev\n"
+"X-Generator: Weblate 3.1-dev\n"

 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@ -2953,7 +2953,7 @@ msgstr "Секунда"

 #: js/messages.php:917
 msgid "This field is required"
-msgstr "Это обязательное поле"
+msgstr "Это поле нужно заполнить"

 #: js/messages.php:918
 msgid "Please fix this field"
@ -4820,7 +4820,7 @@ msgstr "Отображать логотип в панели навигации."

 #: libraries/classes/Config/Descriptions.php:782
 msgid "Display logo"
-msgstr "Выводить логотип"
+msgstr "Показывать логотип"

 #: libraries/classes/Config/Descriptions.php:784
 msgid "URL where logo in the navigation panel will point to."
@ -4828,7 +4828,7 @@ msgstr "URL, на который будет ссылаться логотип в

 #: libraries/classes/Config/Descriptions.php:786
 msgid "Logo link URL"
-msgstr "URL ссылка логотипа"
+msgstr "Ссылка логотипа"

 #: libraries/classes/Config/Descriptions.php:789
 msgid ""
@ -8308,7 +8308,7 @@ msgstr "Показать"

 #: libraries/classes/Navigation/NavigationHeader.php:165
 msgid "Home"
-msgstr "К началу"
+msgstr "На главную"

 #: libraries/classes/Navigation/NavigationHeader.php:173
 msgid "Log out"
@ -13891,7 +13891,7 @@ msgstr "Клик"

 #: libraries/config.values.php:94
 msgid "Double click"
-msgstr "Двойной клик"
+msgstr "Двойное нажатие"

 #: libraries/config.values.php:98
 msgid "key"
@ -15461,7 +15461,7 @@ msgstr "Сделать закладку общедоступной"

 #: templates/console/display.twig:140
 msgid "Set default"
-msgstr "Установить изначальное значение"
+msgstr "Сбросить настройки"

 #: templates/console/display.twig:162
 msgid ""
@ -16356,7 +16356,7 @@ msgstr "gzip"

 #: url.php:41
 msgid "Taking you to the target site."
-msgstr "Переход на целевой сайт."
+msgstr "Происходит переадресация."

 #: user_password.php:35
 msgid "You don't have sufficient privileges to be here right now!"
@ -16608,8 +16608,8 @@ msgid ""
 "Percona documentation is at <a href=\"https://www.percona.com/software/"
 "documentation/\">https://www.percona.com/software/documentation/</a>"
 msgstr ""
-"Документация по Percona находится на <a href=\"https://www.percona.com/"
-"software/documentation/\">https://www.percona.com/software/documentation/</a>"
+"Документация Percona находится <a href=\"https://www.percona.com/software/"
+"documentation/\">здесь</a>"

 #: libraries/advisory_rules.txt:133
 msgid "'percona' found in version_comment"
--- a/po/th.po
+++ b/po/th.po
@ -4,8 +4,8 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.8.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-02-12 16:30+0100\n"
-"PO-Revision-Date: 2018-05-19 17:57+0000\n"
-"Last-Translator: Anawin Wongsadit <imonmac@hotmail.com>\n"
+"PO-Revision-Date: 2018-08-17 10:42+0000\n"
+"Last-Translator: Anusuk Sangubon <jaideejung007@gmail.com>\n"
 "Language-Team: Thai <https://hosted.weblate.org/projects/phpmyadmin/4-8/th/>"
 "\n"
 "Language: th\n"
@ -13,7 +13,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 3.0-dev\n"
+"X-Generator: Weblate 3.2-dev\n"

 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@ -145,7 +145,6 @@ msgstr "ค่าว่าง"
 #: templates/table/structure/table_structure_header.twig:10
 #: templates/table/tracking/structure_snapshot_columns.twig:10
 #: templates/columns_definitions/table_fields_definitions.twig:20
-#, fuzzy
 msgid "Default"
 msgstr "ค่าเริ่มต้น"

@ -207,7 +206,6 @@ msgstr "คีย์หลัก"
 #: templates/table/tracking/structure_snapshot_indexes.twig:24
 #: templates/table/tracking/structure_snapshot_columns.twig:33
 #: templates/table/structure/table_structure_row.twig:25
-#, fuzzy
 msgid "No"
 msgstr "ไม่ใช่"

@ -301,8 +299,6 @@ msgstr "ข้อมูล"
 #: db_export.php:73 libraries/classes/ReplicationGui.php:391
 #: templates/database/search/selection_form.twig:32
 #: templates/display/export/select_options.twig:4
-#, fuzzy
-#| msgid "Select All"
 msgid "Select all"
 msgstr "เลือกทั้งหมด"

@ -348,10 +344,8 @@ msgid "Access denied!"
 msgstr "ไม่อนุญาตให้ใช้งาน"

 #: db_tracking.php:55 db_tracking.php:80
-#, fuzzy
-#| msgid "Chart generated successfully."
 msgid "Tracking data deleted successfully."
-msgstr "สิทธิได้ถูกเรียกใช้ใหม่เรียบร้อยแล้ว"
+msgstr "ลบข้อมูลการติดตามแล้ว"

 #: db_tracking.php:64
 #, php-format
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@ -4,16 +4,16 @@ msgstr ""
 "Project-Id-Version: phpMyAdmin 4.8.0-dev\n"
 "Report-Msgid-Bugs-To: translators@phpmyadmin.net\n"
 "POT-Creation-Date: 2018-02-12 16:30+0100\n"
-"PO-Revision-Date: 2017-06-03 10:16+0000\n"
-"Last-Translator: 某玩家 <bckps7336@gmail.com>\n"
+"PO-Revision-Date: 2018-08-09 18:35+0000\n"
+"Last-Translator: popcorner <memoword@163.com>\n"
 "Language-Team: Chinese (Traditional) <https://hosted.weblate.org/projects/"
-"phpmyadmin/master/zh_Hant/>\n"
+"phpmyadmin/4-8/zh_Hant/>\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Weblate 2.15-dev\n"
+"X-Generator: Weblate 3.2-dev\n"

 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@ -3227,8 +3227,6 @@ msgid "Russian"
 msgstr "俄語"

 #: libraries/classes/Charsets.php:363
-#, fuzzy
-#| msgid "Simplified Chinese"
 msgctxt "Collation"
 msgid "Simplified Chinese"
 msgstr "簡體中文"
@ -3255,11 +3253,9 @@ msgid "Armenian"
 msgstr "亞美尼亞語"

 #: libraries/classes/Charsets.php:383
-#, fuzzy
-#| msgid "Traditional Chinese"
 msgctxt "Collation"
 msgid "Traditional Chinese"
-msgstr "正體中文"
+msgstr "繁體中文"

 #: libraries/classes/Charsets.php:386
 #, fuzzy
@ -3355,7 +3351,7 @@ msgstr "保加利亞語"
 #: libraries/classes/Charsets.php:440
 msgctxt "Collation"
 msgid "Chinese"
-msgstr ""
+msgstr "中文"

 #: libraries/classes/Charsets.php:445
 #, fuzzy
--- a/templates/columns_definitions/partitions.twig
+++ b/templates/columns_definitions/partitions.twig
@ -46,7 +46,7 @@
            <td>
                <select name="subpartition_by" id="subpartition_by">
                    {% for option in sub_partition_options %}
-                    <option value="<?= $option?>"
+                    <option value="{{ option }}"
                        {%- if partition_details['subpartition_by'] == option %}
                            selected="selected"
                        {%- endif %}>
--- a/templates/columns_definitions/table_fields_definitions.twig
+++ b/templates/columns_definitions/table_fields_definitions.twig
@ -83,7 +83,7 @@
                {{ Util_showHint('Please enter the values for transformation options using this format: \'a\', 100, b,\'c\'…<br />If you ever need to put a backslash ("\\") or a single quote ("\'") amongst those values, precede it with a backslash (for example \'\\\\xyz\' or \'a\\\'b\').'|trans) }}
            </th>
            <th>
-                <a href="transformation_overview.php<?= PhpMyAdmin\Url::getCommon(); ?>#input_transformation"
+                <a href="transformation_overview.php{{ Url_getCommon() }}#input_transformation"
                   title="{% trans 'List of available transformations and their options' %}"
                   target="_blank">
                    {% trans 'Input transformation' %}
--- a/templates/config/form_display/fieldset_top.twig
+++ b/templates/config/form_display/fieldset_top.twig
@ -4,7 +4,7 @@
    {%- endfor %}>
 <legend>{{ title }}</legend>
 {% if description is not empty %}
-    <p>{{ description }}</p>
+    <p>{{ description|raw }}</p>
 {% endif %}
 {# This must match with displayErrors() in scripts.js #}
 {% if errors is iterable and errors|length > 0 %}
--- a/templates/login/twofactor/application_configure.twig
+++ b/templates/login/twofactor/application_configure.twig
@ -1,10 +1,19 @@
 {{ Url_getHiddenInputs() }}
+{% if image is defined %}
 <p>
    {% trans "Please scan following QR code into the two-factor authentication app on your device and enter authentication code it generates." %}
 </p>
 <p>
    <img src="{{ image }}">
 </p>
+{% else %}
+<p>
+    {% trans "Please enter following secret/key into the two-factor authentication app on your device and enter authentication code it generates." %}
+</p>
+<p>
+    {% trans "OTP url:" %} <strong>{{ url }}</strong>
+</p>
+{% endif %}
 <p>
    {% trans "Secret/key:" %} <strong>{{ secret }}</strong>
 </p>
--- a/templates/table/structure/display_structure.twig
+++ b/templates/table/structure/display_structure.twig
@ -33,7 +33,7 @@
                {% set attribute = 'on update CURRENT_TIMESTAMP' %}
            {% endif %}

-            {% if row['Default'] is not defined %}
+            {% if row['Default'] is null %}
                {% if row['Null'] == 'YES' %}
                    {% set row = row|merge({'Default': '<em>NULL</em>'}) %}
                {% endif %}
--- a/themes/pmahomme/css/icons.css.php
+++ b/themes/pmahomme/css/icons.css.php
@ -44,6 +44,7 @@ if (! defined('PHPMYADMIN') && ! defined('TESTSUITE')) {
 .ic_b_find_replace { background-image: url('<?= $theme->getImgPath('b_find_replace.png'); ?>'); }
 .ic_b_firstpage { background-image: url('<?= $theme->getImgPath('b_firstpage.png'); ?>'); }
 .ic_b_ftext { background-image: url('<?= $theme->getImgPath('b_ftext.png'); ?>'); }
+.ic_b_globe { background-image: url('<?= $theme->getImgPath('b_globe.gif'); ?>'); }
 .ic_b_group { background-image: url('<?= $theme->getImgPath('b_group.png'); ?>'); }
 .ic_b_help { background-image: url('<?= $theme->getImgPath('b_help.png'); ?>'); }
 .ic_b_home { background-image: url('<?= $theme->getImgPath('b_home.png'); ?>'); }
--- a/view_create.php
+++ b/view_create.php
@ -40,10 +40,6 @@ $view_security_options = array(
    'INVOKER'
 );

-if (empty($sql_query)) {
-    $sql_query = '';
-}
-
 // View name is a compulsory field
 if (isset($_REQUEST['view']['name'])
    && empty($_REQUEST['view']['name'])
@ -175,6 +171,8 @@ if (isset($_REQUEST['createview']) || isset($_REQUEST['alterview'])) {
    exit;
 }

+$sql_query = ! empty($_GET['sql_query']) ? $_GET['sql_query'] : '';
+
 // prefill values if not already filled from former submission
 $view = array(
    'operation' => 'create',
@ -196,8 +194,11 @@ $url_params['db'] = $GLOBALS['db'];
 $url_params['reload'] = 1;

 echo Template::get('view_create')->render([
-    'ajax_dialog'           => isset($_REQUEST['ajax_dialog']),
-    'text_dir'              => $text_dir,
-    'url_params'            => $url_params,
-    'view'                  => $view,
+    'ajax_dialog' => isset($_REQUEST['ajax_dialog']),
+    'text_dir' => $text_dir,
+    'url_params' => $url_params,
+    'view' => $view,
+    'view_algorithm_options' => $view_algorithm_options,
+    'view_with_options' => $view_with_options,
+    'view_security_options' => $view_security_options,
 ]);