diff --git a/ChangeLog b/ChangeLog
index 2799e79cd6..caa318350a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 phpMyAdmin - ChangeLog
 ======================
 
+4.8.0.1 (2018-04-19)
+- issue        [security] Multiple CSRF vulnerabilities, See PMASA-2018-02
+
 4.8.0 (2018-04-07)
 - issue #12946 Allow to export JSON with unescaped unicode chars
 - issue #12983 Disable login button without solved reCaptcha
diff --git a/README b/README
index d6f7dc978e..b8a7b86498 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 phpMyAdmin - Readme
 ===================
 
-Version 4.8.0
+Version 4.8.0.1
 
 A web interface for MySQL and MariaDB.
 
diff --git a/doc/conf.py b/doc/conf.py
index 27c6ea675b..b1becabdd8 100644
--- 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.0'
+version = '4.8.0.1'
 # The full version, including alpha/beta/rc tags.
 release = version
 
diff --git a/js/db_operations.js b/js/db_operations.js
index 5a8e95d579..b65733d896 100644
--- a/js/db_operations.js
+++ b/js/db_operations.js
@@ -134,6 +134,7 @@ AJAX.registerOnload('db_operations.js', function () {
      */
     $(document).on('click', '#drop_db_anchor.ajax', function (event) {
         event.preventDefault();
+        var $link = $(this);
         /**
          * @var question    String containing the question to be asked for confirmation
          */
@@ -142,10 +143,8 @@ AJAX.registerOnload('db_operations.js', function () {
             PMA_messages.strDoYouReally,
             'DROP DATABASE `' + escapeHtml(PMA_commonParams.get('db') + '`')
         );
-        var params = {
-            'is_js_confirmed': '1',
-            'ajax_request': true
-        };
+        var params = getJSConfirmCommonParam(this, $link.getPostData());
+
         $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
             PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
             $.post(url, params, function (data) {
diff --git a/js/tbl_operations.js b/js/tbl_operations.js
index 2763e0263c..59b8c534e7 100644
--- a/js/tbl_operations.js
+++ b/js/tbl_operations.js
@@ -218,6 +218,7 @@ AJAX.registerOnload('tbl_operations.js', function () {
 
     $(document).on('click', '#drop_tbl_anchor.ajax', function (event) {
         event.preventDefault();
+        var $link = $(this);
         /**
          * @var question    String containing the question to be asked for confirmation
          */
@@ -230,7 +231,7 @@ AJAX.registerOnload('tbl_operations.js', function () {
         $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
             var $msgbox = PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
 
-            var params = getJSConfirmCommonParam(this);
+            var params = getJSConfirmCommonParam(this, $link.getPostData());
 
             $.post(url, params, function (data) {
                 if (typeof data !== 'undefined' && data.success === true) {
@@ -289,6 +290,7 @@ AJAX.registerOnload('tbl_operations.js', function () {
 
     $(document).on('click', '#truncate_tbl_anchor.ajax', function (event) {
         event.preventDefault();
+        var $link = $(this);
         /**
          * @var question    String containing the question to be asked for confirmation
          */
@@ -300,7 +302,7 @@ AJAX.registerOnload('tbl_operations.js', function () {
         $(this).PMA_confirm(question, $(this).attr('href'), function (url) {
             PMA_ajaxShowMessage(PMA_messages.strProcessingRequest);
 
-            var params = getJSConfirmCommonParam(this);
+            var params = getJSConfirmCommonParam(this, $link.getPostData());
 
             $.post(url, params, function (data) {
                 if ($('.sqlqueryresults').length !== 0) {
diff --git a/libraries/classes/Config.php b/libraries/classes/Config.php
index cea31ff11b..24fef54413 100644
--- 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.0');
+        $this->set('PMA_VERSION', '4.8.0.1');
         /* Major version */
         $this->set(
             'PMA_MAJOR_VERSION',
diff --git a/libraries/classes/Operations.php b/libraries/classes/Operations.php
index e62038a572..d7277edb8b 100644
--- a/libraries/classes/Operations.php
+++ b/libraries/classes/Operations.php
@@ -1559,10 +1559,11 @@ class Operations
      */
     public function getDeleteDataOrTablelink(array $url_params, $syntax, $link, $htmlId)
     {
-        return  '<li><a '
-            . 'href="sql.php' . Url::getCommon($url_params) . '"'
-            . ' id="' . $htmlId . '" class="ajax">'
-            . $link . '</a>'
+        return '<li>' . Util::linkOrButton(
+                'sql.php' . Url::getCommon($url_params),
+                $link,
+                array('id' => $htmlId, 'class' => 'ajax')
+            )
             . Util::showMySQLDocu($syntax)
             . '</li>';
     }
diff --git a/po/ar.po b/po/ar.po
index c3c88b196f..c8d1814f3b 100644
--- a/po/ar.po
+++ b/po/ar.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: 2017-12-20 21:22+0000\n"
-"Last-Translator: Waleed Abdeen <waleed.totti@gmail.com>\n"
-"Language-Team: Arabic <https://hosted.weblate.org/projects/phpmyadmin/master/"
-"ar/>\n"
+"PO-Revision-Date: 2018-04-16 18:34+0000\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"Language-Team: Arabic <https://hosted.weblate.org/projects/phpmyadmin/4-8/ar/"
+">\n"
 "Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
-"X-Generator: Weblate 2.18\n"
+"X-Generator: Weblate 3.0-dev\n"
 
 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@@ -2888,6 +2888,7 @@ msgstr "الأسبوع"
 #. * or "calendar-year-month".
 #.
 #: js/messages.php:889
+#, fuzzy
 msgid "calendar-month-year"
 msgstr "التقويم-الشهر-السنة"
 
diff --git a/po/az.po b/po/az.po
index f6427674bd..4975f9bdb5 100644
--- a/po/az.po
+++ b/po/az.po
@@ -4,32 +4,29 @@ 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-01-17 17:34+0000\n"
-"Last-Translator: Sevdimali İsa <sevdimaliisayev@mail.ru>\n"
+"PO-Revision-Date: 2018-04-16 15:34+0000\n"
+"Last-Translator: Orkhan Guliyev <orkhan@our.az>\n"
 "Language-Team: Azerbaijani <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/az/>\n"
+"4-8/az/>\n"
 "Language: az\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.11-dev\n"
+"X-Generator: Weblate 3.0-dev\n"
 
 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
 msgstr "Pis tip!"
 
 #: changelog.php:39 license.php:34
-#, fuzzy, php-format
-#| msgid ""
-#| "The %s file is not available on this system, please visit www.phpmyadmin."
-#| "net for more information."
+#, php-format
 msgid ""
 "The %s file is not available on this system, please visit %s for more "
 "information."
 msgstr ""
-"%s faylı sistemdə yoxdur. Bütün lazımi informasiyanı www.phpmyadmin.net "
-"saytından tapa bilərsiniz."
+"%s faylı sistemdə yoxdur. Bütün lazımi informasiyanı %s saytından tapa "
+"bilərsiniz."
 
 #: db_central_columns.php:127
 msgid "The central list of columns for the current database is empty."
@@ -313,6 +310,8 @@ msgstr "Cədvəlin adı göstərilməyib!"
 #: db_operations.php:67
 msgid "Cannot copy database to the same name. Change the name and try again."
 msgstr ""
+"Eyniadlı məlumat bazasını kopyalamaq mümkün deyil. Adı dəyişin və yenidən "
+"cəhd edin."
 
 #: db_operations.php:154
 #, php-format
@@ -606,6 +605,9 @@ msgid ""
 "However on last run no data has been parsed, this usually means phpMyAdmin "
 "won't be able to finish this import unless you increase php time limits."
 msgstr ""
+"Sonuncu start zamanı məlumatlar emal edilmədi. Bir qayda olaraq bu o "
+"deməkdir ki, php skriptin icrası üçün məhdudiyyət yüksəldilməyənədək "
+"phpMyAdmin idxal prosesini bitirə bilməyəcək."
 
 #: import.php:704 sql.php:157
 msgid "\"DROP DATABASE\" statements are disabled."
@@ -627,6 +629,8 @@ msgid ""
 "You were logged out from one server, to logout completely from phpMyAdmin, "
 "you need to logout from all servers."
 msgstr ""
+"Siz bir serverdən çıxdınız. PhpMyAdmin-dən tam çıxmaq üçün bütün "
+"serverlərdən çıxış etməniz gərəkir."
 
 #: index.php:193 libraries/classes/Footer.php:75
 #: libraries/classes/Plugins/Auth/AuthenticationCookie.php:115
@@ -680,10 +684,8 @@ msgid "Server type:"
 msgstr "Server tipi:"
 
 #: index.php:342
-#, fuzzy
-#| msgid "Master connection:"
 msgid "Server connection:"
-msgstr "Master əlaqə:"
+msgstr "Server bağlantısı:"
 
 #: index.php:346 libraries/classes/Plugins/Export/ExportLatex.php:223
 #: libraries/classes/Plugins/Export/ExportSql.php:704
diff --git a/po/de.po b/po/de.po
index b10f4b3439..cc1160a857 100644
--- 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-04 11:37+0000\n"
-"Last-Translator: ssantos <ssantos@web.de>\n"
+"PO-Revision-Date: 2018-04-14 13:37+0000\n"
+"Last-Translator: Florian Knodt <git@adlerweb.info>\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 2.20-dev\n"
+"X-Generator: Weblate 3.0-dev\n"
 
 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@@ -10248,10 +10248,8 @@ msgstr ""
 "unterstützen."
 
 #: libraries/classes/Plugins/TwoFactor/Simple.php:52
-#, fuzzy
-#| msgid "Signon authentication"
 msgid "Simple two-factor authentication"
-msgstr "Signon-Authentifizierung"
+msgstr "Einfache Zwei-Faktor-Authentifizierung"
 
 #: libraries/classes/Plugins/TwoFactor/Simple.php:62
 #, fuzzy
@@ -10259,16 +10257,13 @@ msgid "For testing purposes only!"
 msgstr "Nur für Testzwecke!"
 
 #: libraries/classes/Plugins/TwoFactorPlugin.php:70
-#, fuzzy, php-format
-#| msgid "Hardware authentication failed!"
+#, php-format
 msgid "Two-factor authentication failed: %s"
-msgstr "Hardware Authentisierung fehlgeschlagen!"
+msgstr "Zwei-Faktor-Authentifizierung fehlgeschlagen: %s"
 
 #: libraries/classes/Plugins/TwoFactorPlugin.php:74
-#, fuzzy
-#| msgid "Hardware authentication failed!"
 msgid "Two-factor authentication failed."
-msgstr "Hardware Authentisierung fehlgeschlagen!"
+msgstr "Zwei-Faktor-Authentifizierung fehlgeschlagen."
 
 #: libraries/classes/Plugins/TwoFactorPlugin.php:127
 msgid "No Two-Factor"
@@ -14162,10 +14157,8 @@ msgid "Manage your settings"
 msgstr "Einstellungen verwalten"
 
 #: libraries/user_preferences.inc.php:38
-#, fuzzy
-#| msgid "Config authentication"
 msgid "Two-factor authentication"
-msgstr "Config-Authentifizierung"
+msgstr "Zwei-Faktor-Authentifizierung"
 
 #: libraries/user_preferences.inc.php:63 prefs_manage.php:296
 msgid "Configuration has been saved."
@@ -14273,16 +14266,12 @@ msgid "You can reset all your settings and restore them to default values."
 msgstr "Sie können alle Einstellungen auf die Standardwerte zurücksetzen."
 
 #: prefs_twofactor.php:29
-#, fuzzy
-#| msgid "Internal relationship has been removed."
 msgid "Two-factor authentication has been removed."
-msgstr "Interne Verknüpfung wurde beseitigt."
+msgstr "Zwei-Faktor-Authentifizierung wurde entfernt."
 
 #: prefs_twofactor.php:39
-#, fuzzy
-#| msgid "Invalid authentication method set in configuration:"
 msgid "Two-factor authentication has been configured."
-msgstr "Ungültige Authentifikationsmethode:"
+msgstr "Zwei-Faktor-Authentifizierung wurde eingerichtet."
 
 #: server_export.php:25
 msgid "View dump (schema) of databases"
@@ -14660,10 +14649,8 @@ msgid ""
 msgstr ""
 
 #: templates/prefs_twofactor_confirm.twig:9 templates/prefs_twofactor.twig:37
-#, fuzzy
-#| msgid "Config authentication"
 msgid "Disable two-factor authentication"
-msgstr "Config-Authentifizierung"
+msgstr "Zwei-Faktor-Authentifizierung deaktivieren"
 
 #: templates/database/tracking/tracked_tables.twig:2
 msgid "Tracked tables"
@@ -14706,16 +14693,13 @@ msgid "File may be compressed (%s) or uncompressed."
 msgstr "Datei kann komprimiert (%s) oder unkomprimiert sein."
 
 #: templates/display/import/import.twig:58
-#, fuzzy
-#| msgid ""
-#| "A compressed file's name must end in <b>.[format].[compression]</b>. "
-#| "Example: <b>.sql.zip</b>"
 msgid ""
 "A compressed file's name must end in <strong>.[format].[compression]</"
 "strong>. Example: <strong>.sql.zip</strong>"
 msgstr ""
-"Der Dateiname einer komprimierten Datei muss mit <b>.[Format]."
-"[Komprimierung]</b> enden. Beispiel: <b>.sql.zip</b>"
+"Der Dateiname einer komprimierten Datei muss mit "
+"<strong>.[Format].[Komprimierung]</strong> enden. Beispiel: "
+"<strong>.sql.zip</strong>"
 
 #: templates/display/import/import.twig:69
 #: templates/display/import/import.twig:84
@@ -14746,19 +14730,14 @@ msgstr ""
 "abgebrochen. Er wird nun bei Position %d fortgesetzt."
 
 #: templates/display/import/import.twig:137
-#, fuzzy
-#| msgid ""
-#| "Allow the interruption of an import in case the script detects it is "
-#| "close to the PHP timeout limit. <i>(This might be a good way to import "
-#| "large files, however it can break transactions.)</i>"
 msgid ""
 "Allow the interruption of an import in case the script detects it is close "
 "to the PHP timeout limit. <em>(This might be a good way to import large "
 "files, however it can break transactions.)</em>"
 msgstr ""
-"Import abbrechen, wenn die maximale PHP-Scriptlaufzeit erreicht wird. "
-"<i>(Damit ist es möglich, große Dateien zu importieren, allerdings kann es "
-"Transaktionen zerstören.)</i>"
+"Import abbrechen, wenn die maximale PHP-Scriptlaufzeit erreicht wird. <em>("
+"Damit ist es möglich, große Dateien zu importieren, allerdings kann es "
+"Transaktionen zerstören.)</em>"
 
 #: templates/display/import/import.twig:144
 msgid "Skip this number of queries (for SQL) starting from the first one:"
@@ -14892,10 +14871,9 @@ msgstr "Ausgabe:"
 
 #: templates/display/export/options_quick_export.twig:8
 #: templates/display/export/options_output_save_dir.twig:5
-#, fuzzy, php-format
-#| msgid "Save on server in the directory <b>%s</b>"
+#, php-format
 msgid "Save on server in the directory <strong>%s</strong>"
-msgstr "Speichere auf dem Server im Verzeichnis <b>%s</b>"
+msgstr "Speichere auf dem Server im Verzeichnis <strong>%s</strong>"
 
 #: templates/table/insert/continue_insertion_form.twig:18
 #, php-format
@@ -14909,10 +14887,9 @@ msgid ""
 msgstr ""
 
 #: templates/server/databases/table_row.twig:13
-#, fuzzy, php-format
-#| msgid "Jump to database"
+#, php-format
 msgid "Jump to database '%s'"
-msgstr "Springe zu Datenbank"
+msgstr "Springe zu Datenbank '%s'"
 
 #: templates/server/databases/table_row.twig:61
 #, php-format
@@ -15500,10 +15477,8 @@ msgid "Enter criteria as free text"
 msgstr ""
 
 #: templates/database/multi_table_query/form.twig:133
-#, fuzzy
-#| msgid "Remove redundant columns"
 msgid "Remove this column"
-msgstr "Überflüssige Spalten entfernen"
+msgstr "Diese Spalte entfernen"
 
 #: templates/database/multi_table_query/form.twig:143
 #: templates/table/relation/foreign_key_row.twig:91
@@ -15964,16 +15939,13 @@ msgid ""
 msgstr "Fehlende phpMyAdmin-Konfigurationsspeicher-Tabellen %sanlegen%s."
 
 #: templates/prefs_twofactor.twig:33
-#, fuzzy
 msgid "You have enabled two factor authentication."
 msgstr "Sie haben Zwei-Faktor-Authentifizierung aktiviert."
 
 #: templates/prefs_twofactor.twig:43 templates/prefs_twofactor.twig:54
 #: templates/prefs_twofactor_configure.twig:2
-#, fuzzy
-#| msgid "Config authentication"
 msgid "Configure two-factor authentication"
-msgstr "Config-Authentifizierung"
+msgstr "Zwei-Faktor-Authentifizierung konfigurieren"
 
 #: templates/database/search/results.twig:12
 #, php-format
@@ -15983,13 +15955,10 @@ msgstr[0] "%1$s Treffer in <strong>%2$s</strong>"
 msgstr[1] "%1$s Treffer in <strong>%2$s</strong>"
 
 #: templates/database/search/results.twig:56
-#, fuzzy
-#| msgid "<b>Total:</b> <i>%s</i> match"
-#| msgid_plural "<b>Total:</b> <i>%s</i> matches"
 msgid "<strong>Total:</strong> <em>%count%</em> match"
 msgid_plural "<strong>Total:</strong> <em>%count%</em> matches"
-msgstr[0] "<b>Insgesamt</b> <i>%s</i> Treffer"
-msgstr[1] "<b>Insgesamt</b> <i>%s</i> Treffer"
+msgstr[0] "<strong>Insgesamt</strong> <em>%s</em> Treffer"
+msgstr[1] "<strong>Insgesamt</strong> <em>%s</em> Treffer"
 
 #: templates/display/export/template_loading.twig:2
 msgid "Export templates:"
@@ -16046,10 +16015,9 @@ msgid "Save output to a file"
 msgstr "Speichere Ausgabe in Datei"
 
 #: templates/display/export/options_output.twig:51
-#, fuzzy, php-format
-#| msgid "Skip tables larger than"
+#, php-format
 msgid "Skip tables larger than %s MiB"
-msgstr "Überspringe Tabellen größer als"
+msgstr "Überspringe Tabellen größer als %s MiB"
 
 #: templates/display/export/options_output_separate_files.twig:7
 msgid "Export databases as separate files"
@@ -16151,12 +16119,12 @@ msgid "Add privileges on the following routine:"
 msgstr "Rechte zu folgender Routine hinzufügen:"
 
 #: templates/login/twofactor/invalid.twig:2
-#, fuzzy
-#| msgid "%sCreate%s missing phpMyAdmin configuration storage tables."
 msgid ""
 "The configured two factor authentication is not available, please install "
 "missing dependencies."
-msgstr "Fehlende phpMyAdmin-Konfigurationsspeicher-Tabellen %sanlegen%s."
+msgstr ""
+"Die konfigurierte Zwei-Faktor-Authentifizierung ist nicht verfügbar, bitte "
+"installieren Sie fehlende Abhängigkeiten."
 
 #: templates/table/tracking/structure_snapshot_columns.twig:47
 #: templates/table/structure/table_structure_row.twig:34
@@ -16259,8 +16227,6 @@ msgid "Hide/Show all"
 msgstr "Alles ein-/ausblenden"
 
 #: templates/database/designer/table_list.twig:14
-#, fuzzy
-#| msgid "Hide/Show Tables with no relationship"
 msgid "Hide/Show tables with no relationship"
 msgstr "Tabellen ohne Verknüpfung aus-/einblenden"
 
@@ -16481,10 +16447,8 @@ msgid "Index choice:"
 msgstr "Index Auswahl:"
 
 #: templates/table/index_form.twig:42
-#, fuzzy
-#| msgid "Active options"
 msgid "Advanced Options"
-msgstr "Aktive Optionen"
+msgstr "Zusätzliche Optionen"
 
 #: templates/table/index_form.twig:48
 msgid "Key block size:"
@@ -16519,16 +16483,13 @@ msgid "Effective"
 msgstr "Effektiv"
 
 #: templates/prefs_twofactor_configure.twig:8
-#, fuzzy
-#| msgid "Config authentication"
 msgid "Enable two-factor authentication"
-msgstr "Config-Authentifizierung"
+msgstr "Zwei-Faktor-Authentifizierung aktivieren"
 
 #: templates/database/structure/show_create_row.twig:7
-#, fuzzy, php-format
-#| msgid "Create User"
+#, php-format
 msgid "Create %s"
-msgstr "Erzeuge Benutzer"
+msgstr "Erzeuge %s"
 
 #: templates/database/structure/structure_table_row.twig:222
 msgid "in use"
diff --git a/po/fr.po b/po/fr.po
index aeeb9267fd..e00b742b2d 100644
--- 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-03-29 12:36+0000\n"
-"Last-Translator: Olivier Humbert <trebmuh@tuxfamily.org>\n"
+"PO-Revision-Date: 2018-04-14 22:37+0000\n"
+"Last-Translator: anonymous <>\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 2.20-dev\n"
+"X-Generator: Weblate 3.0-dev\n"
 
 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@@ -1281,33 +1281,33 @@ msgstr "o"
 #: js/messages.php:200 libraries/classes/Server/Status/Monitor.php:224
 #: libraries/classes/Util.php:1264
 msgid "KiB"
-msgstr "&nbsp;kio"
+msgstr "kio"
 
 #. l10n: shortcuts for Megabyte
 #: js/messages.php:201 libraries/classes/Server/Status/Monitor.php:225
 #: libraries/classes/Util.php:1266
 msgid "MiB"
-msgstr "&nbsp;Mio"
+msgstr "Mio"
 
 #. l10n: shortcuts for Gigabyte
 #: js/messages.php:202 libraries/classes/Util.php:1268
 msgid "GiB"
-msgstr "&nbsp;Gio"
+msgstr "Gio"
 
 #. l10n: shortcuts for Terabyte
 #: js/messages.php:203 libraries/classes/Util.php:1270
 msgid "TiB"
-msgstr "&nbsp;Tio"
+msgstr "Tio"
 
 #. l10n: shortcuts for Petabyte
 #: js/messages.php:204 libraries/classes/Util.php:1272
 msgid "PiB"
-msgstr "&nbsp;Pio"
+msgstr "Pio"
 
 #. l10n: shortcuts for Exabyte
 #: js/messages.php:205 libraries/classes/Util.php:1274
 msgid "EiB"
-msgstr "&nbsp;Eio"
+msgstr "Eio"
 
 #: js/messages.php:206
 #, php-format
diff --git a/po/he.po b/po/he.po
index 38dce3b41c..f9a0bdd10d 100644
--- 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-04-03 15:37+0000\n"
+"PO-Revision-Date: 2018-04-14 06:37+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 2.20-dev\n"
+"X-Generator: Weblate 3.0-dev\n"
 
 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@@ -758,6 +758,8 @@ msgid ""
 "The curl extension was not found and allow_url_fopen is disabled. Due to "
 "this some features such as error reporting or version check are disabled."
 msgstr ""
+"הרחבת ה־curl לא נמצאה והאפשרות allow_url_fopen מושבתת. עקב כך חלק מהתכונות "
+"כגון דיווח על שגיאות או בדיקת גרסאות מושבתות."
 
 #: index.php:532
 #, fuzzy
@@ -786,7 +788,7 @@ msgstr "קובץ התצורה צריכה ביטוי סיסמה סודית (blowf
 
 #: index.php:573
 msgid "The secret passphrase in configuration (blowfish_secret) is too short."
-msgstr ""
+msgstr "מילת הצופן הסודית בהגדרות שלך (blowfish_secret) קצרה מדי."
 
 #: index.php:587
 msgid ""
@@ -811,6 +813,7 @@ msgstr ""
 msgid ""
 "Or alternately go to 'Operations' tab of any database to set it up there."
 msgstr ""
+"או לחלופין יש לגשת ללשונית ‚פעולות’ של כל מסד נתונים כדי להגדיר אותו כאן."
 
 #: index.php:635
 #, php-format
@@ -818,6 +821,7 @@ msgid ""
 "Server running with Suhosin. Please refer to %sdocumentation%s for possible "
 "issues."
 msgstr ""
+"השרת פעיל עם Suhosin. נא לעיין ב%sתיעוד%s כדי לחקור עוד על תקלות אפשריות."
 
 #: index.php:649
 #, php-format
@@ -825,6 +829,8 @@ msgid ""
 "The $cfg['TempDir'] (%s) is not accessible. phpMyAdmin is not able to cache "
 "templates and will be slow because of this."
 msgstr ""
+"ההגדרה $cfg['TempDir'] (%s) אינה נגישה. ל־phpMyAdmin אין אפשרות לשמור תבניות "
+"והמערכת תאט בעקבות כך."
 
 #: js/messages.php:43
 msgid "Confirm"
@@ -948,7 +954,7 @@ msgstr "נתונים מעורבבים"
 
 #: js/messages.php:96
 msgid "Are you sure you wish to change the collation and convert the data?"
-msgstr ""
+msgstr "לשנות את האוסף ולהמיר את הנתונים?"
 
 #: js/messages.php:98
 msgid ""
@@ -1837,7 +1843,7 @@ msgstr "הוספת %d ערך/ים"
 #: js/messages.php:412
 msgid ""
 "Note: If the file contains multiple tables, they will be combined into one."
-msgstr ""
+msgstr "לתשומת לבך: אם הקובץ מכיל מספר טבלאות הן תאוחדנה לאחת."
 
 #: js/messages.php:416
 msgid "Hide query box"
@@ -1887,11 +1893,11 @@ msgstr "%d הוא לא מספר שורה תקין."
 #: libraries/classes/Controllers/Table/TableSearchController.php:854
 #: libraries/classes/Sql.php:214 tbl_change.php:141
 msgid "Browse foreign values"
-msgstr ""
+msgstr "עיון בערכים זרים"
 
 #: js/messages.php:422
 msgid "No auto-saved query"
-msgstr ""
+msgstr "אין שאילתה שנשמרה אוטומטית"
 
 #: js/messages.php:423
 #, php-format
@@ -1923,13 +1929,13 @@ msgstr "הצגת עוד"
 
 #: js/messages.php:434
 msgid "Are you sure?"
-msgstr ""
+msgstr "להמשיך?"
 
 #: js/messages.php:436
 msgid ""
 "This action may change some of the columns definition.<br/>Are you sure you "
 "want to continue?"
-msgstr ""
+msgstr "פעולה זו עשויה לשנות חלק מהגדרת העמודות.<br/>להמשיך בפעולה?"
 
 #: js/messages.php:439
 msgid "Continue"
@@ -1937,7 +1943,7 @@ msgstr "להמשיך"
 
 #: js/messages.php:442
 msgid "Add primary key"
-msgstr ""
+msgstr "הוספת מפתח עיקרי"
 
 #: js/messages.php:443
 msgid "Primary key added."
@@ -1971,11 +1977,11 @@ msgstr "סיום"
 
 #: js/messages.php:450
 msgid "Confirm partial dependencies"
-msgstr ""
+msgstr "אישור תלויות חלקיות"
 
 #: js/messages.php:451
 msgid "Selected partial dependencies are as follows:"
-msgstr ""
+msgstr "התלויות החלקיות שנבחרו הן:"
 
 #: js/messages.php:453
 msgid ""
@@ -1989,11 +1995,11 @@ msgstr "לא נמצאו תלויות חלקיות!"
 
 #: js/messages.php:459
 msgid "Show me the possible partial dependencies based on data in the table"
-msgstr ""
+msgstr "להציג לי את התלויות החלקיות האפשריות על בסיס הנתונים בטבלה"
 
 #: js/messages.php:460
 msgid "Hide partial dependencies list"
-msgstr ""
+msgstr "הסתרת רשימת התלויות החלקיות"
 
 #: js/messages.php:462
 msgid ""
@@ -2007,12 +2013,12 @@ msgstr ""
 
 #: js/messages.php:467
 msgid "The following actions will be performed:"
-msgstr ""
+msgstr "הפעולות הבאות תבוצענה:"
 
 #: js/messages.php:468
 #, php-format
 msgid "DROP columns %s from the table %s"
-msgstr ""
+msgstr "השמטת (DROP) עמודות %s מהטבלה %s"
 
 #: js/messages.php:469
 msgid "Create the following table"
@@ -2028,7 +2034,7 @@ msgstr ""
 
 #: js/messages.php:474
 msgid "Selected dependencies are as follows:"
-msgstr ""
+msgstr "אלו הן התלויות הנבחרות:"
 
 #: js/messages.php:475
 msgid "No dependencies selected!"
@@ -2066,11 +2072,11 @@ msgstr "כמות מזערית לעמודה:"
 
 #: js/messages.php:486
 msgid "Minimum value:"
-msgstr ""
+msgstr "ערך מזערי:"
 
 #: js/messages.php:487
 msgid "Maximum value:"
-msgstr ""
+msgstr "ערך מרבי:"
 
 #: js/messages.php:490
 msgid "Hide find and replace criteria"
@@ -2082,27 +2088,27 @@ msgstr "הצגת תנאי החיפוש וההחלפה"
 
 #: js/messages.php:495
 msgid "Each point represents a data row."
-msgstr ""
+msgstr "כל נקודה מייצגת שורת נתונים."
 
 #: js/messages.php:497
 msgid "Hovering over a point will show its label."
-msgstr ""
+msgstr "מעבר מעל נקודה תציג את התווית שלה."
 
 #: js/messages.php:499
 msgid "To zoom in, select a section of the plot with the mouse."
-msgstr ""
+msgstr "כדי להתקרב, יש לבחור סעיף מהתרשים עם העכבר."
 
 #: js/messages.php:501
 msgid "Click reset zoom button to come back to original state."
-msgstr ""
+msgstr "יש ללחוץ על כפתור איפוס התקריב כדי לחזור למצב המקורי."
 
 #: js/messages.php:503
 msgid "Click a data point to view and possibly edit the data row."
-msgstr ""
+msgstr "יש ללחוץ על נקודת נתונים כדי לצפות ואפילו לערוך את שורת הנתונים."
 
 #: js/messages.php:505
 msgid "The plot can be resized by dragging it along the bottom right corner."
-msgstr ""
+msgstr "ניתן לשנות את גודל התרשים על ידי גרירתו לאורך הפינה הימנית התחתונה."
 
 #: js/messages.php:508
 msgid "Select two columns"
@@ -2110,7 +2116,7 @@ msgstr "נא לבחור שתי עמודות"
 
 #: js/messages.php:510
 msgid "Select two different columns"
-msgstr ""
+msgstr "יש לבחור שתי עמודות נפרדות"
 
 #: js/messages.php:512
 msgid "Data point content"
@@ -2153,11 +2159,11 @@ msgstr "טבעת חיצונית"
 
 #: js/messages.php:529
 msgid "Do you want to copy encryption key?"
-msgstr ""
+msgstr "להעתיק את מפתח ההצפנה?"
 
 #: js/messages.php:530
 msgid "Encryption key"
-msgstr ""
+msgstr "מפתח הצפנה"
 
 #: js/messages.php:534
 msgid ""
@@ -2183,11 +2189,11 @@ msgstr ""
 
 #: js/messages.php:552
 msgid "Select Foreign Key"
-msgstr ""
+msgstr "נא לבחור מפתח זר"
 
 #: js/messages.php:554
 msgid "Please select the primary key or a unique key!"
-msgstr ""
+msgstr "נא לבחור את המפתח העיקרי או מפתח ייחודי!"
 
 #: js/messages.php:555 templates/database/designer/side_menu.twig:92
 #: templates/database/designer/side_menu.twig:95
@@ -2198,7 +2204,7 @@ msgstr "נא לבחור עמודה להצגה"
 msgid ""
 "You haven't saved the changes in the layout. They will be lost if you don't "
 "save them. Do you want to continue?"
-msgstr ""
+msgstr "לא שמרת את השינויים לפריסה. הם יאבדו אלמלא יישמרו. להמשיך?"
 
 #: js/messages.php:560 templates/database/designer/side_menu.twig:34
 #: templates/database/designer/side_menu.twig:37
@@ -2230,7 +2236,7 @@ msgstr "מחיקת עמוד"
 
 #: js/messages.php:566 templates/database/designer/side_menu.twig:4
 msgid "Untitled"
-msgstr ""
+msgstr "ללא כותרת"
 
 #: js/messages.php:567
 msgid "Please select a page to continue"
@@ -2242,11 +2248,11 @@ msgstr "נא להקליד שם עמוד תקני"
 
 #: js/messages.php:570
 msgid "Do you want to save the changes to the current page?"
-msgstr ""
+msgstr "לשמור את השינויים לעמוד הנוכחי?"
 
 #: js/messages.php:571
 msgid "Successfully deleted the page"
-msgstr ""
+msgstr "העמוד נמחק בהצלחה"
 
 #: js/messages.php:572
 msgid "Export relational schema"
@@ -2278,15 +2284,15 @@ msgstr "יש ללחוץ על escape כדי לבטל את העריכה."
 msgid ""
 "You have edited some data and they have not been saved. Are you sure you "
 "want to leave this page before saving the data?"
-msgstr ""
+msgstr "ערכת חלק מהנתונים והם לא נשמרו. לצאת מהעמוד הזה מבלי לשמור את הנתונים?"
 
 #: js/messages.php:586
 msgid "Drag to reorder."
-msgstr ""
+msgstr "יש לגרור כדי לסדר מחדש."
 
 #: js/messages.php:587
 msgid "Click to sort results by this column."
-msgstr ""
+msgstr "יש ללחוץ כדי לסדר תוצאות לפי עמודה זו."
 
 #: js/messages.php:589
 msgid ""
@@ -2297,13 +2303,11 @@ msgstr ""
 
 #: js/messages.php:593
 msgid "Click to mark/unmark."
-msgstr ""
+msgstr "יש ללחוץ כדי לסמן/לבטל סימון."
 
 #: js/messages.php:594
-#, fuzzy
-#| msgid "Column names"
 msgid "Double-click to copy column name."
-msgstr "שמות עמודה"
+msgstr "יש ללחוץ לחיצה כפולה כדי להעתיק שם עמודה."
 
 #: js/messages.php:596
 msgid "Click the drop-down arrow<br />to toggle column's visibility."
@@ -3009,22 +3013,22 @@ msgstr "שגיאה בקריאת הקובץ: הקובץ ‚%s’ לא קיים א
 #, php-format
 msgid ""
 "Invalid rule declaration on line %1$s, expected line %2$s of previous rule."
-msgstr ""
+msgstr "הצהרת כל שגויה בשורה %1$s, השורה הצפויה %2$s של כלל קודם."
 
 #: libraries/classes/Advisor.php:540
 #, php-format
 msgid "Invalid rule declaration on line %s."
-msgstr ""
+msgstr "הצהרת כלל שגויה בשורה %s."
 
 #: libraries/classes/Advisor.php:548
 #, php-format
 msgid "Unexpected characters on line %s."
-msgstr ""
+msgstr "תווים בלתי צפויים בשורה %s."
 
 #: libraries/classes/Advisor.php:563
 #, php-format
 msgid "Unexpected character on line %1$s. Expected tab, but found \"%2$s\"."
-msgstr ""
+msgstr "תו בלתי צפוי בשורה %1$s. אמור להיות טאב אך נמצא „%2$s” במקום."
 
 #: libraries/classes/Advisor.php:598
 msgid "per second"
@@ -3042,7 +3046,7 @@ msgstr "לשעה"
 
 #: libraries/classes/Advisor.php:607
 msgid "per day"
-msgstr ""
+msgstr "ליום"
 
 #: libraries/classes/BrowseForeigners.php:193
 msgid "Search:"
@@ -3075,51 +3079,45 @@ msgstr "מספר העמוד:"
 msgid ""
 "The configuration storage is not ready for the central list of columns "
 "feature."
-msgstr ""
+msgstr "אחסון התצורה לא מוכן לתכונת רשימת העמודות המרכזית."
 
 #: libraries/classes/CentralColumns.php:355
 #, php-format
 msgid "Could not add %1$s as they already exist in central list!"
-msgstr ""
+msgstr "לא ניתן להוסיף %1$s כיוון שהם כבר קיימים ברשימה מרכזית!"
 
 #: libraries/classes/CentralColumns.php:370
-#, fuzzy
-#| msgid "Add %s field(s)"
 msgid "Could not add columns!"
-msgstr "הוספת %s תאים"
+msgstr "לא ניתן להוסיף עמודות!"
 
 #: libraries/classes/CentralColumns.php:447
 #, php-format
 msgid ""
 "Couldn't remove Column(s) %1$s as they don't exist in central columns list!"
 msgstr ""
+"לא ניתן להסיר את העמודות %1$s כיוון שהן לא קיימות ברשימת העמודות המרכזית!"
 
 #: libraries/classes/CentralColumns.php:459
-#, fuzzy
-#| msgid "Documentation"
 msgid "Could not remove columns!"
-msgstr "תיעוד"
+msgstr "לא ניתן להסיר עמודות!"
 
 #: libraries/classes/CentralColumns.php:618
 msgid "YES"
-msgstr ""
+msgstr "כן"
 
 #: libraries/classes/CentralColumns.php:618
 msgid "NO"
-msgstr ""
+msgstr "לא"
 
 #: libraries/classes/CentralColumns.php:749
 #: libraries/classes/Display/Results.php:961
-#, fuzzy
 msgid "Filter rows"
-msgstr "שדות"
+msgstr "סינון שורות"
 
 #: libraries/classes/CentralColumns.php:751
 #: libraries/classes/Display/Results.php:963
-#, fuzzy
-#| msgid "Search in database"
 msgid "Search this table"
-msgstr "חיפוש במסד הנתונים"
+msgstr "חיפוש בטבלה זו"
 
 #: libraries/classes/CentralColumns.php:774 libraries/classes/Index.php:717
 #: libraries/classes/Rte/RteList.php:89 libraries/classes/Rte/RteList.php:104
@@ -3183,7 +3181,7 @@ msgstr "איסוף"
 #, fuzzy
 #| msgid "Attributes"
 msgid "Attribute"
-msgstr "תכונות"
+msgstr "מאפיין"
 
 #: libraries/classes/CentralColumns.php:797
 #: libraries/classes/CentralColumns.php:1480
@@ -3191,29 +3189,21 @@ msgid "A_I"
 msgstr ""
 
 #: libraries/classes/CentralColumns.php:833
-#, fuzzy
-#| msgid "Select Tables"
 msgid "Select a table"
-msgstr "בחירת טבלאות"
+msgstr "נא לבחור טבלה"
 
 #: libraries/classes/CentralColumns.php:890
 #: templates/table/structure/add_column.twig:4
-#, fuzzy
-#| msgid "Add %s field(s)"
 msgid "Add column"
-msgstr "הוספת %s תאים"
+msgstr "הוספת עמודה"
 
 #: libraries/classes/CentralColumns.php:902
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
 msgid "Select a column."
-msgstr "הוספת/מחיקת עמודות שדה"
+msgstr "נא לבחור עמודה."
 
 #: libraries/classes/CentralColumns.php:1355
-#, fuzzy
-#| msgid "Add %s field(s)"
 msgid "Add new column"
-msgstr "הוספת %s תאים"
+msgstr "הוספת עמודה חדשה"
 
 #: libraries/classes/CentralColumns.php:1480
 #: libraries/classes/Plugins/Schema/Pdf/PdfRelationSchema.php:631
@@ -3229,36 +3219,28 @@ msgid "Charset"
 msgstr "קידוד"
 
 #: libraries/classes/Charsets.php:310
-#, fuzzy
-#| msgid "unknown"
 msgid "Unknown"
-msgstr "לא ידוע"
+msgstr "לא ידועה"
 
 #: libraries/classes/Charsets.php:324
-#, fuzzy
-#| msgid "Binary"
 msgctxt "Collation"
 msgid "Binary"
-msgstr "בינארי"
+msgstr "בינרי"
 
 #: libraries/classes/Charsets.php:336 libraries/classes/Charsets.php:566
-#, fuzzy
-#| msgid "Unicode"
 msgctxt "Collation"
 msgid "Unicode"
-msgstr "Unicode"
+msgstr "יוניקוד"
 
 #: libraries/classes/Charsets.php:346 libraries/classes/Charsets.php:517
 msgctxt "Collation"
 msgid "West European"
-msgstr ""
+msgstr "מערב אירופי"
 
 #: libraries/classes/Charsets.php:353
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
 msgctxt "Collation"
 msgid "Central European"
-msgstr "הוספת/מחיקת עמודות שדה"
+msgstr "מרכז אירופאי"
 
 #: libraries/classes/Charsets.php:358
 #, fuzzy
@@ -3576,42 +3558,39 @@ msgid "multi-level"
 msgstr ""
 
 #: libraries/classes/Charsets.php:645
-#, fuzzy
-#| msgid "Binary"
 msgctxt "Collation variant"
 msgid "binary"
-msgstr "בינארי"
+msgstr "בינרי"
 
 #: libraries/classes/Config.php:1073
 #, php-format
 msgid "Existing configuration file (%s) is not readable."
-msgstr ""
+msgstr "קובץ התצורה הקיים (%s) אינו קריא."
 
 #: libraries/classes/Config.php:1103
 msgid "Wrong permissions on configuration file, should not be world writable!"
-msgstr ""
+msgstr "ההרשאות של קובץ התצורה שגויות, הקובץ אמור להיות קריא לכל העולם!"
 
 #: libraries/classes/Config.php:1123
 #, php-format
 msgid "Could not load default configuration from: %1$s"
-msgstr ""
+msgstr "לא ניתן לטעון את תצורת בררת המחדל מהמיקום: %1$s"
 
 #: libraries/classes/Config.php:1130
-#, fuzzy
-#| msgid "Local monitor configuration incompatible"
 msgid "Failed to read configuration file!"
-msgstr "תצורת מעקב מקומית אינה נתמכת"
+msgstr "קריאת קובץ התצורה נכשלה!"
 
 #: libraries/classes/Config.php:1133
 msgid ""
 "This usually means there is a syntax error in it, please check any errors "
 "shown below."
 msgstr ""
+"על פי רוב משמעות הדבר היא שיש שגיאת תחביר, נא לעיין בשגיאות שמופיעות להלן."
 
 #: libraries/classes/Config.php:1449
 #: libraries/classes/Config/Descriptions.php:1486
 msgid "Font size"
-msgstr ""
+msgstr "גודל הגופן"
 
 #: libraries/classes/Config.php:1770
 #, php-format
@@ -3619,20 +3598,20 @@ msgid "Invalid server index: %s"
 msgstr ""
 
 #: libraries/classes/Config.php:1783
-#, fuzzy, php-format
-#| msgid "Server"
+#, php-format
 msgid "Server %d"
-msgstr "שרת"
+msgstr "שרת %d"
 
 #: libraries/classes/Config/Descriptions.php:62
 msgid ""
 "If enabled, user can enter any MySQL server in login form for cookie auth."
 msgstr ""
+"אם האפשרות פעילה, המשתמש יכול להיכנס לכל שרת MySQL דרך טופס הכניסה לטובת "
+"אימות באמצעות עוגיות."
 
 #: libraries/classes/Config/Descriptions.php:64
-#, fuzzy
 msgid "Allow login to any MySQL server"
-msgstr "נכשל בכניסה לשרת MySQL"
+msgstr "לאפשר כניסה לכל שרת MySQL"
 
 #: libraries/classes/Config/Descriptions.php:67
 msgid ""
@@ -4868,14 +4847,12 @@ msgid "Show databases navigation as tree"
 msgstr "הראה רשת"
 
 #: libraries/classes/Config/Descriptions.php:772
-#, fuzzy
 msgid "Navigation panel width"
-msgstr "אפשרויות ייצוא מאגר נתונים"
+msgstr "רוחב לוח ניווט"
 
 #: libraries/classes/Config/Descriptions.php:774
-#, fuzzy
 msgid "Set to 0 to collapse navigation panel."
-msgstr "אפשרויות ייצוא מאגר נתונים"
+msgstr "יש להגדיר ל־0 כדי לכווץ את לוח הניווט."
 
 #: libraries/classes/Config/Descriptions.php:776
 msgid "Link with main panel by highlighting the current database or table."
@@ -8253,10 +8230,8 @@ msgid "Data only"
 msgstr "נתונים בלבד"
 
 #: libraries/classes/MultSubmits.php:366
-#, fuzzy
-#| msgid "Add AUTO_INCREMENT value"
 msgid "Add AUTO INCREMENT value"
-msgstr "הוספת ערך AUTO_INCREMENT (מספור אוטומטי)"
+msgstr "הוספת ערך AUTO INCREMENT (מספור אוטומטי)"
 
 #: libraries/classes/MultSubmits.php:368 libraries/classes/Operations.php:232
 #: libraries/classes/Operations.php:1291
@@ -8268,10 +8243,8 @@ msgstr "הוספת הגבלות"
 #: libraries/classes/Operations.php:956 libraries/classes/Operations.php:1310
 #: libraries/classes/Rte/Routines.php:1024
 #: templates/columns_definitions/table_fields_definitions.twig:36
-#, fuzzy
-#| msgid "Edit Privileges"
 msgid "Adjust privileges"
-msgstr "עריכת הרשאות"
+msgstr "התאמת הרשאות"
 
 #: libraries/classes/MultSubmits.php:392
 #, fuzzy
@@ -8284,54 +8257,41 @@ msgid "To"
 msgstr ""
 
 #: libraries/classes/MultSubmits.php:426
-#, fuzzy
-#| msgid "Add new field"
 msgid "Add prefix"
-msgstr "הוספת שדה חדש"
+msgstr "הוספת קידומת"
 
 #: libraries/classes/MultSubmits.php:459
-#, fuzzy
-#| msgid "Do you really want to "
 msgid "Do you really want to execute the following query?"
-msgstr "האם אתה באמת רוצה "
+msgstr "להריץ את השאילתה הבאה?"
 
 #: libraries/classes/Navigation/Navigation.php:56
 msgid "An error has occurred while loading the navigation display"
 msgstr ""
 
 #: libraries/classes/Navigation/Navigation.php:194
-#, fuzzy
-#| msgid "Column names"
 msgid "Groups:"
-msgstr "שמות עמודה"
+msgstr "קבוצות:"
 
 #: libraries/classes/Navigation/Navigation.php:195
-#, fuzzy
 msgid "Events:"
-msgstr "נשלח"
+msgstr "אירועים:"
 
 #: libraries/classes/Navigation/Navigation.php:196
-#, fuzzy
 msgid "Functions:"
-msgstr "פונקציה"
+msgstr "פונקציות:"
 
 #: libraries/classes/Navigation/Navigation.php:197
-#, fuzzy
 msgid "Procedures:"
-msgstr "תהליכים"
+msgstr "נהלים:"
 
 #: libraries/classes/Navigation/Navigation.php:198
 #: templates/display/export/selection.twig:5
-#, fuzzy
-#| msgid "Tables"
 msgid "Tables:"
-msgstr "טבלאות"
+msgstr "טבלאות:"
 
 #: libraries/classes/Navigation/Navigation.php:199
-#, fuzzy
-#| msgid "View"
 msgid "Views:"
-msgstr "תצוגה"
+msgstr "תצוגות:"
 
 #: libraries/classes/Navigation/Navigation.php:223
 #: libraries/classes/Tracking.php:163 tbl_change.php:146
@@ -8349,24 +8309,20 @@ msgid "Log out"
 msgstr "יציאה"
 
 #: libraries/classes/Navigation/NavigationHeader.php:175
-#, fuzzy
-#| msgid "Dumping data for table"
 msgid "Empty session data"
-msgstr "הוצאת מידע עבור טבלה"
+msgstr "נתוני הפעלה ריקים"
 
 #: libraries/classes/Navigation/NavigationHeader.php:193
 msgid "phpMyAdmin documentation"
 msgstr "תיעוד phpMyAdmin"
 
 #: libraries/classes/Navigation/NavigationHeader.php:213
-#, fuzzy
 msgid "Navigation panel settings"
-msgstr "אפשרויות ייצוא מאגר נתונים"
+msgstr "הגדרות לוח ניווט"
 
 #: libraries/classes/Navigation/NavigationHeader.php:224
-#, fuzzy
 msgid "Reload navigation panel"
-msgstr "אפשרויות ייצוא מאגר נתונים"
+msgstr "טעינת לוח הניווט מחדש"
 
 #: libraries/classes/Navigation/NavigationTree.php:755
 msgid ""
@@ -8388,10 +8344,8 @@ msgstr ""
 
 #: libraries/classes/Navigation/NavigationTree.php:1368
 #: libraries/classes/Navigation/NavigationTree.php:1399
-#, fuzzy
-#| msgid "Save as file"
 msgid "Clear fast filter"
-msgstr "שמירה כקובץ"
+msgstr "פינוי המסנן המהיר"
 
 #: libraries/classes/Navigation/NavigationTree.php:1425
 msgid "Collapse all"
@@ -8404,10 +8358,9 @@ msgid "Invalid class name \"%1$s\", using default of \"Node\""
 msgstr ""
 
 #: libraries/classes/Navigation/NodeFactory.php:61
-#, fuzzy, php-format
-#| msgid "Add %s field(s)"
+#, php-format
 msgid "Could not load class \"%1$s\""
-msgstr "הוספת %s תאים"
+msgstr "לא ניתן לטעון את המחלקה „%1$s”"
 
 #: libraries/classes/Navigation/Nodes/Node.php:796
 msgid "Expand/Collapse"
@@ -8416,10 +8369,8 @@ msgstr ""
 #: libraries/classes/Navigation/Nodes/NodeColumnContainer.php:25
 #: libraries/classes/Navigation/Nodes/NodeColumnContainer.php:26
 #: libraries/classes/SqlQueryForm.php:269
-#, fuzzy
-#| msgid "Column names"
 msgid "Columns"
-msgstr "שמות עמודה"
+msgstr "עמודות"
 
 #: libraries/classes/Navigation/Nodes/NodeColumnContainer.php:35
 msgctxt "Create new column"
@@ -8430,13 +8381,11 @@ msgstr ""
 #, fuzzy
 #| msgid "Database export options"
 msgid "Database operations"
-msgstr "אפשרויות ייצוא מאגר נתונים"
+msgstr "פעולות במסד נתונים"
 
 #: libraries/classes/Navigation/Nodes/NodeDatabase.php:685
-#, fuzzy
-#| msgid "Show grid"
 msgid "Show hidden items"
-msgstr "הראה רשת"
+msgstr "הצגת פריטים מוסתרים"
 
 #: libraries/classes/Navigation/Nodes/NodeDatabaseContainer.php:36
 msgctxt "Create new database"
@@ -8454,7 +8403,7 @@ msgstr ""
 #: libraries/classes/Plugins/Export/ExportXml.php:109
 #, fuzzy
 msgid "Functions"
-msgstr "פונקציה"
+msgstr "פונקציות"
 
 #: libraries/classes/Navigation/Nodes/NodeFunctionContainer.php:35
 msgctxt "Create new function"
@@ -8467,17 +8416,15 @@ msgid "New"
 msgstr ""
 
 #: libraries/classes/Navigation/Nodes/NodeProcedure.php:30
-#, fuzzy
 msgid "Procedure"
-msgstr "תהליכים"
+msgstr "נוהל"
 
 #: libraries/classes/Navigation/Nodes/NodeProcedureContainer.php:25
 #: libraries/classes/Navigation/Nodes/NodeProcedureContainer.php:26
 #: libraries/classes/Plugins/Export/ExportSql.php:562
 #: libraries/classes/Plugins/Export/ExportXml.php:114
-#, fuzzy
 msgid "Procedures"
-msgstr "תהליכים"
+msgstr "נהלים"
 
 #: libraries/classes/Navigation/Nodes/NodeProcedureContainer.php:35
 #: libraries/classes/Rte/Footer.php:37
@@ -8540,24 +8487,18 @@ msgid ""
 msgstr ""
 
 #: libraries/classes/Normalization.php:200 normalization.php:19
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
 msgid "Select one…"
-msgstr "הוספת/מחיקת עמודות שדה"
+msgstr "נא לבחור אחד…"
 
 #: libraries/classes/Normalization.php:201 normalization.php:20
-#, fuzzy
-#| msgid "Add/Delete Field Columns"
 msgid "No such column"
-msgstr "הוספת/מחיקת עמודות שדה"
+msgstr "אין כזו עמודה"
 
 #: libraries/classes/Normalization.php:205 libraries/classes/Types.php:722
 #: normalization.php:25
-#, fuzzy
-#| msgid "Linestring"
 msgctxt "string types"
 msgid "String"
-msgstr "מחרוזת שורה"
+msgstr "מחרוזת"
 
 #: libraries/classes/Normalization.php:208
 msgid "split into "
@@ -17176,10 +17117,8 @@ msgid ""
 msgstr ""
 
 #: libraries/advisory_rules.txt:218
-#, fuzzy
-#| msgid "Start"
 msgid "Sort rows"
-msgstr "שבת"
+msgstr "סידור שורות"
 
 #: libraries/advisory_rules.txt:221
 msgid "There are lots of rows being sorted."
@@ -17267,14 +17206,12 @@ msgid ""
 msgstr ""
 
 #: libraries/advisory_rules.txt:247
-#, fuzzy
 msgid "Rate of reading next table row"
-msgstr "יצירת עמוד חדש"
+msgstr "קצב קריאת השורה הבאה בטבלה"
 
 #: libraries/advisory_rules.txt:250
-#, fuzzy
 msgid "The rate of reading the next table row is high."
-msgstr "יצירת עמוד חדש"
+msgstr "קצב קריאת השורה הבאה בטבלה גבוה."
 
 #: libraries/advisory_rules.txt:251
 msgid ""
@@ -17310,10 +17247,8 @@ msgid "Current values are tmp_table_size: %s, max_heap_table_size: %s"
 msgstr ""
 
 #: libraries/advisory_rules.txt:262
-#, fuzzy
-#| msgid "Table of contents"
 msgid "Percentage of temp tables on disk"
-msgstr "תוכן עניניים"
+msgstr "אחוז הטבלאות הזמניות בכונן"
 
 #: libraries/advisory_rules.txt:265 libraries/advisory_rules.txt:272
 msgid ""
@@ -17340,10 +17275,8 @@ msgid ""
 msgstr ""
 
 #: libraries/advisory_rules.txt:269
-#, fuzzy
-#| msgid "%s table(s)"
 msgid "Temp disk rate"
-msgstr "%s טבלאות"
+msgstr "קצב זמניות בכונן"
 
 #: libraries/advisory_rules.txt:273
 msgid ""
@@ -17435,14 +17368,12 @@ msgid "Index reads from memory: %s%%, this value should be above 95%%"
 msgstr ""
 
 #: libraries/advisory_rules.txt:309
-#, fuzzy
 msgid "Rate of table open"
-msgstr "יצירת עמוד חדש"
+msgstr "קצב פתיחת טבלאות"
 
 #: libraries/advisory_rules.txt:312
-#, fuzzy
 msgid "The rate of opening tables is high."
-msgstr "חבילת הקידוד של הקובץ:"
+msgstr "קצב פתיחת הטבלאות גבוה."
 
 #: libraries/advisory_rules.txt:313
 msgid ""
@@ -17456,9 +17387,8 @@ msgid "Opened table rate: %s, this value should be less than 10 per hour"
 msgstr ""
 
 #: libraries/advisory_rules.txt:316
-#, fuzzy
 msgid "Percentage of used open files limit"
-msgstr "חבילת הקידוד של הקובץ:"
+msgstr "אחוז מגבלת הקבצים הפתוחים שנוצל"
 
 #: libraries/advisory_rules.txt:319
 msgid ""
@@ -17479,14 +17409,12 @@ msgid ""
 msgstr ""
 
 #: libraries/advisory_rules.txt:323
-#, fuzzy
 msgid "Rate of open files"
-msgstr "חבילת הקידוד של הקובץ:"
+msgstr "קצב פתיחת קבצים"
 
 #: libraries/advisory_rules.txt:326
-#, fuzzy
 msgid "The rate of opening files is high."
-msgstr "חבילת הקידוד של הקובץ:"
+msgstr "קצב פתיחת קבצים גבוה."
 
 #: libraries/advisory_rules.txt:328
 #, php-format
@@ -17625,16 +17553,12 @@ msgid ""
 msgstr ""
 
 #: libraries/advisory_rules.txt:381
-#, fuzzy
-#| msgid "Connections"
 msgid "Percentage of aborted connections"
-msgstr "חיבורים"
+msgstr "אחוז החיבורים הנקטעים"
 
 #: libraries/advisory_rules.txt:384 libraries/advisory_rules.txt:391
-#, fuzzy
-#| msgid "Allows creating temporary tables."
 msgid "Too many connections are aborted."
-msgstr "מאפשר יצירת טבלאות זמניות."
+msgstr "יותר מדי חיבורים נקטעים."
 
 #: libraries/advisory_rules.txt:385 libraries/advisory_rules.txt:392
 msgid ""
@@ -17649,10 +17573,8 @@ msgid "%s%% of all connections are aborted. This value should be below 1%%"
 msgstr ""
 
 #: libraries/advisory_rules.txt:388
-#, fuzzy
-#| msgid "Connections"
 msgid "Rate of aborted connections"
-msgstr "חיבורים"
+msgstr "קצב החיבורים הנקטעים"
 
 #: libraries/advisory_rules.txt:393
 #, php-format
@@ -17661,16 +17583,12 @@ msgid ""
 msgstr ""
 
 #: libraries/advisory_rules.txt:395
-#, fuzzy
-#| msgid "Table of contents"
 msgid "Percentage of aborted clients"
-msgstr "תוכן עניניים"
+msgstr "אחוז הלקוחות הנקטעים"
 
 #: libraries/advisory_rules.txt:398 libraries/advisory_rules.txt:405
-#, fuzzy
-#| msgid "Allows creating temporary tables."
 msgid "Too many clients are aborted."
-msgstr "מאפשר יצירת טבלאות זמניות."
+msgstr "יותר מדי לקוחות נקטעו."
 
 #: libraries/advisory_rules.txt:399 libraries/advisory_rules.txt:406
 msgid ""
@@ -17685,10 +17603,8 @@ msgid "%s%% of all clients are aborted. This value should be below 2%%"
 msgstr ""
 
 #: libraries/advisory_rules.txt:402
-#, fuzzy
-#| msgid "Table of contents"
 msgid "Rate of aborted clients"
-msgstr "תוכן עניניים"
+msgstr "קצב הלקוחות שנקטעו"
 
 #: libraries/advisory_rules.txt:407
 #, php-format
@@ -17744,11 +17660,11 @@ msgstr ""
 
 #: libraries/advisory_rules.txt:425
 msgid "Max InnoDB log size"
-msgstr ""
+msgstr "גודל יומן ה־InnoDB המרבי"
 
 #: libraries/advisory_rules.txt:428
 msgid "The InnoDB log file size is inadequately large."
-msgstr ""
+msgstr "גודל קובץ היומן של InnoDB גדול באופן בלתי הולם."
 
 #: libraries/advisory_rules.txt:429
 #, php-format
@@ -17767,7 +17683,7 @@ msgstr ""
 #: libraries/advisory_rules.txt:430
 #, php-format
 msgid "Your absolute InnoDB log size is %s MiB"
-msgstr ""
+msgstr "גודל המוחלט של יומן ה־InnoDB שלך הוא %s ‏MiB"
 
 #: libraries/advisory_rules.txt:432
 msgid "InnoDB buffer pool size"
@@ -17803,11 +17719,11 @@ msgstr ""
 
 #: libraries/advisory_rules.txt:441
 msgid "MyISAM concurrent inserts"
-msgstr ""
+msgstr "הכנסות בו זמניות של MyISAM"
 
 #: libraries/advisory_rules.txt:444
 msgid "Enable {concurrent_insert} by setting it to 1"
-msgstr ""
+msgstr "הפעלת {concurrent_insert} על ידי שינוי ההגדרה ל־1"
 
 #: libraries/advisory_rules.txt:445
 msgid ""
diff --git a/po/nb.po b/po/nb.po
index 4189bc316b..67a9855d13 100644
--- a/po/nb.po
+++ b/po/nb.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-03 16:38+0000\n"
-"Last-Translator: Børge Holm-Wennberg <borge947@gmail.com>\n"
+"PO-Revision-Date: 2018-04-11 23:39+0000\n"
+"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
 "Language-Team: Norwegian Bokmål <https://hosted.weblate.org/projects/"
 "phpmyadmin/4-8/nb/>\n"
 "Language: nb\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 2.20-dev\n"
+"X-Generator: Weblate 2.20\n"
 
 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@@ -308,7 +308,7 @@ msgstr "Databasenavnet er tomt!"
 
 #: db_operations.php:67
 msgid "Cannot copy database to the same name. Change the name and try again."
-msgstr ""
+msgstr "Kan ikke kopiere database til samme navn. Endre navnet og prøv igjen."
 
 #: db_operations.php:154
 #, php-format
@@ -680,10 +680,8 @@ msgid "Server type:"
 msgstr "Tjener-type:"
 
 #: index.php:342
-#, fuzzy
-#| msgid "Insecure connection"
 msgid "Server connection:"
-msgstr "Usikker tilkobling"
+msgstr "Tjenertilkobling:"
 
 #: index.php:346 libraries/classes/Plugins/Export/ExportLatex.php:223
 #: libraries/classes/Plugins/Export/ExportSql.php:704
@@ -1766,10 +1764,8 @@ msgid "No databases selected."
 msgstr "Ingen databaser er valgt."
 
 #: js/messages.php:370
-#, fuzzy
-#| msgid "No rows selected"
 msgid "No accounts selected."
-msgstr "Ingen rader valgt"
+msgstr "Ingen kontoer valgt."
 
 #: js/messages.php:371
 msgid "Dropping column"
diff --git a/po/ru.po b/po/ru.po
index 103d4adca0..8ca51742fc 100644
--- a/po/ru.po
+++ b/po/ru.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: 2017-12-17 15:12+0000\n"
-"Last-Translator: subo <subo098@gmail.com>\n"
-"Language-Team: Russian <https://hosted.weblate.org/projects/phpmyadmin/"
-"master/ru/>\n"
+"PO-Revision-Date: 2018-04-16 18:41+0000\n"
+"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"Language-Team: Russian <https://hosted.weblate.org/projects/phpmyadmin/4-8/"
+"ru/>\n"
 "Language: ru\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.18\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"
 
 #: ajax.php:21 ajax.php:50 export.php:203 libraries/classes/Export.php:1100
 msgid "Bad type!"
@@ -2929,6 +2929,7 @@ msgstr "Нед."
 #. * or "calendar-year-month".
 #.
 #: js/messages.php:889
+#, fuzzy
 msgid "calendar-month-year"
 msgstr "календарь-месяц-год"
 
@@ -6151,14 +6152,10 @@ msgid "Show current browsing query"
 msgstr "Показать текущий запрос на просмотр"
 
 #: libraries/classes/Config/Descriptions.php:1472
-#, fuzzy
-#| msgid ""
-#| "Execute queries on Enter and insert new line with Shift + Enter. To make "
-#| "this permanent, view settings."
 msgid "Execute queries on Enter and insert new line with Shift + Enter"
 msgstr ""
 "Выполнить запрос по нажатию Enter и вставить новую строку по нажатию Shift + "
-"Enter. Чтобы сделать эту опцию постоянной, смотрите настройки."
+"Enter."
 
 #: libraries/classes/Config/Descriptions.php:1474
 #: templates/console/display.twig:168
@@ -10123,10 +10120,8 @@ msgstr ""
 "поддерживающих FIDO U2F."
 
 #: libraries/classes/Plugins/TwoFactor/Simple.php:52
-#, fuzzy
-#| msgid "Signon authentication"
 msgid "Simple two-factor authentication"
-msgstr "Авторизация с помощью Signon"
+msgstr "Простая двухфакторная аутентификация"
 
 #: libraries/classes/Plugins/TwoFactor/Simple.php:62
 msgid "For testing purposes only!"
diff --git a/sql.php b/sql.php
index 13eb168e03..056497fd3b 100644
--- a/sql.php
+++ b/sql.php
@@ -69,8 +69,8 @@ if (! isset($err_url)) {
 // Coming from a bookmark dialog
 if (isset($_POST['bkm_fields']['bkm_sql_query'])) {
     $sql_query = $_POST['bkm_fields']['bkm_sql_query'];
-} elseif (isset($_GET['sql_query'])) {
-    $sql_query = $_GET['sql_query'];
+} elseif (isset($_POST['sql_query'])) {
+    $sql_query = $_POST['sql_query'];
 }
 
 // This one is just to fill $db