Release 4.9.3

Fields with GENERATED ALWAYS default values are also disabled.

Thanks to PurpleTape (https://github.com/adminerevo/adminerevo/issues/201).

.editorconfig

@@ -0,0 +1,20 @@
+# https://editorconfig.org/
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.{php,css,js}]
+indent_style = tab
+
+[*.json]
+indent_style = space
+indent_size = 4
+
+[*.md]
+indent_style = space
+trim_trailing_whitespace = false
+max_line_length = 120

.gitignore

@@ -2,3 +2,5 @@
 /adminer*.php
 /editor*.php
 /vendor/
+/composer.lock
+/temp

.gitmodules

@@ -1,9 +1,3 @@
-[submodule "jush"]
-	path = externals/jush
-	url = git://github.com/vrana/jush
-[submodule "JsShrink"]
-	path = externals/JsShrink
-	url = git://github.com/vrana/JsShrink
 [submodule "designs/hydra"]
 	path = designs/hydra
 	url = https://github.com/Niyko/Hydra-Dark-Theme-for-Adminer

adminer/create.inc.php

@@ -82,20 +82,39 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 		}
 
 		$partitioning = "";
-		if ($partition_by[$row["partition_by"]]) {
+		if (support("partitioning")) {
-			$partitions = array();
+			if (isset($partition_by[$row["partition_by"]])) {
-			if ($row["partition_by"] == 'RANGE' || $row["partition_by"] == 'LIST') {
+				$params = array_filter($row, function ($key) {
-				foreach (array_filter($row["partition_names"]) as $key => $val) {
+					return preg_match('~^partition~', $key);
-					$value = $row["partition_values"][$key];
+				}, ARRAY_FILTER_USE_KEY);
-					$partitions[] = "\n  PARTITION " . idf_escape($val) . " VALUES " . ($row["partition_by"] == 'RANGE' ? "LESS THAN" : "IN") . ($value != "" ? " ($value)" : " MAXVALUE"); //! SQL injection
+
+				foreach ($params["partition_names"] as $key => $name) {
+					if ($name === "") {
+						unset($params["partition_names"][$key]);
+						unset($params["partition_values"][$key]);
+					}
 				}
+
+				if ($params != get_partitions_info($TABLE)) {
+					$partitions = [];
+					if ($params["partition_by"] == 'RANGE' || $params["partition_by"] == 'LIST') {
+						foreach ($params["partition_names"] as $key => $name) {
+							$value = $params["partition_values"][$key];
+							$partitions[] = "\n  PARTITION " . idf_escape($name) . " VALUES " . ($params["partition_by"] == 'RANGE' ? "LESS THAN" : "IN") . ($value != "" ? " ($value)" : " MAXVALUE"); //! SQL injection
+						}
+					}
+
+					// $params["partition"] can be expression, not only column
+					$partitioning .= "\nPARTITION BY {$params["partition_by"]}({$params["partition"]})";
+					if ($partitions) {
+						$partitioning .= " (" . implode(",", $partitions) . "\n)";
+					} elseif ($params["partitions"]) {
+						$partitioning .= " PARTITIONS " . (int)$params["partitions"];
+					}
+				}
+			} elseif (preg_match("~partitioned~", $table_status["Create_options"])) {
+				$partitioning .= "\nREMOVE PARTITIONING";
 			}
-			$partitioning .= "\nPARTITION BY $row[partition_by]($row[partition])" . ($partitions // $row["partition"] can be expression, not only column
-				? " (" . implode(",", $partitions) . "\n)"
-				: ($row["partitions"] ? " PARTITIONS " . (+$row["partitions"]) : "")
-			);
-		} elseif (support("partitioning") && preg_match("~partitioned~", $table_status["Create_options"])) {
-			$partitioning .= "\nREMOVE PARTITIONING";
 		}
 
 		$message = lang('Table has been altered.');
@@ -141,13 +160,9 @@ if (!$_POST) {
 		}
 
 		if (support("partitioning")) {
-			$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . q(DB) . " AND TABLE_NAME = " . q($TABLE);
+			$row += get_partitions_info($TABLE);
-			$result = $connection->query("SELECT PARTITION_METHOD, PARTITION_ORDINAL_POSITION, PARTITION_EXPRESSION $from ORDER BY PARTITION_ORDINAL_POSITION DESC LIMIT 1");
+			$row["partition_names"][] = "";
-			list($row["partition_by"], $row["partitions"], $row["partition"]) = $result->fetch_row();
+			$row["partition_values"][] = "";
-			$partitions = get_key_vals("SELECT PARTITION_NAME, PARTITION_DESCRIPTION $from AND PARTITION_NAME != '' ORDER BY PARTITION_ORDINAL_POSITION");
-			$partitions[""] = "";
-			$row["partition_names"] = array_keys($partitions);
-			$row["partition_values"] = array_values($partitions);
 		}
 	}
 }

adminer/db.inc.php

@@ -61,7 +61,7 @@ if ($adminer->homepage()) {
 				echo " <input type='submit' name='search' value='" . lang('Search') . "'>\n";
 				echo "</div></fieldset>\n";
 				if ($_POST["search"] && $_POST["query"] != "") {
-					$_GET["where"][0]["op"] = "LIKE %%";
+					$_GET["where"][0]["op"] = $driver->convertOperator("LIKE %%");
 					search_tables();
 				}
 			}

adminer/drivers/mongo.inc.php

@@ -463,6 +463,8 @@ if (isset($_GET["mongo"])) {
 									"insert" => 1,
 									"select" => 1,
 									"update" => 1,
+									"where" => 1,
+									"order" => 1,
 								),
 							);
 						}

adminer/drivers/mssql.inc.php

@@ -387,7 +387,7 @@ WHERE o.schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND o.type IN ('S', 'U',
 				"null" => $row["is_nullable"],
 				"auto_increment" => $row["is_identity"],
 				"collation" => $row["collation_name"],
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
 				"primary" => $row["is_identity"], //! or indexes.is_primary_key
 				"comment" => $comments[$row["name"]],
 			);
@@ -630,6 +630,17 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
 		return array();
 	}
 
+	/**
+	 * @return bool
+	 */
+	function is_strict_mode() {
+		return false;
+	}
+
+	function is_c_style_escapes() {
+		return true;
+	}
+
 	function show_status() {
 		return array();
 	}

adminer/drivers/mysql.inc.php

@@ -16,10 +16,17 @@ if (!defined("DRIVER")) {
 				global $adminer;
 				mysqli_report(MYSQLI_REPORT_OFF); // stays between requests, not required since PHP 5.3.4
 				list($host, $port) = explode(":", $server, 2); // part after : is used for port or socket
+
 				$ssl = $adminer->connectSsl();
-				if ($ssl) {
+				if (isset($ssl['key']) || isset($ssl['cert']) || isset($ssl['ca'])) {
-					$this->ssl_set($ssl['key'], $ssl['cert'], $ssl['ca'], '', '');
+					$this->ssl_set(
+						isset($ssl['key']) ? $ssl['key'] : null,
+						isset($ssl['cert']) ? $ssl['cert'] : null,
+						isset($ssl['ca']) ? $ssl['ca'] : null,
+						null, null
+					);
 				}
+
 				$return = @$this->real_connect(
 					($server != "" ? $host : ini_get("mysqli.default_host")),
 					($server . $username != "" ? $username : ini_get("mysqli.default_user")),
@@ -50,7 +57,7 @@ if (!defined("DRIVER")) {
 				$row = $result->fetch_array();
 				return $row[$field];
 			}
-			
+
 			function quote($string) {
 				return "'" . $this->escape_string($string) . "'";
 			}
@@ -234,25 +241,23 @@ if (!defined("DRIVER")) {
 
 			function connect($server, $username, $password) {
 				global $adminer;
-				$options = array(PDO::MYSQL_ATTR_LOCAL_INFILE => false);
+
+				$dsn = "mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\d)~', ';port=\1', $server));
+
+				$options = [PDO::MYSQL_ATTR_LOCAL_INFILE => false];
 				$ssl = $adminer->connectSsl();
-				if ($ssl) {
+				if (isset($ssl['key'])) {
-					if (!empty($ssl['key'])) {
+					$options[PDO::MYSQL_ATTR_SSL_KEY] = $ssl['key'];
-						$options[PDO::MYSQL_ATTR_SSL_KEY] = $ssl['key'];
-					}
-					if (!empty($ssl['cert'])) {
-						$options[PDO::MYSQL_ATTR_SSL_CERT] = $ssl['cert'];
-					}
-					if (!empty($ssl['ca'])) {
-						$options[PDO::MYSQL_ATTR_SSL_CA] = $ssl['ca'];
-					}
 				}
-				$this->dsn(
+				if (isset($ssl['cert'])) {
-					"mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\d)~', ';port=\1', $server)),
+					$options[PDO::MYSQL_ATTR_SSL_CERT] = $ssl['cert'];
-					$username,
+				}
-					$password,
+				if (isset($ssl['ca'])) {
-					$options
+					$options[PDO::MYSQL_ATTR_SSL_CA] = $ssl['ca'];
-				);
+				}
+
+				$this->dsn($dsn, $username, $password, $options);
+
 				return true;
 			}
 
@@ -305,7 +310,7 @@ if (!defined("DRIVER")) {
 			}
 			return queries($prefix . implode(",\n", $values) . $suffix);
 		}
-		
+
 		function slowQuery($query, $timeout) {
 			if (min_version('5.7.8', '10.1.2')) {
 				if (preg_match('~MariaDB~', $this->_conn->server_info)) {
@@ -316,13 +321,13 @@ if (!defined("DRIVER")) {
 			}
 		}
 
-		function convertSearch($idf, $val, $field) {
+		function convertSearch($idf, array $where, array $field) {
-			return (preg_match('~char|text|enum|set~', $field["type"]) && !preg_match("~^utf8~", $field["collation"]) && preg_match('~[\x80-\xFF]~', $val['val'])
+			return (preg_match('~char|text|enum|set~', $field["type"]) && !preg_match("~^utf8~", $field["collation"]) && preg_match('~[\x80-\xFF]~', $where['val'])
 				? "CONVERT($idf USING " . charset($this->_conn) . ")"
 				: $idf
 			);
 		}
-		
+
 		function warnings() {
 			$result = $this->_conn->query("SHOW WARNINGS");
 			if ($result && $result->num_rows) {
@@ -551,7 +556,7 @@ if (!defined("DRIVER")) {
 				"auto_increment" => ($row["Extra"] == "auto_increment"),
 				"on_update" => (preg_match('~^on update (.+)~i', $row["Extra"], $match) ? $match[1] : ""), //! available since MySQL 5.1.23
 				"collation" => $row["Collation"],
-				"privileges" => array_flip(preg_split('~, *~', $row["Privileges"])),
+				"privileges" => array_flip(preg_split('~, *~', $row["Privileges"])) + ["where" => 1, "order" => 1],
 				"comment" => $row["Comment"],
 				"primary" => ($row["Key"] == "PRI"),
 				// https://mariadb.com/kb/en/library/show-columns/, https://github.com/vrana/adminer/pull/359#pullrequestreview-276677186
@@ -1056,6 +1061,29 @@ if (!defined("DRIVER")) {
 		return get_key_vals("SHOW VARIABLES");
 	}
 
+	/**
+	 * @return bool
+	 */
+	function is_strict_mode() {
+		static $strictMode = null;
+
+		if ($strictMode === null) {
+			$strictMode = (bool)preg_match('~STRICT_(TRANS|ALL)_TABLES~', get_key_vals("SHOW VARIABLES LIKE 'sql_mode'")["sql_mode"]);
+		}
+
+		return $strictMode;
+	}
+
+	function is_c_style_escapes() {
+		static $c_style = null;
+
+		if ($c_style === null) {
+			$c_style = strpos(get_key_vals("SHOW VARIABLES LIKE 'sql_mode'")["sql_mode"], 'NO_BACKSLASH_ESCAPES') === false;
+		}
+
+		return $c_style;
+	}
+
 	/** Get process list
 	* @return array ($row)
 	*/
@@ -1160,7 +1188,7 @@ if (!defined("DRIVER")) {
 			'structured_types' => $structured_types,
 			'unsigned' => array("unsigned", "zerofill", "unsigned zerofill"), ///< @var array number variants
 			'operators' => array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "FIND_IN_SET", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL"), ///< @var array operators used in select
-			'functions' => array("char_length", "date", "from_unixtime", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper"), ///< @var array functions used in select
+			'functions' => array("char_length", "date", "from_unixtime", "unix_timestamp", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper"), ///< @var array functions used in select
 			'grouping' => array("avg", "count", "count distinct", "group_concat", "max", "min", "sum"), ///< @var array grouping functions used in select
 			'edit_functions' => array( ///< @var array of array("$type|$type2" => "$function/$function2") functions used in editing, [0] - edit and insert, [1] - edit only
 				array(

adminer/drivers/oracle.inc.php

@@ -167,7 +167,14 @@ if (isset($_GET["oracle"])) {
 		}
 	}
 
-
+	/**
+	 * @param string $hostPath
+	 * @return bool
+	 */
+	function is_server_host_valid($hostPath) {
+		// EasyConnect host+path format: host[/[service_name][:server_type][/instance_name]]
+		return (bool)preg_match('~^[^/]+(/([^/:]+)?(:[^/:]+)?(/[^/:]+)?)?$~', $hostPath);
+	}
 
 	function idf_escape($idf) {
 		return '"' . str_replace('"', '""', $idf) . '"';
@@ -297,7 +304,7 @@ ORDER BY 1"
 				"null" => ($row["NULLABLE"] == "Y"),
 				//! "auto_increment" => false,
 				//! "collation" => $row["CHARACTER_SET_NAME"],
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
 				//! "comment" => $row["Comment"],
 				//! "primary" => ($row["Key"] == "PRI"),
 			);
@@ -479,6 +486,17 @@ AND c_src.TABLE_NAME = " . q($table);
 		return get_key_vals('SELECT name, display_value FROM v$parameter');
 	}
 
+	/**
+	 * @return bool
+	 */
+	function is_strict_mode() {
+		return false;
+	}
+
+	function is_c_style_escapes() {
+		return true;
+	}
+
 	function process_list() {
 		return get_rows('SELECT sess.process AS "process", sess.username AS "user", sess.schemaname AS "schema", sess.status AS "status", sess.wait_class AS "wait_class", sess.seconds_in_wait AS "seconds_in_wait", sql.sql_text AS "sql_text", sess.machine AS "machine", sess.port AS "port"
 FROM v$session sess LEFT OUTER JOIN v$sql sql

adminer/drivers/pgsql.inc.php

@@ -19,7 +19,14 @@ if (isset($_GET["pgsql"])) {
 				global $adminer;
 				$db = $adminer->database();
 				set_error_handler(array($this, '_error'));
+
 				$this->_string = "host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' user='" . addcslashes($username, "'\\") . "' password='" . addcslashes($password, "'\\") . "'";
+
+				$ssl = $adminer->connectSsl();
+				if (isset($ssl["mode"])) {
+					$this->_string .= " sslmode='" . $ssl["mode"] . "'";
+				}
+
 				$this->_link = @pg_connect("$this->_string dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'", PGSQL_CONNECT_FORCE_NEW);
 				if (!$this->_link && $db != "") {
 					// try to connect directly with database for performance
@@ -36,7 +43,7 @@ if (isset($_GET["pgsql"])) {
 			}
 
 			function quote($string) {
-				return "'" . pg_escape_string($this->_link, $string) . "'";
+				return pg_escape_literal($this->_link, $string);
 			}
 
 			function value($val, $field) {
@@ -148,9 +155,19 @@ if (isset($_GET["pgsql"])) {
 
 			function connect($server, $username, $password) {
 				global $adminer;
+
 				$db = $adminer->database();
-				$this->dsn("pgsql:host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' client_encoding=utf8 dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'", $username, $password); //! client_encoding is supported since 9.1 but we can't yet use min_version here
+
-				//! connect without DB in case of an error
+				//! client_encoding is supported since 9.1, but we can't yet use min_version here
+				$dsn = "pgsql:host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' client_encoding=utf8 dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'";
+
+				$ssl = $adminer->connectSsl();
+				if (isset($ssl["mode"])) {
+					$dsn .= " sslmode='" . $ssl["mode"] . "'";
+				}
+
+				$this->dsn($dsn, $username, $password);
+
 				return true;
 			}
 
@@ -212,13 +229,13 @@ if (isset($_GET["pgsql"])) {
 			return $query;
 		}
 
-		function convertSearch($idf, $val, $field) {
+		function convertSearch($idf, array $where, array $field) {
-			return (preg_match('~char|text'
+			$textTypes = "char|text";
-					. (!preg_match('~LIKE~', $val["op"]) ? '|date|time(stamp)?|boolean|uuid|' . number_type() : '')
+			if (strpos($where["op"], "LIKE") === false) {
-					. '~', $field["type"])
+				$textTypes .= "|date|time(stamp)?|boolean|uuid|inet|cidr|macaddr|" . number_type();
-				? $idf
+			}
-				: "CAST($idf AS text)"
+
-			);
+			return (preg_match("~$textTypes~", $field["type"]) ? $idf : "CAST($idf AS text)");
 		}
 
 		function quoteBinary($s) {
@@ -274,7 +291,9 @@ if (isset($_GET["pgsql"])) {
 	}
 
 	function get_databases() {
-		return get_vals("SELECT datname FROM pg_database WHERE has_database_privilege(datname, 'CONNECT') ORDER BY datname");
+		return get_vals("SELECT d.datname FROM pg_database d JOIN pg_roles r ON d.datdba = r.oid
+                 WHERE d.datallowconn = TRUE AND has_database_privilege(d.datname, 'CONNECT') AND pg_has_role(r.rolname, 'USAGE')
+                 ORDER BY d.datname");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -322,7 +341,7 @@ ORDER BY 1";
 
 	function table_status($name = "") {
 		$return = array();
-		foreach (get_rows("SELECT c.relname AS \"Name\", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\", pg_relation_size(c.oid) AS \"Data_length\", pg_total_relation_size(c.oid) - pg_relation_size(c.oid) AS \"Index_length\", obj_description(c.oid, 'pg_class') AS \"Comment\", " . (min_version(12) ? "''" : "CASE WHEN c.relhasoids THEN 'oid' ELSE '' END") . " AS \"Oid\", c.reltuples as \"Rows\", n.nspname
+		foreach (get_rows("SELECT c.relname AS \"Name\", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\", pg_table_size(c.oid) AS \"Data_length\", pg_indexes_size(c.oid) AS \"Index_length\", obj_description(c.oid, 'pg_class') AS \"Comment\", " . (min_version(12) ? "''" : "CASE WHEN c.relhasoids THEN 'oid' ELSE '' END") . " AS \"Oid\", c.reltuples as \"Rows\", n.nspname
 FROM pg_class c
 JOIN pg_namespace n ON(n.nspname = current_schema() AND n.oid = c.relnamespace)
 WHERE relkind IN ('r', 'm', 'v', 'f', 'p')
@@ -376,7 +395,7 @@ ORDER BY a.attnum"
 			}
 			$row["null"] = !$row["attnotnull"];
 			$row["auto_increment"] = $row['attidentity'] || preg_match('~^nextval\(~i', $row["default"]);
-			$row["privileges"] = array("insert" => 1, "select" => 1, "update" => 1);
+			$row["privileges"] = array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1);
 			if (preg_match('~(.+)::[^,)]+(.*)~', $row["default"], $match)) {
 				$row["default"] = ($match[1] == "NULL" ? null : idf_unescape($match[1]) . $match[2]);
 			}
@@ -773,7 +792,7 @@ AND typelem = 0"
 		$return = "CREATE TABLE " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " (\n    ";
 
 		// fields' definitions
-		foreach ($fields as $field_name => $field) {
+		foreach ($fields as $field) {
 			$part = idf_escape($field['field']) . ' ' . $field['full_type']
 				. default_value($field)
 				. ($field['attnotnull'] ? " NOT NULL" : "");
@@ -782,10 +801,11 @@ AND typelem = 0"
 			// sequences for fields
 			if (preg_match('~nextval\(\'([^\']+)\'\)~', $field['default'], $matches)) {
 				$sequence_name = $matches[1];
-				$sq = reset(get_rows(min_version(10)
+				$rows = get_rows(min_version(10)
-					? "SELECT *, cache_size AS cache_value FROM pg_sequences WHERE schemaname = current_schema() AND sequencename = " . q($sequence_name)
+					? "SELECT *, cache_size AS cache_value FROM pg_sequences WHERE schemaname = current_schema() AND sequencename = " . q(idf_unescape($sequence_name))
 					: "SELECT * FROM $sequence_name"
-				));
+				);
+				$sq = reset($rows);
 				$sequences[] = ($style == "DROP+CREATE" ? "DROP SEQUENCE IF EXISTS $sequence_name;\n" : "")
 					. "CREATE SEQUENCE $sequence_name INCREMENT $sq[increment_by] MINVALUE $sq[min_value] MAXVALUE $sq[max_value]" . ($auto_increment && $sq['last_value'] ? " START $sq[last_value]" : "") . " CACHE $sq[cache_value];";
 			}
@@ -858,6 +878,23 @@ AND typelem = 0"
 		return get_key_vals("SHOW ALL");
 	}
 
+	/**
+	 * @return bool
+	 */
+	function is_strict_mode() {
+		return false;
+	}
+
+	function is_c_style_escapes() {
+		static $c_style = null;
+
+		if ($c_style === null) {
+			$c_style = get_vals("SHOW standard_conforming_strings")[0] == "off";
+		}
+
+		return $c_style;
+	}
+
 	function process_list() {
 		return get_rows("SELECT * FROM pg_stat_activity ORDER BY " . (min_version(9.2) ? "pid" : "procpid"));
 	}
@@ -897,7 +934,7 @@ AND typelem = 0"
 			lang('Date and time') => array("date" => 13, "time" => 17, "timestamp" => 20, "timestamptz" => 21, "interval" => 0),
 			lang('Strings') => array("character" => 0, "character varying" => 0, "text" => 0, "tsquery" => 0, "tsvector" => 0, "uuid" => 0, "xml" => 0),
 			lang('Binary') => array("bit" => 0, "bit varying" => 0, "bytea" => 0),
-			lang('Network') => array("cidr" => 43, "inet" => 43, "macaddr" => 17, "txid_snapshot" => 0),
+			lang('Network') => array("cidr" => 43, "inet" => 43, "macaddr" => 17, "macaddr8" => 23, "txid_snapshot" => 0),
 			lang('Geometry') => array("box" => 0, "circle" => 0, "line" => 0, "lseg" => 0, "path" => 0, "point" => 0, "polygon" => 0),
 		) as $key => $val) { //! can be retrieved from pg_type
 			$types += $val;
@@ -922,6 +959,7 @@ AND typelem = 0"
 					"char|text" => "||",
 				)
 			),
+			'c_style_escapes' => true,
 		);
 	}
 }

adminer/drivers/sqlite.inc.php

@@ -321,7 +321,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 				"full_type" => $type,
 				"default" => (preg_match("~'(.*)'~", $default, $match) ? str_replace("''", "'", $match[1]) : ($default == "NULL" ? null : $default)),
 				"null" => !$row["notnull"],
-				"privileges" => array("select" => 1, "insert" => 1, "update" => 1),
+				"privileges" => array("select" => 1, "insert" => 1, "update" => 1, "where" => 1, "order" => 1),
 				"primary" => $row["pk"],
 			);
 			if ($row["pk"]) {
@@ -764,6 +764,17 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return $return;
 	}
 
+	/**
+	 * @return bool
+	 */
+	function is_strict_mode() {
+		return false;
+	}
+
+	function is_c_style_escapes() {
+		return true;
+	}
+
 	function show_status() {
 		$return = array();
 		foreach (get_vals("PRAGMA compile_options") as $option) {

adminer/dump.inc.php

@@ -147,16 +147,14 @@ if ($jush == "sql") { //! use insertUpdate() in all drivers
 }
 parse_str($_COOKIE["adminer_export"], $row);
 if (!$row) {
-	$row = array("output" => "text", "format" => "sql", "db_style" => (DB != "" ? "" : "CREATE"), "table_style" => "DROP+CREATE", "data_style" => "INSERT");
+	$row = array("output" => "file", "format" => "sql", "db_style" => (DB != "" ? "" : "CREATE"), "table_style" => "DROP+CREATE", "data_style" => "INSERT");
 }
 if (!isset($row["events"])) { // backwards compatibility
 	$row["routines"] = $row["events"] = ($_GET["dump"] == "");
 	$row["triggers"] = $row["table_style"];
 }
 
-echo "<tr><th>" . lang('Output') . "<td>" . html_select("output", $adminer->dumpOutput(), $row["output"], 0) . "\n"; // 0 - radio
+echo "<tr><th>" . lang('Format') . "<td>" . html_select("format", $adminer->dumpFormat(), $row["format"], false) . "\n"; // false = radio
-
-echo "<tr><th>" . lang('Format') . "<td>" . html_select("format", $adminer->dumpFormat(), $row["format"], 0) . "\n"; // 0 - radio
 
 echo ($jush == "sqlite" ? "" : "<tr><th>" . lang('Database') . "<td>" . html_select('db_style', $db_style, $row["db_style"])
 	. (support("routine") ? checkbox("routines", 1, $row["routines"], lang('Routines')) : "")
@@ -169,6 +167,9 @@ echo "<tr><th>" . lang('Tables') . "<td>" . html_select('table_style', $table_st
 ;
 
 echo "<tr><th>" . lang('Data') . "<td>" . html_select('data_style', $data_style, $row["data_style"]);
+
+echo "<tr><th>" . lang('Output') . "<td>" . html_select("output", $adminer->dumpOutput(), $row["output"], false) . "\n"; // false = radio
+
 ?>
 </table>
 <p><input type="submit" value="<?php echo lang('Export'); ?>">

adminer/elastic.php

@@ -0,0 +1,13 @@
+<?php
+function adminer_object() {
+	include_once "../plugins/plugin.php";
+	include_once "../plugins/login-password-less.php";
+	include_once "../plugins/drivers/elastic.php";
+	include_once "../plugins/drivers/elastic5.php";
+	return new AdminerPlugin([
+		// TODO: inline the result of password_hash() so that the password is not visible in source codes
+		new AdminerLoginPasswordLess(password_hash("YOUR_PASSWORD_HERE", PASSWORD_DEFAULT)),
+	]);
+}
+
+include "./index.php";

adminer/file.inc.php

@@ -6,13 +6,13 @@ if ($_GET["file"] == "favicon.ico") {
 	echo lzw_decompress(compile_file('../adminer/static/favicon.ico', 'lzw_compress'));
 } elseif ($_GET["file"] == "default.css") {
 	header("Content-Type: text/css; charset=utf-8");
-	echo lzw_decompress(compile_file('../adminer/static/default.css;../externals/jush/jush.css', 'minify_css'));
+	echo lzw_decompress(compile_file('../adminer/static/default.css;../vendor/vrana/jush/jush.css', 'minify_css'));
 } elseif ($_GET["file"] == "functions.js") {
 	header("Content-Type: text/javascript; charset=utf-8");
 	echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js', 'minify_js'));
 } elseif ($_GET["file"] == "jush.js") {
 	header("Content-Type: text/javascript; charset=utf-8");
-	echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.js;../externals/jush/modules/jush-js.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
+	echo lzw_decompress(compile_file('../vendor/vrana/jush/modules/jush.js;../vendor/vrana/jush/modules/jush-textarea.js;../vendor/vrana/jush/modules/jush-txt.js;../vendor/vrana/jush/modules/jush-js.js;../vendor/vrana/jush/modules/jush-sql.js;../vendor/vrana/jush/modules/jush-pgsql.js;../vendor/vrana/jush/modules/jush-sqlite.js;../vendor/vrana/jush/modules/jush-mssql.js;../vendor/vrana/jush/modules/jush-oracle.js;../vendor/vrana/jush/modules/jush-simpledb.js', 'minify_js'));
 } else {
 	header("Content-Type: image/gif");
 	switch ($_GET["file"]) {

adminer/include/adminer.inc.php

@@ -39,7 +39,7 @@ class Adminer {
 	function bruteForceKey() {
 		return $_SERVER["REMOTE_ADDR"];
 	}
-	
+
 	/** Get server name displayed in breadcrumbs
 	* @param string
 	* @return string HTML code or null
@@ -96,7 +96,7 @@ class Adminer {
 	*/
 	function head() {
 		?>
-<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">
+<link rel="stylesheet" type="text/css" href="../vendor/vrana/jush/jush.css">
 <?php
 		return true;
 	}
@@ -128,7 +128,7 @@ class Adminer {
 		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
 		echo checkbox("auth[permanent]", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
 	}
-	
+
 	/** Get login form field
 	* @param string
 	* @param string HTML
@@ -231,17 +231,25 @@ class Adminer {
 	*/
 	function selectQuery($query, $start, $failed = false) {
 		global $jush, $driver;
-		$return = "</p>\n"; // required for IE9 inline edit
+
+        $supportSql = support("sql");
+
+		$result = "<p>"
+            . "<code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> "
+            . "<span class='time'>(" . format_time($start) . ")</span>"
+			. ($supportSql ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "");
+
 		if (!$failed && ($warnings = $driver->warnings())) {
 			$id = "warnings";
-			$return = ", <a href='#$id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "")
+			$result = ($supportSql ? "," : "")
-				. "$return<div id='$id' class='hidden'>\n$warnings</div>\n"
+                . " <a href='#$id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "")
-			;
+                . "</p>\n"
+                . "<div id='$id' class='hidden'>\n$warnings</div>\n";
+		} else {
+			$result .= "</p>\n";
 		}
-		return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>(" . format_time($start) . ")</span>"
+
-			. (support("sql") ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
+        return $result;
-			. $return
-		;
 	}
 
 	/** Query printed in SQL command before execution
@@ -293,7 +301,7 @@ class Adminer {
 		if (preg_match('~json~', $field["type"])) {
 			$return = "<code class='jush-js'>$return</code>";
 		}
-		return ($link ? "<a href='" . h($link) . "'" . (is_url($link) ? target_blank() : "") . ">$return</a>" : $return);
+		return ($link ? "<a href='" . h($link) . "'" . (is_web_url($link) ? target_blank() : "") . ">$return</a>" : $return);
 	}
 
 	/** Value conversion used in select and edit
@@ -480,7 +488,7 @@ class Adminer {
 		echo "</script>\n";
 		echo "</div></fieldset>\n";
 	}
-	
+
 	/** Print command box in select
 	* @return bool whether to print default commands
 	*/
@@ -529,49 +537,60 @@ class Adminer {
 	* @return array expressions to join by AND
 	*/
 	function selectSearchProcess($fields, $indexes) {
-		global $connection, $driver;
+		global $driver;
-		$return = array();
+
+		$return = [];
+
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT" && $_GET["fulltext"][$i] != "") {
 				$return[] = "MATCH (" . implode(", ", array_map('idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
 			}
 		}
-		foreach ((array) $_GET["where"] as $key => $val) {
+
-			if ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators)) {
+		foreach ((array) $_GET["where"] as $where) {
+			$col = $where["col"];
+			$op = $where["op"];
+			$val = $where["val"];
+
+			if ("$col$val" != "" && in_array($op, $this->operators)) {
 				$prefix = "";
-				$cond = " $val[op]";
+				$cond = " $op";
-				if (preg_match('~IN$~', $val["op"])) {
+
-					$in = process_length($val["val"]);
+				if (preg_match('~IN$~', $op)) {
+					$in = process_length($val);
 					$cond .= " " . ($in != "" ? $in : "(NULL)");
-				} elseif ($val["op"] == "SQL") {
+				} elseif ($op == "SQL") {
-					$cond = " $val[val]"; // SQL injection
+					$cond = " $val"; // SQL injection
-				} elseif ($val["op"] == "LIKE %%") {
+				} elseif ($op == "LIKE %%") {
-					$cond = " LIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
+					$cond = " LIKE " . $this->processInput($fields[$col], "%$val%");
-				} elseif ($val["op"] == "ILIKE %%") {
+				} elseif ($op == "ILIKE %%") {
-					$cond = " ILIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
+					$cond = " ILIKE " . $this->processInput($fields[$col], "%$val%");
-				} elseif ($val["op"] == "FIND_IN_SET") {
+				} elseif ($op == "FIND_IN_SET") {
-					$prefix = "$val[op](" . q($val["val"]) . ", ";
+					$prefix = "$op(" . q($val) . ", ";
 					$cond = ")";
-				} elseif (!preg_match('~NULL$~', $val["op"])) {
+				} elseif (!preg_match('~NULL$~', $op)) {
-					$cond .= " " . $this->processInput($fields[$val["col"]], $val["val"]);
+					$cond .= " " . $this->processInput($fields[$col], $val);
 				}
-				if ($val["col"] != "") {
+
-					$return[] = $prefix . $driver->convertSearch(idf_escape($val["col"]), $val, $fields[$val["col"]]) . $cond;
+				if ($col != "") {
+					$return[] = $prefix . $driver->convertSearch(idf_escape($col), $where, $fields[$col]) . $cond;
 				} else {
 					// find anywhere
 					$cols = array();
 					foreach ($fields as $name => $field) {
-						if ((preg_match('~^[-\d.' . (preg_match('~IN$~', $val["op"]) ? ',' : '') . ']+$~', $val["val"]) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
+						if (isset($field["privileges"]["where"])
-							&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || preg_match('~char|text|enum|set~', $field["type"]))
+                            && (preg_match('~^[-\d.' . (preg_match('~IN$~', $op) ? ',' : '') . ']+$~', $val) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
-							&& (!preg_match('~date|timestamp~', $field["type"]) || preg_match('~^\d+-\d+-\d+~', $val["val"]))
+							&& (!preg_match("~[\x80-\xFF]~", $val) || preg_match('~char|text|enum|set~', $field["type"]))
+							&& (!preg_match('~date|timestamp~', $field["type"]) || preg_match('~^\d+-\d+-\d+~', $val))
 						) {
-							$cols[] = $prefix . $driver->convertSearch(idf_escape($name), $val, $field) . $cond;
+							$cols[] = $prefix . $driver->convertSearch(idf_escape($name), $where, $field) . $cond;
 						}
 					}
 					$return[] = ($cols ? "(" . implode(" OR ", $cols) . ")" : "1 = 0");
 				}
 			}
 		}
+
 		return $return;
 	}
 
@@ -754,10 +773,11 @@ class Adminer {
 	* @return array
 	*/
 	function dumpOutput() {
-		$return = array('text' => lang('open'), 'file' => lang('save'));
+		$return = array('file' => lang('save'), 'text' => lang('open'));
 		if (function_exists('gzencode')) {
 			$return['gz'] = 'gzip';
 		}
+
 		return $return;
 	}
 
@@ -831,6 +851,7 @@ class Adminer {
 				$insert = "";
 				$buffer = "";
 				$keys = array();
+				$generatedKeys = array();
 				$suffix = "";
 				$fetch_function = ($table != '' ? 'fetch_assoc' : 'fetch_row');
 				while ($row = $result->$fetch_function()) {
@@ -838,6 +859,10 @@ class Adminer {
 						$values = array();
 						foreach ($row as $val) {
 							$field = $result->fetch_field();
+							if (!empty($fields[$field->name]['generated'])) {
+								$generatedKeys[$field->name] = true;
+								continue;
+                            }
 							$keys[] = $field->name;
 							$key = idf_escape($field->name);
 							$values[] = "$key = VALUES($key)";
@@ -855,6 +880,10 @@ class Adminer {
 							$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', $keys)) . ") VALUES";
 						}
 						foreach ($row as $key => $val) {
+							if (isset($generatedKeys[$key])) {
+								unset($row[$key]);
+								continue;
+                            }
 							$field = $fields[$key];
 							$row[$key] = ($val !== null
 								? unconvert_field($field, preg_match(number_type(), $field["type"]) && !preg_match('~\[~', $field["full_type"]) && is_numeric($val) ? $val : q(($val === false ? 0 : $val)))
@@ -934,8 +963,11 @@ class Adminer {
 		global $VERSION, $jush, $drivers, $connection;
 		?>
 <h1>
-<?php echo $this->name(); ?> <span class="version"><?php echo $VERSION; ?></span>
+    <?php echo $this->name(); ?>
-<a href="https://www.adminer.org/#download"<?php echo target_blank(); ?> id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
+    <?php if ($missing != "auth"): ?>
+    <span class="version"><?php echo $VERSION; ?></span>
+    <a href="https://www.adminer.org/#download"<?php echo target_blank(); ?> id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
+    <?php endif; ?>
 </h1>
 <?php
 		if ($missing == "auth") {
@@ -961,12 +993,12 @@ class Adminer {
 				$connection->select_db(DB);
 				$tables = table_status('', true);
 			}
-			echo script_src("../externals/jush/modules/jush.js");
+			echo script_src("../vendor/vrana/jush/modules/jush.js");
-			echo script_src("../externals/jush/modules/jush-textarea.js");
+			echo script_src("../vendor/vrana/jush/modules/jush-textarea.js");
-			echo script_src("../externals/jush/modules/jush-txt.js");
+			echo script_src("../vendor/vrana/jush/modules/jush-txt.js");
-			echo script_src("../externals/jush/modules/jush-js.js");
+			echo script_src("../vendor/vrana/jush/modules/jush-js.js");
 			if (support("sql")) {
-				echo script_src("../externals/jush/modules/jush-$jush.js");
+				echo script_src("../vendor/vrana/jush/modules/jush-$jush.js");
 				?>
 <script<?php echo nonce(); ?>>
 <?php

adminer/include/auth.inc.php

@@ -15,6 +15,71 @@ if ($_COOKIE["adminer_permanent"]) {
 	}
 }
 
+function validate_server_input() {
+	if (SERVER == "") {
+		return;
+	}
+
+	$parts = parse_url(SERVER);
+	if (!$parts) {
+		auth_error(lang('Invalid server or credentials.'));
+	}
+
+	// Check proper URL parts.
+	if (isset($parts['user']) || isset($parts['pass']) || isset($parts['query']) || isset($parts['fragment'])) {
+		auth_error(lang('Invalid server or credentials.'));
+	}
+
+	// Allow only HTTP/S scheme.
+	if (isset($parts['scheme']) && !preg_match('~^(https?)$~i', $parts['scheme'])) {
+		auth_error(lang('Invalid server or credentials.'));
+	}
+
+	// Note that "localhost" and IP address without a scheme is parsed as a path.
+	$hostPath = (isset($parts['host']) ? $parts['host'] : '') . (isset($parts['path']) ? $parts['path'] : '');
+
+	// Validate host.
+	if (!is_server_host_valid($hostPath)) {
+		auth_error(lang('Invalid server or credentials.'));
+	}
+
+	// Check privileged ports.
+	if (isset($parts['port']) && ($parts['port'] < 1024 || $parts['port'] > 65535)) {
+		auth_error(lang('Connecting to privileged ports is not allowed.'));
+	}
+}
+
+if (!function_exists('is_server_host_valid')) {
+	/**
+	 * @param string $hostPath
+	 * @return bool
+	 */
+	function is_server_host_valid($hostPath)
+	{
+		return strpos($hostPath, '/') === false;
+	}
+}
+
+/**
+ * @param string $server
+ * @param string $username
+ * @param string $password
+ * @param string $defaultServer
+ * @param int|null $defaultPort
+ * @return string
+ */
+function build_http_url($server, $username, $password, $defaultServer, $defaultPort = null) {
+	if (!preg_match('~^(https?://)?([^:]*)(:\d+)?$~', rtrim($server, '/'), $matches)) {
+		$this->error = lang('Invalid server or credentials.');
+		return false;
+	}
+
+	return ($matches[1] ?: "http://") .
+		($username !== "" || $password !== "" ? "$username:$password@" : "") .
+		($matches[2] !== "" ? $matches[2] : $defaultServer) .
+		(isset($matches[3]) ? $matches[3] : ($defaultPort ? ":$defaultPort" : ""));
+}
+
 function add_invalid_login() {
 	global $adminer;
 	$fp = file_open_lock(get_temp_dir() . "/adminer.invalid");
@@ -52,7 +117,7 @@ $auth = $_POST["auth"];
 if ($auth) {
 	session_regenerate_id(); // defense against session fixation
 	$vendor = $auth["driver"];
-	$server = $auth["server"];
+	$server = trim($auth["server"]);
 	$username = $auth["username"];
 	$password = (string) $auth["password"];
 	$db = $auth["db"];
@@ -72,14 +137,14 @@ if ($auth) {
 	) {
 		redirect(auth_url($vendor, $server, $username, $db));
 	}
-	
+
 } elseif ($_POST["logout"] && (!$has_token || verify_token())) {
 	foreach (array("pwds", "db", "dbs", "queries") as $key) {
 		set_session($key, null);
 	}
 	unset_permanent();
 	redirect(substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1), lang('Logout successful.') . ' ' . lang('Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.'));
-	
+
 } elseif ($permanent && !$_SESSION["pwds"]) {
 	session_regenerate_id();
 	$private = $adminer->permanentLogin();
@@ -155,18 +220,16 @@ if (isset($_GET["username"]) && !class_exists("Min_DB")) {
 stop_session(true);
 
 if (isset($_GET["username"]) && is_string(get_password())) {
-	list($host, $port) = explode(":", SERVER, 2);
+	validate_server_input();
-	if (preg_match('~^\s*([-+]?\d+)~', $port, $match) && ($match[1] < 1024 || $match[1] > 65535)) { // is_numeric('80#') would still connect to port 80
-		auth_error(lang('Connecting to privileged ports is not allowed.'));
-	}
 	check_invalid_login();
+
 	$connection = connect();
 	$driver = new Min_Driver($connection);
 }
 
 $login = null;
 if (!is_object($connection) || ($login = $adminer->login($_GET["username"], get_password())) !== true) {
-	$error = (is_string($connection) ? h($connection) : (is_string($login) ? $login : lang('Invalid credentials.')));
+	$error = (is_string($connection) ? h($connection) : (is_string($login) ? $login : lang('Invalid server or credentials.')));
 	auth_error($error . (preg_match('~^ | $~', get_password()) ? '<br>' . lang('There is a space in the input password which might be the cause.') : ''));
 }
 
@@ -199,7 +262,7 @@ if ($_POST) {
 			: lang('Invalid CSRF token. Send the form again.') . ' ' . lang('If you did not send this request from Adminer then close this page.')
 		);
 	}
-	
+
 } elseif ($_SERVER["REQUEST_METHOD"] == "POST") {
 	// posted form with no data means that post_max_size exceeded because Adminer always sends token at least
 	$error = lang('Too big POST data. Reduce the data or increase the %s configuration directive.', "'post_max_size'");

adminer/include/bootstrap.inc.php

@@ -1,11 +1,12 @@
 <?php
 function adminer_errors($errno, $errstr) {
-	return !!preg_match('~^(Trying to access array offset on value of type null|Undefined array key)~', $errstr);
+	return (bool)preg_match('~^(Trying to access array offset on( value of type)? null|Undefined array key)~', $errstr);
 }
 
 error_reporting(6135); // errors and warnings
 set_error_handler('adminer_errors', E_WARNING);
 
+include "../adminer/include/debug.inc.php";
 include "../adminer/include/coverage.inc.php";
 
 // disable filter.default
@@ -81,7 +82,6 @@ include "../adminer/drivers/pgsql.inc.php";
 include "../adminer/drivers/oracle.inc.php";
 include "../adminer/drivers/mssql.inc.php";
 include "../adminer/drivers/mongo.inc.php";
-include "../adminer/drivers/elastic.inc.php";
 include "./include/adminer.inc.php";
 $adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);
 include "../adminer/drivers/mysql.inc.php"; // must be included as last driver

adminer/include/debug.inc.php

@@ -0,0 +1,14 @@
+<?php
+
+function dump($value)
+{
+	echo "<pre>";
+	var_export($value);
+	echo "</pre>\n";
+}
+
+function dumpe($value)
+{
+	dump($value);
+	exit;
+}

adminer/include/driver.inc.php

@@ -11,16 +11,25 @@ function add_driver($id, $name) {
 	$drivers[$id] = $name;
 }
 
+/** Get driver name
+* @param string
+* @return string
+*/
+function get_driver($id) {
+	global $drivers;
+	return $drivers[$id];
+}
+
 /*abstract*/ class Min_SQL {
 	var $_conn;
-	
+
 	/** Create object for performing database operations
 	* @param Min_DB
 	*/
 	function __construct($connection) {
 		$this->_conn = $connection;
 	}
-	
+
 	/** Select data from table
 	* @param string
 	* @param array result of $adminer->selectColumnsProcess()[0]
@@ -52,7 +61,7 @@ function add_driver($id, $name) {
 		}
 		return $return;
 	}
-	
+
 	/** Delete data from table
 	* @param string
 	* @param string " WHERE ..."
@@ -63,7 +72,7 @@ function add_driver($id, $name) {
 		$query = "FROM " . table($table);
 		return queries("DELETE" . ($limit ? limit1($table, $query, $queryWhere) : " $query$queryWhere"));
 	}
-	
+
 	/** Update data in table
 	* @param string
 	* @param array escaped columns in keys, quoted data in values
@@ -80,7 +89,7 @@ function add_driver($id, $name) {
 		$query = table($table) . " SET$separator" . implode(",$separator", $values);
 		return queries("UPDATE" . ($limit ? limit1($table, $query, $queryWhere, $separator) : " $query$queryWhere"));
 	}
-	
+
 	/** Insert data into table
 	* @param string
 	* @param array escaped columns in keys, quoted data in values
@@ -92,7 +101,7 @@ function add_driver($id, $name) {
 			: " DEFAULT VALUES"
 		));
 	}
-	
+
 	/** Insert or update data in table
 	* @param string
 	* @param array
@@ -102,28 +111,28 @@ function add_driver($id, $name) {
 	/*abstract*/ function insertUpdate($table, $rows, $primary) {
 		return false;
 	}
-	
+
 	/** Begin transaction
 	* @return bool
 	*/
 	function begin() {
 		return queries("BEGIN");
 	}
-	
+
 	/** Commit transaction
 	* @return bool
 	*/
 	function commit() {
 		return queries("COMMIT");
 	}
-	
+
 	/** Rollback transaction
 	* @return bool
 	*/
 	function rollback() {
 		return queries("ROLLBACK");
 	}
-	
+
 	/** Return query with a timeout
 	* @param string
 	* @param int seconds
@@ -131,17 +140,25 @@ function add_driver($id, $name) {
 	*/
 	function slowQuery($query, $timeout) {
 	}
-	
+
 	/** Convert column to be searchable
 	* @param string escaped column name
 	* @param array array("op" => , "val" => )
 	* @param array
 	* @return string
 	*/
-	function convertSearch($idf, $val, $field) {
+	function convertSearch($idf, array $where, array $field) {
 		return $idf;
 	}
 
+	/** Convert operator so it can be used in search
+	 * @param string $operator
+	 * @return string
+	 */
+	function convertOperator($operator) {
+		return $operator;
+	}
+
 	/** Convert value returned by database to actual value
 	* @param string
 	* @param array
@@ -161,19 +178,19 @@ function add_driver($id, $name) {
 	function quoteBinary($s) {
 		return q($s);
 	}
-	
+
 	/** Get warnings about the last command
 	* @return string HTML
 	*/
 	function warnings() {
 		return '';
 	}
-	
+
 	/** Get help link for table
 	* @param string
 	* @return string relative URL or null
 	*/
 	function tableHelp($name) {
 	}
-	
+
 }

adminer/include/editing.inc.php

@@ -21,11 +21,11 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 			echo "<table cellspacing='0' class='nowrap'>\n";
 			echo "<thead><tr>";
 			for ($j=0; $j < count($row); $j++) {
-				$field = $result->fetch_field();
+				$field = (array)$result->fetch_field();
-				$name = $field->name;
+				$name = $field["name"];
-				$orgtable = $field->orgtable;
+				$orgtable = $field["orgtable"];
-				$orgname = $field->orgname;
+				$orgname = $field["orgname"];
-				$return[$field->table] = $orgtable;
+				$return[$field["table"]] = $orgtable;
 				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
 					$links[$j] = ($name == "table" ? "table=" : ($name == "possible_keys" ? "indexes=" : null));
 				} elseif ($orgtable != "") {
@@ -46,11 +46,11 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 						$links[$j] = $orgtable;
 					}
 				}
-				if ($field->charsetnr == 63) { // 63 - binary
+				if ($field["charsetnr"] == 63) { // 63 - binary
 					$blobs[$j] = true;
 				}
-				$types[$j] = $field->type;
+				$types[$j] = $field["type"];
-				echo "<th" . ($orgtable != "" || $field->name != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($name)
+				echo "<th" . ($orgtable != "" || $field["name"] != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($name)
 					. ($orgtables ? doc_link(array(
 						'sql' => "explain-output.html#explain_" . strtolower($name),
 						'mariadb' => "explain/#the-columns-in-explain-select",
@@ -72,7 +72,7 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 						$link .= "&where" . urlencode("[" . bracket_escape($col) . "]") . "=" . urlencode($row[$j]);
 					}
 				}
-			} elseif (is_url($val)) {
+			} elseif (is_web_url($val)) {
 				$link = $val;
 			}
 			if ($val === null) {
@@ -86,7 +86,7 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 				}
 			}
 			if ($link) {
-				$val = "<a href='" . h($link) . "'" . (is_url($link) ? target_blank() : '') . ">$val</a>";
+				$val = "<a href='" . h($link) . "'" . (is_web_url($link) ? target_blank() : '') . ">$val</a>";
 			}
 			echo "<td>$val";
 		}
@@ -221,12 +221,17 @@ function process_type($field, $collate = "COLLATE") {
 * @return array array("field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT")
 */
 function process_field($field, $type_field) {
+	// MariaDB exports CURRENT_TIMESTAMP as a function.
+	if ($field["on_update"]) {
+		$field["on_update"] = str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", $field["on_update"]);
+	}
+
 	return array(
 		idf_escape(trim($field["field"])),
 		process_type($type_field),
 		($field["null"] ? " NULL" : " NOT NULL"), // NULL for timestamp
 		default_value($field),
-		(preg_match('~timestamp|datetime~', $field["type"]) && $field["on_update"] ? " ON UPDATE $field[on_update]" : ""),
+		(preg_match('~timestamp|datetime~', $field["type"]) && $field["on_update"] ? " ON UPDATE " . $field["on_update"] : ""),
 		(support("comment") && $field["comment"] != "" ? " COMMENT " . q($field["comment"]) : ""),
 		($field["auto_increment"] ? auto_increment() : null),
 	);
@@ -238,7 +243,18 @@ function process_field($field, $type_field) {
 */
 function default_value($field) {
 	$default = $field["default"];
-	return ($default === null ? "" : " DEFAULT " . (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default) ? q($default) : $default));
+	if ($default === null) return "";
+
+	if (stripos($default, "GENERATED ") === 0) {
+		return " $default";
+	}
+
+	// MariaDB exports CURRENT_TIMESTAMP as a function.
+	$default = str_ireplace("current_timestamp()", "CURRENT_TIMESTAMP", $default);
+
+	$quote = preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default);
+
+	return " DEFAULT " . ($quote ? q($default) : $default);
 }
 
 /** Get type class to use in CSS
@@ -279,11 +295,11 @@ function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = arra
 <td><?php echo lang('Options'); /* no label required, options have their own label */ ?>
 <?php if ($type == "TABLE") { ?>
 <td id="label-null">NULL
-<td><input type="radio" name="auto_increment_col" value=""><acronym id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</acronym><?php echo doc_link(array(
+<td><input type="radio" name="auto_increment_col" value=""><abbr id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</abbr><?php echo doc_link(array(
 	'sql' => "example-auto-increment.html",
 	'mariadb' => "auto_increment/",
 	'sqlite' => "autoinc.html",
-	'pgsql' => "datatype.html#DATATYPE-SERIAL",
+	'pgsql' => "datatype-numeric.html#DATATYPE-SERIAL",
 	'mssql' => "ms186775.aspx",
 )); ?>
 <td id="label-default"<?php echo $default_class; ?>><?php echo lang('Default value'); ?>
@@ -368,25 +384,43 @@ function normalize_enum($match) {
 	return "'" . str_replace("'", "''", addcslashes(stripcslashes(str_replace($match[0][0] . $match[0][0], $match[0][0], substr($match[0], 1, -1))), '\\')) . "'";
 }
 
-/** Issue grant or revoke commands
+/**
-* @param string GRANT or REVOKE
+ * Issue grant or revoke commands.
-* @param array
+ *
-* @param string
+ * @param bool $grant
-* @param string
+ * @param array $privileges
-* @return bool
+ * @param string $columns
-*/
+ * @param string $on
-function grant($grant, $privileges, $columns, $on) {
+ * @param string $user
-	if (!$privileges) {
+ *
-		return true;
+ * @return bool
+ */
+function grant($grant, array $privileges, $columns, $on, $user) {
+	if (!$privileges) return true;
+
+	if ($privileges == ["ALL PRIVILEGES", "GRANT OPTION"]) {
+		if ($grant) {
+			return (bool) queries("GRANT ALL PRIVILEGES ON $on TO $user WITH GRANT OPTION");
+		} else {
+			return queries("REVOKE ALL PRIVILEGES ON $on FROM $user") &&
+				queries("REVOKE GRANT OPTION ON $on FROM $user");
+		}
 	}
-	if ($privileges == array("ALL PRIVILEGES", "GRANT OPTION")) {
+
-		// can't be granted or revoked together
+	if ($privileges == ["GRANT OPTION", "PROXY"]) {
-		return ($grant == "GRANT"
+		if ($grant) {
-			? queries("$grant ALL PRIVILEGES$on WITH GRANT OPTION")
+			return (bool) queries("GRANT PROXY ON $on TO $user WITH GRANT OPTION");
-			: queries("$grant ALL PRIVILEGES$on") && queries("$grant GRANT OPTION$on")
+		} else {
-		);
+			return (bool) queries("REVOKE PROXY ON $on FROM $user");
+		}
 	}
-	return queries("$grant " . preg_replace('~(GRANT OPTION)\([^)]*\)~', '\1', implode("$columns, ", $privileges) . $columns) . $on);
+
+	return (bool) queries(
+		($grant ? "GRANT " : "REVOKE ") .
+		preg_replace('~(GRANT OPTION)\([^)]*\)~', '$1', implode("$columns, ", $privileges) . $columns) .
+		" ON $on " .
+		($grant ? "TO " : "FROM ") . $user
+	);
 }
 
 /** Drop old object and create a new one
@@ -515,9 +549,9 @@ function tar_file($filename, $tmp_file) {
 function ini_bytes($ini) {
 	$val = ini_get($ini);
 	switch (strtolower(substr($val, -1))) {
-		case 'g': $val *= 1024; // no break
+		case 'g': $val = (int)$val * 1024; // no break
-		case 'm': $val *= 1024; // no break
+		case 'm': $val = (int)$val * 1024; // no break
-		case 'k': $val *= 1024;
+		case 'k': $val = (int)$val * 1024;
 	}
 	return $val;
 }

adminer/include/functions.inc.php

@@ -213,7 +213,7 @@ function optionlist($options, $selected = null, $use_keys = false) {
 * @param string
 * @param array
 * @param string
-* @param string true for no onchange, false for radio
+* @param string|bool true for no onchange, false for radio
 * @param string
 * @return string
 */
@@ -477,24 +477,36 @@ function escape_key($key) {
 */
 function where($where, $fields = array()) {
 	global $connection, $jush;
-	$return = array();
+
+	$conditions = [];
+
 	foreach ((array) $where["where"] as $key => $val) {
 		$key = bracket_escape($key, 1); // 1 - back
 		$column = escape_key($key);
-		$return[] = $column
+
-			. ($jush == "sql" && is_numeric($val) && preg_match('~\.~', $val) ? " LIKE " . q($val) // LIKE because of floats but slow with ints
+		if ($jush == "sql" && $fields[$key]["type"] == "json") {
-				: ($jush == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val)) // LIKE because of text
+			$conditions[] = "$column = CAST(" . q($val) . " AS JSON)";
-				: " = " . unconvert_field($fields[$key], q($val))
+		} elseif ($jush == "sql" && is_numeric($val) && strpos($val, ".") !== false) {
-			))
+			// LIKE because of floats but slow with ints.
-		; //! enum and set
+			$conditions[] = "$column LIKE " . q($val);
-		if ($jush == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) { // not just [a-z] to catch non-ASCII characters
+		} elseif ($jush == "mssql") {
-			$return[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin";
+			// LIKE because of text.
+			$conditions[] = "$column LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val));
+		} else {
+			$conditions[] = "$column = " . unconvert_field($fields[$key], q($val));
+		}
+
+		// Not just [a-z] to catch non-ASCII characters.
+		if ($jush == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) {
+			$conditions[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin";
 		}
 	}
+
 	foreach ((array) $where["null"] as $key) {
-		$return[] = escape_key($key) . " IS NULL";
+		$conditions[] = escape_key($key) . " IS NULL";
 	}
-	return implode(" AND ", $return);
+
+	return implode(" AND ", $conditions);
 }
 
 /** Create SQL condition from query string
@@ -914,13 +926,16 @@ function column_foreign_keys($table) {
 */
 function enum_input($type, $attrs, $field, $value, $empty = null) {
 	global $adminer;
+
+	$return = ($empty !== null && !is_strict_mode() ? "<label><input type='$type'$attrs value='$empty'" . ((is_array($value) ? in_array($empty, $value) : $value === 0) ? " checked" : "") . "><i>" . lang('empty') . "</i></label>" : "");
+
 	preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
-	$return = ($empty !== null ? "<label><input type='$type'$attrs value='$empty'" . ((is_array($value) ? in_array($empty, $value) : $value === 0) ? " checked" : "") . "><i>" . lang('empty') . "</i></label>" : "");
 	foreach ($matches[1] as $i => $val) {
 		$val = stripcslashes(str_replace("''", "'", $val));
 		$checked = (is_int($value) ? $value == $i+1 : (is_array($value) ? in_array($i+1, $value) : $value === $val));
 		$return .= " <label><input type='$type'$attrs value='" . ($i+1) . "'" . ($checked ? ' checked' : '') . '>' . h($adminer->editVal($val, $field)) . '</label>';
 	}
+
 	return $return;
 }
 
@@ -932,8 +947,9 @@ function enum_input($type, $attrs, $field, $value, $empty = null) {
 */
 function input($field, $value, $function) {
 	global $types, $adminer, $jush;
+
 	$name = h(bracket_escape($field["field"]));
-	echo "<td class='function'>";
+
 	if (is_array($value) && !$function) {
 		$args = array($value);
 		if (version_compare(PHP_VERSION, 5.4) >= 0) {
@@ -947,13 +963,18 @@ function input($field, $value, $function) {
 		$function = null;
 	}
 	$functions = (isset($_GET["select"]) || $reset ? array("orig" => lang('original')) : array()) + $adminer->editFunctions($field);
-	$attrs = " name='fields[$name]'";
+
+	$disabled = stripos($field["default"], "GENERATED ALWAYS AS ") === 0 ? " disabled=''" : "";
+	$attrs = " name='fields[$name]' $disabled";
+
+	echo "<td class='function'>";
+
 	if ($field["type"] == "enum") {
 		echo h($functions[""]) . "<td>" . $adminer->editInput($_GET["edit"], $field, $attrs, $value);
 	} else {
 		$has_function = (in_array($function, $functions) || isset($functions[$function]));
 		echo (count($functions) > 1
-			? "<select name='function[$name]'>" . optionlist($functions, $function === null || $has_function ? $function : "") . "</select>"
+			? "<select name='function[$name]' $disabled>" . optionlist($functions, $function === null || $has_function ? $function : "") . "</select>"
 				. on_help("getTarget(event).value.replace(/^SQL\$/, '')", 1)
 				. script("qsl('select').onchange = functionChange;", "")
 			: h(reset($functions))
@@ -978,7 +999,7 @@ function input($field, $value, $function) {
 				$attrs .= " cols='50' rows='12'";
 			} else {
 				$rows = min(12, substr_count($value, "\n") + 1);
-				$attrs .= " cols='30' rows='$rows'" . ($rows == 1 ? " style='height: 1.2em;'" : ""); // 1.2em - line-height
+				$attrs .= " cols='30' rows='$rows'";
 			}
 			echo "<textarea$attrs>" . h($value) . '</textarea>';
 		} elseif ($function == "json" || preg_match('~^jsonb?$~', $field["type"])) {
@@ -1018,6 +1039,11 @@ function input($field, $value, $function) {
 */
 function process_input($field) {
 	global $adminer, $driver;
+
+	if (stripos($field["default"], "GENERATED ALWAYS AS ") === 0) {
+		return null;
+	}
+
 	$idf = bracket_escape($field["field"]);
 	$function = $_POST["function"][$idf];
 	$value = $_POST["fields"][$idf];
@@ -1077,7 +1103,7 @@ function fields_from_edit() {
 		$name = bracket_escape($key, 1); // 1 - back
 		$return[$name] = array(
 			"field" => $name,
-			"privileges" => array("insert" => 1, "update" => 1),
+			"privileges" => array("insert" => 1, "update" => 1, "where" => 1, "order" => 1),
 			"null" => 1,
 			"auto_increment" => ($key == $driver->primary),
 		);
@@ -1108,6 +1134,27 @@ function search_tables() {
 	echo ($sep ? "<p class='message'>" . lang('No tables.') : "</ul>") . "\n";
 }
 
+/**
+ * @param string $table
+ * @return array
+ */
+function get_partitions_info($table) {
+	global $connection;
+
+	$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . q(DB) . " AND TABLE_NAME = " . q($table);
+
+	$result = $connection->query("SELECT PARTITION_METHOD, PARTITION_EXPRESSION, PARTITION_ORDINAL_POSITION $from ORDER BY PARTITION_ORDINAL_POSITION DESC LIMIT 1");
+
+	$info = [];
+	list($info["partition_by"], $info["partition"],  $info["partitions"]) = $result->fetch_row();
+
+	$partitions = get_key_vals("SELECT PARTITION_NAME, PARTITION_DESCRIPTION $from AND PARTITION_NAME != '' ORDER BY PARTITION_ORDINAL_POSITION");
+	$info["partition_names"] = array_keys($partitions);
+	$info["partition_values"] = array_values($partitions);
+
+	return $info;
+}
+
 /** Send headers for export
 * @param string
 * @param bool
@@ -1250,7 +1297,7 @@ function select_value($val, $link, $field, $text_length) {
 		if (is_mail($val)) {
 			$link = "mailto:$val";
 		}
-		if (is_url($val)) {
+		if (is_web_url($val)) {
 			$link = $val; // IE 11 and all modern browsers hide referrer
 		}
 	}
@@ -1271,20 +1318,32 @@ function select_value($val, $link, $field, $text_length) {
 * @param string
 * @return bool
 */
-function is_mail($email) {
+function is_mail($value) {
-	$atom = '[-a-z0-9!#$%&\'*+/=?^_`{|}~]'; // characters of local-name
+	return is_string($value) && filter_var($value, FILTER_VALIDATE_EMAIL);
-	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component
-	$pattern = "$atom+(\\.$atom+)*@($domain?\\.)+$domain";
-	return is_string($email) && preg_match("(^$pattern(,\\s*$pattern)*\$)i", $email);
 }
 
-/** Check whether the string is URL address
+/** Check whether the string is web URL address
 * @param string
 * @return bool
 */
-function is_url($string) {
+function is_web_url($value) {
-	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component //! IDN
+	if (!is_string($value) || !preg_match('~^https?://~i', $value)) {
-	return preg_match("~^(https?)://($domain?\\.)+$domain(:\\d+)?(/.*)?(\\?.*)?(#.*)?\$~i", $string); //! restrict path, query and fragment characters
+		return false;
+	}
+
+	$components = parse_url($value);
+    if (!$components) {
+        return false;
+    }
+
+    // Encode URL path. If path was encoded already, it will be encoded twice, but we are OK with that.
+	$encodedParts = array_map('urlencode', explode('/', $components['path']));
+	$url = str_replace($components['path'], implode('/', $encodedParts), $value);
+
+	parse_str($components['query'], $params);
+	$url = str_replace($components['query'], http_build_query($params), $url);
+
+	return (bool)filter_var($url, FILTER_VALIDATE_URL);
 }
 
 /** Check if field should be shortened
@@ -1426,6 +1485,7 @@ function edit_form($table, $fields, $row, $update) {
 	$adminer->editRowPrint($table, $fields, $row, $update);
 	if ($row === false) {
 		echo "<p class='error'>" . lang('No rows.') . "\n";
+		return;
 	}
 	?>
 <form action="" method="post" enctype="multipart/form-data" id="form">

adminer/include/lang.inc.php

@@ -5,7 +5,7 @@ $langs = array(
 	'en' => 'English', // Jakub Vrána - https://www.vrana.cz
 	'ar' => 'العربية', // Y.M Amine - Algeria - nbr7@live.fr
 	'bg' => 'Български', // Deyan Delchev
-	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com
+	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com | Hossain Ahmed Saiman - hossain.ahmed@altscope.com
 	'bs' => 'Bosanski', // Emir Kurtovic
 	'ca' => 'Català', // Joan Llosas
 	'cs' => 'Čeština', // Jakub Vrána - https://www.vrana.cz
@@ -25,7 +25,8 @@ $langs = array(
 	'ja' => '日本語', // Hitoshi Ozawa - http://sourceforge.jp/projects/oss-ja-jpn/releases/
 	'ka' => 'ქართული', // Saba Khmaladze skhmaladze@uglt.org
 	'ko' => '한국어', // dalli - skcha67@gmail.com
-	'lt' => 'Lietuvių', // Paulius Leščinskas - http://www.lescinskas.lt
+    'lv' => 'Latviešu', // Kristaps Lediņš - https://krysits.com
+    'lt' => 'Lietuvių', // Paulius Leščinskas - http://www.lescinskas.lt
 	'ms' => 'Bahasa Melayu', // Pisyek
 	'nl' => 'Nederlands', // Maarten Balliauw - http://blog.maartenballiauw.be
 	'no' => 'Norsk', // Iver Odin Kvello, mupublishing.com

adminer/include/version.inc.php

@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.8.2-dev";
+$VERSION = "4.9.3";

adminer/lang/ar.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'تسجيل الدخول',
 	'Logout successful.' => 'تم تسجيل الخروج بنجاح.',
-	'Invalid credentials.' => 'بيانات الدخول غير صالحة.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'الخادم',
 	'Username' => 'اسم المستخدم',
 	'Password' => 'كلمة المرور',
@@ -264,4 +264,50 @@ $translations = array(
 	'Permanent link' => 'رابط دائم',
 	'Edit all' => 'تعديل الكل',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/bg.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logout' => 'Изход',
 	'Logged as: %s' => 'Текущ потребител: %s',
 	'Logout successful.' => 'Излизането е успешно.',
-	'Invalid credentials.' => 'Невалидни потребителски данни.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Прекалено много неуспешни опити за вход, опитайте пак след %d минута.', 'Прекалено много неуспешни опити за вход, опитайте пак след %d минути.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Главната парола вече е невалидна. <a href="https://www.adminer.org/en/extension/"%s>Изберете</a> %s метод, за да я направите постоянна.',
 	'Language' => 'Език',
@@ -22,10 +22,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Сесията е изтекла; моля, влезте отново.',
 	'%s version: %s through PHP extension %s' => '%s версия: %s през PHP разширение %s',
 	'Refresh' => 'Обновяване',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Права',
 	'Create user' => 'Създаване на потребител',
 	'User has been dropped.' => 'Потребителя беше премахнат.',
@@ -36,14 +36,14 @@ $translations = array(
 	'Routine' => 'Процедура',
 	'Grant' => 'Осигуряване',
 	'Revoke' => 'Отнемане',
-	
+
 	'Process list' => 'Списък с процеси',
 	'%d process(es) have been killed.' => array('%d процес беше прекъснат.', '%d процеса бяха прекъснати.'),
 	'Kill' => 'Прекъсване',
-	
+
 	'Variables' => 'Променливи',
 	'Status' => 'Състояние',
-	
+
 	'SQL command' => 'SQL команда',
 	'%d query(s) executed OK.' => array('%d заявка е изпълнена.', '%d заявки са изпълнени.'),
 	'Query executed OK, %d row(s) affected.' => array('Заявката е изпълнена, %d ред е засегнат.', 'Заявката е изпълнена, %d редове са засегнати.'),
@@ -57,7 +57,7 @@ $translations = array(
 	'History' => 'Хронология',
 	'Clear' => 'Изчистване',
 	'Edit all' => 'Редактиране на всички',
-	
+
 	'File upload' => 'Прикачване на файл',
 	'From server' => 'От сървър',
 	'Webserver file %s' => 'Сървърен файл %s',
@@ -69,14 +69,14 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Изпратени са прекалено много данни. Намалете обема на данните или увеличете %s управляващата директива.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Можете да прикачите голям SQL файл чрез FTP и да го импортирате от сървъра.',
 	'You are offline.' => 'Вие сте офлайн.',
-	
+
 	'Export' => 'Експорт',
 	'Output' => 'Резултат',
 	'open' => 'показване',
 	'save' => 'запис',
 	'Format' => 'Формат',
 	'Data' => 'Данни',
-	
+
 	'Database' => 'База данни',
 	'database' => 'база данни',
 	'Use' => 'Избор',
@@ -90,10 +90,10 @@ $translations = array(
 	'Alter database' => 'Промяна на база данни',
 	'Create database' => 'Създаване на база данни',
 	'Database schema' => 'Схема на базата данни',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Постоянна препратка',
-	
+
 	// thousands separator - must contain single byte
 	',' => ',',
 	'0123456789' => '0123456789',
@@ -116,7 +116,7 @@ $translations = array(
 	'Tables have been moved.' => 'Таблиците бяха преместени.',
 	'Copy' => 'Копиране',
 	'Tables have been copied.' => 'Таблиците бяха копирани.',
-	
+
 	'Routines' => 'Процедури',
 	'Routine has been called, %d row(s) affected.' => array('Беше приложена процедура, %d ред е засегнат.', 'Беше приложена процедура, %d редове са засегнати.'),
 	'Call' => 'Прилагане',
@@ -129,7 +129,7 @@ $translations = array(
 	'Alter function' => 'Промяна на функция',
 	'Alter procedure' => 'Промяна на процедура',
 	'Return type' => 'Резултат',
-	
+
 	'Events' => 'Събития',
 	'Event has been dropped.' => 'Събитието беше премахнато.',
 	'Event has been altered.' => 'Събитието беше променено.',
@@ -142,7 +142,7 @@ $translations = array(
 	'Start' => 'Начало',
 	'End' => 'Край',
 	'On completion preserve' => 'Запазване след завършване',
-	
+
 	'Tables' => 'Таблици',
 	'Tables and views' => 'Таблици и изгледи',
 	'Table' => 'Таблица',
@@ -174,12 +174,12 @@ $translations = array(
 	'Move down' => 'Преместване надолу',
 	'Remove' => 'Премахване',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Максималния брой полета е превишен. Моля, увеличете %s.',
-	
+
 	'Partition by' => 'Разделяне на',
 	'Partitions' => 'Раздели',
 	'Partition name' => 'Име на раздела',
 	'Values' => 'Стойности',
-	
+
 	'View' => 'Изглед',
 	'Materialized view' => 'Запаметен изглед',
 	'View has been dropped.' => 'Изгледа беше премахнат.',
@@ -187,14 +187,14 @@ $translations = array(
 	'View has been created.' => 'Изгледа беше създаден.',
 	'Alter view' => 'Промяна на изглед',
 	'Create view' => 'Създаване на изглед',
-	
+
 	'Indexes' => 'Индекси',
 	'Indexes have been altered.' => 'Индексите бяха променени.',
 	'Alter indexes' => 'Промяна на индекси',
 	'Add next' => 'Добавяне на следващ',
 	'Index Type' => 'Вид на индекса',
 	'Column (length)' => 'Колона (дължина)',
-	
+
 	'Foreign keys' => 'Препратки',
 	'Foreign key' => 'Препратка',
 	'Foreign key has been dropped.' => 'Препратката беше премахната.',
@@ -210,7 +210,7 @@ $translations = array(
 	'ON DELETE' => 'При изтриване',
 	'ON UPDATE' => 'При промяна',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Колоните източник и цел трябва да са от еднакъв вид, трябва да има индекс на колоните приемник и да има въведени данни.',
-	
+
 	'Triggers' => 'Тригери',
 	'Add trigger' => 'Добавяне на тригер',
 	'Trigger has been dropped.' => 'Тригера беше премахнат.',
@@ -221,7 +221,7 @@ $translations = array(
 	'Time' => 'Време',
 	'Event' => 'Събитие',
 	'Name' => 'Име',
-	
+
 	'select' => 'показване',
 	'Select' => 'Показване',
 	'Select data' => 'Показване на данни',
@@ -247,16 +247,16 @@ $translations = array(
 	'Loading' => 'Зареждане',
 	'Whole result' => 'Пълен резултат',
 	'%d byte(s)' => array('%d байт', '%d байта'),
-	
+
 	'Import' => 'Импорт',
 	'%d row(s) have been imported.' => array('%d ред беше импортиран.', '%d реда бяха импортирани.'),
 	'File must be in UTF-8 encoding.' => 'Файла трябва да е с UTF-8 кодировка.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Промяна',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+щракване в стойността, за да я промените.',
 	'Use edit link to modify this value.' => 'Използвайте "редакция" за промяна на данните.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Елементи%s бяха вмъкнати.',
 	'Item has been deleted.' => 'Елемента беше изтрит.',
@@ -277,14 +277,14 @@ $translations = array(
 	'Clone' => 'Клониране',
 	'Delete' => 'Изтриване',
 	'You have no privileges to update this table.' => 'Нямате праве за обновяване на таблицата.',
-	
+
 	'E-mail' => 'E-mail',
 	'From' => 'От',
 	'Subject' => 'Тема',
 	'Attachments' => 'Прикачени',
 	'Send' => 'Изпращане',
 	'%d e-mail(s) have been sent.' => array('%d писмо беше изпратено.', '%d писма бяха изпратени.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Числа',
 	'Date and time' => 'Дата и час',
@@ -294,7 +294,7 @@ $translations = array(
 	'Network' => 'Мрежа',
 	'Geometry' => 'Геометрия',
 	'Relations' => 'Зависимости',
-	
+
 	'Editor' => 'Редактор',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',
@@ -305,11 +305,11 @@ $translations = array(
 	'now' => 'сега',
 	'yes' => 'да',
 	'no' => 'не',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Файла вече съществува.',
 	'Please use one of the extensions %s.' => 'Моля, използвайте някое от разширенията %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Промяна на схемата',
 	'Create schema' => 'Създаване на схема',
@@ -318,7 +318,7 @@ $translations = array(
 	'Schema has been altered.' => 'Схемата беше променена.',
 	'Schema' => 'Схема',
 	'Invalid schema.' => 'Невалидна схема.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Последователности',
 	'Create sequence' => 'Създаване на последователност',
@@ -326,11 +326,33 @@ $translations = array(
 	'Sequence has been created.' => 'Последователността беше създадена.',
 	'Sequence has been altered.' => 'Последователността беше променена.',
 	'Alter sequence' => 'Промяна на последователност',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Видове потребители',
 	'Create type' => 'Създаване на вид',
 	'Type has been dropped.' => 'Вида беше пермахнат.',
 	'Type has been created.' => 'Вида беше създаден.',
 	'Alter type' => 'Промяна на вид',
+
+	'Drop %s?' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Да',
+	'No' => 'Не',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/bn.inc.php

@@ -1,53 +1,53 @@
 <?php
 $translations = array(
 	'Login' => 'লগইন',
-	'Logout successful.' => 'লগআউট সম্পন্ন হয়েছে।',
+	'Logout successful.' => 'সফলভাবে লগআউট হয়েছে।',
-	'Invalid credentials.' => 'ভুল পাসওয়ার্ড।',
+	'Invalid server or credentials.' => null,
 	'Server' => 'সার্ভার',
 	'Username' => 'ইউজারের নাম',
 	'Password' => 'পাসওয়ার্ড',
-	'Select database' => 'ডাটাবেজ নির্বাচন করো',
+	'Select database' => 'ডাটাবেজ নির্বাচন করুন',
-	'Invalid database.' => 'ভুল ডাটাবেজ।',
+	'Invalid database.' => 'অকার্যকর ডাটাবেজ।',
 	'Table has been dropped.' => 'টেবিল মুছে ফেলা হয়েছে।',
-	'Table has been altered.' => 'টেবিল সম্পাদনা করা হয়েছে।',
+	'Table has been altered.' => 'টেবিল পরিবর্তন করা হয়েছে।',
 	'Table has been created.' => 'টেবিল তৈরী করা হয়েছে।',
-	'Alter table' => 'টেবিল সম্পাদনা',
+	'Alter table' => 'টেবিল পরিবর্তন করুন',
-	'Create table' => 'টেবিল তৈরী করো',
+	'Create table' => 'টেবিল তৈরী করুন',
 	'Table name' => 'টেবিলের নাম',
 	'engine' => 'ইন্জিন',
-	'collation' => 'কলোকেশন',
+	'collation' => 'সমষ্টি',
 	'Column name' => 'কলামের নাম',
-	'Type' => 'টাইপ',
+	'Type' => 'ধরণ',
 	'Length' => 'দৈর্ঘ্য',
 	'Auto Increment' => 'স্বয়ংক্রিয় বৃদ্ধি',
-	'Options' => 'অপশন',
+	'Options' => 'বিকল্পসমূহ',
-	'Save' => 'সংরক্ষণ',
+	'Save' => 'সংরক্ষণ করুন',
 	'Drop' => 'মুছে ফেলো',
 	'Database has been dropped.' => 'ডাটাবেজ মুছে ফেলা হয়েছে।',
 	'Database has been created.' => 'ডাটাবেজ তৈরী করা হয়েছে।',
 	'Database has been renamed.' => 'ডাটাবেজের নতুন নামকরণ করা হয়েছে।',
-	'Database has been altered.' => 'ডাটাবেজ সম্পাদনা করা হয়েছে।',
+	'Database has been altered.' => 'ডাটাবেজ পরিবর্তন করা হয়েছে।',
-	'Alter database' => 'ডাটাবেজ সম্পাদনা',
+	'Alter database' => 'ডাটাবেজ পরিবর্তন করুন',
-	'Create database' => 'ডাটাবেজ তৈরী',
+	'Create database' => 'ডাটাবেজ তৈরী করুন',
-	'SQL command' => 'SQL-কোয়্যারী',
+	'SQL command' => 'SQL-কমান্ড',
 	'Logout' => 'লগআউট',
 	'database' => 'ডাটাবেজ',
 	'Use' => 'ব্যবহার',
 	'No tables.' => 'কোন টেবিল নাই।',
 	'select' => 'নির্বাচন',
 	'Item has been deleted.' => 'বিষয়বস্তু মুছে ফেলা হয়েছে।',
-	'Item has been updated.' => 'বিষয়বস্তু আপডেট করা হয়েছে।',
+	'Item has been updated.' => 'বিষয়বস্তু হালনাগাদ করা হয়েছে।',
 	'Item%s has been inserted.' => 'বিষয়বস্তুসমূহ সংযোজন করা হয়েছে।',
 	'Edit' => 'সম্পাদনা',
 	'Insert' => 'সংযোজন',
-	'Save and insert next' => 'সংরক্ষন ও পরবর্তী সংযোজন',
+	'Save and insert next' => 'সংরক্ষন ও পরবর্তী সংযোজন করুন',
-	'Delete' => 'মুছে ফেলো',
+	'Delete' => 'মুছে ফেলুন',
 	'Database' => 'ডাটাবেজ',
 	'Routines' => 'রুটিনসমূহ',
 	'Indexes have been altered.' => 'সূচীসমূহ সম্পাদনা করা হয়েছে।',
 	'Indexes' => 'সূচীসমূহ',
-	'Alter indexes' => 'সূচীসমূহ সম্পাদনা',
+	'Alter indexes' => 'সূচীসমূহ পরিবর্তন করুন',
-	'Add next' => 'সংযোজন',
+	'Add next' => 'পরবর্তী সংযোজন করুন',
 	'Language' => 'ভাষা',
 	'Select' => 'নির্বাচন',
 	'New item' => 'নতুন বিষয়বস্তু',
@@ -60,90 +60,90 @@ $translations = array(
 	'edit' => 'সম্পাদনা',
 	'Page' => 'পৃষ্ঠা',
 	'Query executed OK, %d row(s) affected.' => array('কোয়্যারী সম্পাদন হয়েছে, %d সারি প্রভাবিত হয়েছে।', 'কোয়্যারী সম্পাদন হয়েছে, %d সারি প্রভাবিত হয়েছে।'),
-	'Error in query' => 'কোয়্যারীতে ভুল আছে।',
+	'Error in query' => 'অনুসন্ধানে ভুল আছে।',
 	'Execute' => 'সম্পাদন করো',
 	'Table' => 'টেবিল',
 	'Foreign keys' => 'ফরেন কী',
 	'Triggers' => 'ট্রিগার',
 	'View' => 'ভিউ',
 	'Unable to select the table' => 'টেবিল নির্বাচন করতে অক্ষম',
-	'Invalid CSRF token. Send the form again.' => 'অবৈধ CSRF টোকেন। ফর্ম আবার পাঠাও।',
+	'Invalid CSRF token. Send the form again.' => 'অবৈধ CSRF টোকেন। ফর্মটি আবার পাঠান।',
 	'Comment' => 'মন্তব্য',
 	'Default values' => 'ডিফল্ট মান',
 	'%d byte(s)' => array('%d বাইট', '%d বাইটসমূহ'),
-	'No commands to execute.' => 'সম্পাদন করার মত কোন নির্দেশ নাই।',
+	'No commands to execute.' => 'সম্পাদন করার মত কোন নির্দেশ নেই।',
 	'Unable to upload a file.' => 'ফাইল আপলোড করা সম্ভব হচ্ছে না।',
 	'File upload' => 'ফাইল আপলোড',
 	'File uploads are disabled.' => 'ফাইল আপলোড নিষ্ক্রিয় করা আছে।',
-	'Routine has been called, %d row(s) affected.' => array('রুটিন কল করা হয়েছে, %d টি সারি (সমূহ) প্রভাবিত হয়েছে।', 'রুটিন কল করা হয়েছে, %d টি সারি (সমূহ) প্রভাবিত হয়েছে।'),
+	'Routine has been called, %d row(s) affected.' => array('রুটিন কল করা হয়েছে, %d টি সারি(সমূহ) প্রভাবিত হয়েছে।', 'রুটিন কল করা হয়েছে, %d টি সারি(সমূহ) প্রভাবিত হয়েছে।'),
 	'Call' => 'কল',
 	'No extension' => 'কোন এক্সটেনশান নাই',
 	'None of the supported PHP extensions (%s) are available.' => 'কোন PHP সমর্থিত এক্সটেনশন (%s) পাওয়া যায় নাই।',
 	'Session support must be enabled.' => 'সেশন সমর্থন সক্রিয় করা আবশ্যক।',
-	'Session expired, please login again.' => 'সেশানের মেয়াদ শেষ হয়েছে, আবার লগইন করুন।',
+	'Session expired, please login again.' => 'সেশনের মেয়াদ শেষ হয়েছে, আবার লগইন করুন।',
 	'Text length' => 'টেক্সট দৈর্ঘ্য',
 	'Foreign key has been dropped.' => 'ফরেন কী মুছে ফেলা হয়েছে।',
-	'Foreign key has been altered.' => 'ফরেন কী সম্পাদনা করা হয়েছে।',
+	'Foreign key has been altered.' => 'ফরেন কী পরিবর্তন করা হয়েছে।',
 	'Foreign key has been created.' => 'ফরেন কী তৈরী করা হয়েছে।',
 	'Foreign key' => 'ফরেন কী ',
 	'Target table' => 'টার্গেট টেবিল',
 	'Change' => 'পরিবর্তন',
 	'Source' => 'উৎস',
 	'Target' => 'লক্ষ্য',
-	'Add column' => 'কলাম সংযোজন',
+	'Add column' => 'কলাম সংযোজন করুন',
-	'Alter' => 'সম্পাদনা',
+	'Alter' => 'পরিবর্তন',
-	'Add foreign key' => 'ফরেন কী সংযোজন করো',
+	'Add foreign key' => 'ফরেন কী সংযোজন করুন',
 	'ON DELETE' => 'অন ডিলিট',
 	'ON UPDATE' => 'অন আপডেট',
 	'Index Type' => 'সূচী-ধরণ',
 	'Column (length)' => 'কলাম (দৈর্ঘ্য)',
 	'View has been dropped.' => 'ভিউ মুছে ফেলা হয়েছে।',
-	'View has been altered.' => 'ভিউ সম্পাদনা করা হয়েছে।',
+	'View has been altered.' => 'ভিউ পরিবর্তন করা হয়েছে।',
 	'View has been created.' => 'ভিউ তৈরী করা হয়েছে।',
-	'Alter view' => 'ভিউ সম্পাদনা করো',
+	'Alter view' => 'ভিউ পরিবর্তন করুন',
-	'Create view' => 'ভিউ তৈরী করো',
+	'Create view' => 'ভিউ তৈরী করুন',
 	'Name' => 'নাম',
 	'Process list' => 'প্রসেস তালিকা',
-	'%d process(es) have been killed.' => array('%d টি প্রসেস (সমূহ) বিনষ্ট করা হয়েছে।', '%d টি প্রসেস (সমূহ) বিনষ্ট করা হয়েছে।'),
+	'%d process(es) have been killed.' => array('%d টি প্রসেস(সমূহ) বিনষ্ট করা হয়েছে।', '%d টি প্রসেস(সমূহ) বিনষ্ট করা হয়েছে।'),
 	'Kill' => 'বিনষ্ট করো',
 	'Parameter name' => 'প্যারামিটারের নাম',
 	'Database schema' => 'ডাটাবেজ স্কিমা',
-	'Create procedure' => 'প্রসিডিওর তৈরী করো',
+	'Create procedure' => 'কার্যপ্রণালী তৈরী করুন',
-	'Create function' => 'ফাংশন তৈরী করো',
+	'Create function' => 'ফাংশন তৈরী করুন',
 	'Routine has been dropped.' => 'রুটিন মুছে ফেলা হয়েছে।',
-	'Routine has been altered.' => 'রুটিন সম্পাদনা করা হয়েছে।',
+	'Routine has been altered.' => 'রুটিন পরিবর্তন করা হয়েছে।',
 	'Routine has been created.' => 'রুটিন তৈরী করা হয়েছে।',
-	'Alter function' => 'ফাংশন সম্পাদনা করো',
+	'Alter function' => 'ফাংশন পরিবর্তন করুন',
-	'Alter procedure' => 'প্রসিডিওর সম্পাদনা করো',
+	'Alter procedure' => 'কার্যপ্রণালী পরিবর্তন করুন',
 	'Return type' => 'রিটার্ন টাইপ',
-	'Add trigger' => 'ট্রিগার সংযোজন করো',
+	'Add trigger' => 'ট্রিগার সংযোজন করুন',
 	'Trigger has been dropped.' => 'ট্রিগার মুছে ফেলা হয়েছে।',
-	'Trigger has been altered.' => 'ট্রিগার সম্পাদনা করা হয়েছে।',
+	'Trigger has been altered.' => 'ট্রিগার পরিবর্তন করা হয়েছে।',
 	'Trigger has been created.' => 'ট্রিগার তৈরী করা হয়েছে।',
-	'Alter trigger' => 'ট্রিগার সম্পাদনা করো',
+	'Alter trigger' => 'ট্রিগার পরিবর্তন করুন',
-	'Create trigger' => 'ট্রিগার তৈরী করো',
+	'Create trigger' => 'ট্রিগার তৈরী করুন',
 	'Time' => 'সময়',
 	'Event' => 'ইভেন্ট',
 	'%s version: %s through PHP extension %s' => 'ভার্সন %s: %s, %s PHP এক্সটেনশনের মধ্য দিয়ে',
 	'%d row(s)' => array('%d সারি', '%d সারি সমূহ'),
-	'Remove' => 'অপসারণ',
+	'Remove' => 'মুছে ফেলুন',
-	'Are you sure?' => 'তুমি কি নিশ্চিত?',
+	'Are you sure?' => 'আপনি কি নিশ্চিত?',
 	'Privileges' => 'প্রিভিলেজেস',
-	'Create user' => 'ইউজার তৈরী করো',
+	'Create user' => 'ব্যবহারকারি তৈরী করুন',
-	'User has been dropped.' => 'ইউজার মুছে ফেলা হয়েছে।',
+	'User has been dropped.' => 'ব্যবহারকারি মুছে ফেলা হয়েছে।',
-	'User has been altered.' => 'ইউজার সম্পাদনা করা হয়েছে।',
+	'User has been altered.' => 'ব্যবহারকারি সম্পাদনা করা হয়েছে।',
-	'User has been created.' => 'ইউজার তৈরী করা হয়েছে।',
+	'User has been created.' => 'ব্যবহারকারি তৈরী করা হয়েছে।',
-	'Hashed' => 'হ্যাসড',
+	'Hashed' => 'হ্যাশড',
 	'Column' => 'কলাম',
 	'Routine' => 'রুটিন',
-	'Grant' => 'গ্র্যান্ট',
+	'Grant' => 'অনুমতি',
-	'Revoke' => 'রিভোক',
+	'Revoke' => 'প্রত্যাহার',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'খুব বড় POST ডাটা। ডাটা সংক্ষিপ্ত করো অথবা %s কনফিগারেশন নির্দেশ বৃদ্ধি করো',
 	'Logged as: %s' => '%s হিসাবে লগড',
 	'Move up' => 'উপরে স্থানান্তর',
 	'Move down' => 'নীচে স্থানান্তর',
 	'Functions' => 'ফাংশন সমূহ',
-	'Aggregation' => 'মোট পরিমাণ',
+	'Aggregation' => 'সমষ্টি',
 	'Export' => 'এক্সপোর্ট',
 	'Output' => 'আউটপুট',
 	'open' => 'খোলা',
@@ -162,8 +162,8 @@ $translations = array(
 	'Schedule' => 'সময়সূচি',
 	'Start' => 'শুরু',
 	'End' => 'সমাপ্তি',
-	'Status' => 'স্ট্যাটাস',
+	'Status' => 'অবস্থা',
-	'On completion preserve' => 'সমাপ্ত হওয়ার পর সংরক্ষন করো',
+	'On completion preserve' => 'সমাপ্ত হওয়ার পর সংরক্ষন করুন',
 	'Tables and views' => 'টেবিল এবং ভিউ সমূহ',
 	'Data Length' => 'ডাটার দৈর্ঘ্য',
 	'Index Length' => 'ইনডেক্স এর দৈর্ঘ্য',
@@ -175,14 +175,14 @@ $translations = array(
 	'Repair' => 'মেরামত',
 	'Truncate' => 'ছাঁটাই',
 	'Tables have been truncated.' => 'টেবিল ছাঁটাই করা হয়েছে',
-	'Rows' => 'সারি',
+	'Rows' => 'সারিসমূহ',
 	',' => ',',
 	'0123456789' => '০১২৩৪৫৬৭৮৯',
 	'Tables have been moved.' => 'টেবিল স্থানান্তর করা হয়েছে।',
-	'Move to other database' => 'অন্য ডাটাবেজে স্থানান্তর করো',
+	'Move to other database' => 'অন্য ডাটাবেজে স্থানান্তর করুন',
-	'Move' => 'স্থানান্তর করো',
+	'Move' => 'স্থানান্তর করুন',
 	'Engine' => 'ইঞ্জিন',
-	'Save and continue edit' => 'সংরক্ষণ করো এবং সম্পাদনা চালিয়ে যাও',
+	'Save and continue edit' => 'সংরক্ষণ করুন এবং সম্পাদনা চালিয়ে যান',
 	'original' => 'প্রকৃত',
 	'Tables have been dropped.' => 'টেবিলসমূহ মুছে ফেলা হয়েছে।',
 	'%d item(s) have been affected.' => '%d টি বিষয়বস্তু প্রভাবিত হয়েছে',
@@ -193,10 +193,10 @@ $translations = array(
 	'Partitions' => 'পার্টিশন',
 	'Partition name' => 'পার্টিশনের নাম',
 	'Values' => 'মানসমূহ',
-	'%d row(s) have been imported.' => array('%d টি সারি (সমূহ) ইমপোর্ট করা হয়েছে।', '%d টি সারি (সমূহ) ইমপোর্ট করা হয়েছে।'),
+	'%d row(s) have been imported.' => array('%d টি সারি(সমূহ) ইমপোর্ট করা হয়েছে।', '%d টি সারি(সমূহ) ইমপোর্ট করা হয়েছে।'),
 	'anywhere' => 'যে কোন স্থানে',
 	'Import' => 'ইমপোর্ট',
-	'Stop on error' => 'ত্রুটি পেলে থেমে যাও',
+	'Stop on error' => 'ত্রুটি পেলে থেমে যান',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$6.$4.$1',
 	'[yyyy]-mm-dd' => 't.m.[jjjj]',
@@ -216,14 +216,14 @@ $translations = array(
 	'E-mail' => '​​ই-মেইল',
 	'From' => 'থেকে',
 	'Subject' => 'বিষয়',
-	'Send' => 'পাঠাও',
+	'Send' => 'পাঠান',
-	'%d e-mail(s) have been sent.' => array('%d ইমেইল (গুলি) পাঠানো হয়েছে।', '%d ইমেইল (গুলি) পাঠানো হয়েছে।'),
+	'%d e-mail(s) have been sent.' => array('%d ইমেইল(গুলি) পাঠানো হয়েছে।', '%d ইমেইল(গুলি) পাঠানো হয়েছে।'),
 	'Webserver file %s' => 'ওয়েবসার্ভার ফাইল %s',
-	'File does not exist.' => 'ফাইলের কোন অস্তিত্ব নেই।',
+	'File does not exist.' => 'ফাইলটির কোন অস্তিত্ব নেই।',
 	'%d in total' => 'সর্বমোটঃ %d টি',
 	'Permanent login' => 'স্থায়ী লগইন',
 	'Databases have been dropped.' => 'ডাটাবেজসমূহ মুছে ফেলা হয়েছে।',
-	'Search data in tables' => 'টেবিলে খোঁজ করো',
+	'Search data in tables' => 'টেবিলে তথ্য খুঁজুন',
 	'Schema' => 'স্কিমা',
 	'Alter schema' => 'স্কিমা পরিবর্তন করো',
 	'Create schema' => 'স্কিমা তৈরী করো',
@@ -236,32 +236,78 @@ $translations = array(
 	'Sequence has been dropped.' => 'অনুক্রম মুছে ফেলা হয়েছে।',
 	'Sequence has been created.' => 'অনুক্রম তৈরি করা হয়েছে।',
 	'Sequence has been altered.' => 'অনুক্রম সম্পাদনা করা হয়েছে।',
-	'User types' => 'ইউজারের টাইপ',
+	'User types' => 'ব্যবহারকারির ধরণ',
-	'Create type' => 'টাইপ তৈরী করো',
+	'Create type' => 'ধরণ তৈরী করুন',
-	'Alter type' => 'টাইপ পরিবর্তন করো',
+	'Alter type' => 'ধরণ পরিবর্তন করুন',
-	'Type has been dropped.' => 'টাইপ মুছে ফেলা হয়েছে।',
+	'Type has been dropped.' => 'ধরণ মুছে ফেলা হয়েছে।',
-	'Type has been created.' => 'টাইপ তৈরি করা হয়েছে।',
+	'Type has been created.' => 'ধরণ তৈরি করা হয়েছে।',
-	'Use edit link to modify this value.' => 'এই মান পরিবর্তনের জন্য সম্পাদনা লিঙ্ক ব্যবহার করো।',
+	'Use edit link to modify this value.' => 'এই মানটি পরিবর্তনের জন্য সম্পাদনা লিঙ্ক ব্যবহার করুন।',
 	'last' => 'সর্বশেষ',
 	'From server' => 'সার্ভার থেকে',
 	'System' => 'সিস্টেম',
 	'Select data' => 'তথ্য নির্বাচন করো',
-	'Show structure' => 'গঠন দেখাও',
+	'Show structure' => 'গঠন দেখান',
 	'empty' => 'খালি',
 	'Network' => 'নেটওয়ার্ক',
 	'Geometry' => 'জ্যামিতি',
 	'File exists.' => 'ফাইল রয়েছে।',
-	'Attachments' => 'সংযুক্তি',
+	'Attachments' => 'সংযুক্তিগুলো',
-	'%d query(s) executed OK.' => array('SQL-কোয়্যারী সফলভাবে সম্পন্ন হয়েছে', '%d SQL-কোয়্যারীসমূহ সফলভাবে সম্পন্ন হয়েছে'),
+	'%d query(s) executed OK.' => array('SQL-অনুসন্ধান সফলভাবে সম্পন্ন হয়েছে', '%d SQL-অনুসন্ধানসমূহ সফলভাবে সম্পন্ন হয়েছে'),
-	'Show only errors' => 'শুধুমাত্র ত্রুটি দেখাও',
+	'Show only errors' => 'শুধুমাত্র ত্রুটিগুলো দেখান',
 	'Refresh' => 'রিফ্রেশ',
 	'Invalid schema.' => 'অবৈধ স্কিমা।',
-	'Please use one of the extensions %s.' => 'কোন একটা এক্সটেনশন %s ব্যবহার করো।',
+	'Please use one of the extensions %s.' => 'কোন একটা এক্সটেনশন %s ব্যবহার করুন।',
 	'now' => 'এখন',
 	'ltr' => 'ltr',
-	'Tables have been copied.' => 'টেবিল কপি করা হয়েছে।',
+	'Tables have been copied.' => 'টেবিলগুলো কপি করা হয়েছে।',
 	'Copy' => 'কপি',
 	'Permanent link' => 'স্থায়ী লিংক',
-	'Edit all' => 'সকল সম্পাদনা করো',
+	'Edit all' => 'সবগুলো সম্পাদনা করুন',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/bs.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logout' => 'Odjava',
 	'Logged as: %s' => 'Prijavi se kao: %s',
 	'Logout successful.' => 'Uspešna odjava.',
-	'Invalid credentials.' => 'Nevažeće dozvole.',
+	'Invalid server or credentials.' => null,
 	'Language' => 'Jezik',
 	'Invalid CSRF token. Send the form again.' => 'Nevažeći CSRF kod. Proslijedite ponovo formu.',
 	'No extension' => 'Bez dodataka',
@@ -318,4 +318,41 @@ $translations = array(
 	'Type has been dropped.' => 'Tip je izbrisan.',
 	'Type has been created.' => 'tip je spašen.',
 	'Alter type' => 'Ažuriraj tip',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Da',
+	'No' => 'Ne',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/ca.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Inicia la sessió',
 	'Logout successful.' => 'Desconnexió correcta.',
-	'Invalid credentials.' => 'Credencials invàlides.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Servidor',
 	'Username' => 'Nom d\'usuari',
 	'Password' => 'Contrasenya',
@@ -265,4 +265,49 @@ $translations = array(
 	'Permanent link' => 'Enllaç permanent',
 	'Edit all' => 'Edita-ho tot',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/cs.inc.php

@@ -11,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => 'Přihlášen jako: %s',
 	'Logout successful.' => 'Odhlášení proběhlo v pořádku.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Díky za použití Admineru, <a href="https://www.adminer.org/cs/donation/">přispějte</a> na vývoj.',
-	'Invalid credentials.' => 'Neplatné přihlašovací údaje.',
+	'Invalid server or credentials.' => 'Neplatný server nebo přihlašovací údaje.',
 	'There is a space in the input password which might be the cause.' => 'Problém může být, že je v zadaném hesle mezera.',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer nepodporuje přístup k databázi bez hesla, <a href="https://www.adminer.org/cs/password/"%s>více informací</a>.',
 	'Database does not support password.' => 'Databáze nepodporuje heslo.',
@@ -23,16 +23,16 @@ $translations = array(
 	'No extension' => 'Žádné rozšíření',
 	'None of the supported PHP extensions (%s) are available.' => 'Není dostupné žádné z podporovaných PHP rozšíření (%s).',
 	'Connecting to privileged ports is not allowed.' => 'Připojování k privilegovaným portům není povoleno.',
-	'Disable %s or enable %s or %s extensions.' => 'Zakažte %s nebo povolte extenze %s nebo %s.',
+	'Disable %s or enable %s or %s extensions.' => 'Zakažte %s nebo povolte rozšíření %s nebo %s.',
 	'Session support must be enabled.' => 'Session proměnné musí být povolené.',
 	'Session expired, please login again.' => 'Session vypršela, přihlašte se prosím znovu.',
 	'The action will be performed after successful login with the same credentials.' => 'Akce bude provedena po úspěšném přihlášení se stejnými přihlašovacími údaji.',
 	'%s version: %s through PHP extension %s' => 'Verze %s: %s přes PHP rozšíření %s',
 	'Refresh' => 'Obnovit',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Oprávnění',
 	'Create user' => 'Vytvořit uživatele',
 	'User has been dropped.' => 'Uživatel byl odstraněn.',
@@ -43,14 +43,14 @@ $translations = array(
 	'Routine' => 'Procedura',
 	'Grant' => 'Povolit',
 	'Revoke' => 'Zakázat',
-	
+
 	'Process list' => 'Seznam procesů',
 	'%d process(es) have been killed.' => array('Byl ukončen %d proces.', 'Byly ukončeny %d procesy.', 'Bylo ukončeno %d procesů.'),
 	'Kill' => 'Ukončit',
-	
+
 	'Variables' => 'Proměnné',
 	'Status' => 'Stav',
-	
+
 	'SQL command' => 'SQL příkaz',
 	'%d query(s) executed OK.' => array('%d příkaz proběhl v pořádku.', '%d příkazy proběhly v pořádku.', '%d příkazů proběhlo v pořádku.'),
 	'Query executed OK, %d row(s) affected.' => array('Příkaz proběhl v pořádku, byl změněn %d záznam.', 'Příkaz proběhl v pořádku, byly změněny %d záznamy.', 'Příkaz proběhl v pořádku, bylo změněno %d záznamů.'),
@@ -67,7 +67,7 @@ $translations = array(
 	'History' => 'Historie',
 	'Clear' => 'Vyčistit',
 	'Edit all' => 'Upravit vše',
-	
+
 	'File upload' => 'Nahrání souboru',
 	'From server' => 'Ze serveru',
 	'Webserver file %s' => 'Soubor %s na webovém serveru',
@@ -79,14 +79,14 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Příliš velká POST data. Zmenšete data nebo zvyšte hodnotu konfigurační direktivy %s.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Velký SQL soubor můžete nahrát pomocí FTP a importovat ho ze serveru.',
 	'You are offline.' => 'Jste offline.',
-	
+
 	'Export' => 'Export',
 	'Output' => 'Výstup',
 	'open' => 'otevřít',
 	'save' => 'uložit',
 	'Format' => 'Formát',
 	'Data' => 'Data',
-	
+
 	'Database' => 'Databáze',
 	'database' => 'databáze',
 	'DB' => 'DB',
@@ -101,10 +101,10 @@ $translations = array(
 	'Alter database' => 'Pozměnit databázi',
 	'Create database' => 'Vytvořit databázi',
 	'Database schema' => 'Schéma databáze',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Trvalý odkaz',
-	
+
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -128,7 +128,7 @@ $translations = array(
 	'Copy' => 'Zkopírovat',
 	'Tables have been copied.' => 'Tabulky byly zkopírovány.',
 	'overwrite' => 'přepsat',
-	
+
 	'Routines' => 'Procedury a funkce',
 	'Routine has been called, %d row(s) affected.' => array('Procedura byla zavolána, byl změněn %d záznam.', 'Procedura byla zavolána, byly změněny %d záznamy.', 'Procedura byla zavolána, bylo změněno %d záznamů.'),
 	'Call' => 'Zavolat',
@@ -141,7 +141,7 @@ $translations = array(
 	'Alter function' => 'Změnit funkci',
 	'Alter procedure' => 'Změnit proceduru',
 	'Return type' => 'Návratový typ',
-	
+
 	'Events' => 'Události',
 	'Event has been dropped.' => 'Událost byla odstraněna.',
 	'Event has been altered.' => 'Událost byla změněna.',
@@ -154,7 +154,7 @@ $translations = array(
 	'Start' => 'Začátek',
 	'End' => 'Konec',
 	'On completion preserve' => 'Po dokončení zachovat',
-	
+
 	'Tables' => 'Tabulky',
 	'Tables and views' => 'Tabulky a pohledy',
 	'Table' => 'Tabulka',
@@ -187,12 +187,12 @@ $translations = array(
 	'Move down' => 'Přesunout dolů',
 	'Remove' => 'Odebrat',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Byl překročen maximální povolený počet polí. Zvyšte prosím %s.',
-	
+
 	'Partition by' => 'Rozdělit podle',
 	'Partitions' => 'Oddíly',
 	'Partition name' => 'Název oddílu',
 	'Values' => 'Hodnoty',
-	
+
 	'View' => 'Pohled',
 	'Materialized view' => 'Materializovaný pohled',
 	'View has been dropped.' => 'Pohled byl odstraněn.',
@@ -200,14 +200,14 @@ $translations = array(
 	'View has been created.' => 'Pohled byl vytvořen.',
 	'Alter view' => 'Pozměnit pohled',
 	'Create view' => 'Vytvořit pohled',
-	
+
 	'Indexes' => 'Indexy',
 	'Indexes have been altered.' => 'Indexy byly změněny.',
 	'Alter indexes' => 'Pozměnit indexy',
 	'Add next' => 'Přidat další',
 	'Index Type' => 'Typ indexu',
 	'Column (length)' => 'Sloupec (délka)',
-	
+
 	'Foreign keys' => 'Cizí klíče',
 	'Foreign key' => 'Cizí klíč',
 	'Foreign key has been dropped.' => 'Cizí klíč byl odstraněn.',
@@ -223,7 +223,7 @@ $translations = array(
 	'ON DELETE' => 'Při smazání',
 	'ON UPDATE' => 'Při změně',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Zdrojové a cílové sloupce musí mít stejný datový typ, nad cílovými sloupci musí být definován index a odkazovaná data musí existovat.',
-	
+
 	'Triggers' => 'Triggery',
 	'Add trigger' => 'Přidat trigger',
 	'Trigger has been dropped.' => 'Trigger byl odstraněn.',
@@ -234,7 +234,7 @@ $translations = array(
 	'Time' => 'Čas',
 	'Event' => 'Událost',
 	'Name' => 'Název',
-	
+
 	'select' => 'vypsat',
 	'Select' => 'Vypsat',
 	'Select data' => 'Vypsat data',
@@ -260,16 +260,16 @@ $translations = array(
 	'Loading' => 'Nahrává se',
 	'Whole result' => 'Celý výsledek',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtů'),
-	
+
 	'Import' => 'Import',
 	'%d row(s) have been imported.' => array('Byl importován %d záznam.', 'Byly importovány %d záznamy.', 'Bylo importováno %d záznamů.'),
 	'File must be in UTF-8 encoding.' => 'Soubor musí být v kódování UTF-8.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Změnit',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+klikněte na políčko, které chcete změnit.',
 	'Use edit link to modify this value.' => 'Ke změně této hodnoty použijte odkaz upravit.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Položka%s byla vložena.',
 	'Item has been deleted.' => 'Položka byla smazána.',
@@ -290,14 +290,14 @@ $translations = array(
 	'Clone' => 'Klonovat',
 	'Delete' => 'Smazat',
 	'You have no privileges to update this table.' => 'Nemáte oprávnění editovat tuto tabulku.',
-	
+
 	'E-mail' => 'E-mail',
 	'From' => 'Odesílatel',
 	'Subject' => 'Předmět',
 	'Attachments' => 'Přílohy',
 	'Send' => 'Odeslat',
 	'%d e-mail(s) have been sent.' => array('Byl odeslán %d e-mail.', 'Byly odeslány %d e-maily.', 'Bylo odesláno %d e-mailů.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Čísla',
 	'Date and time' => 'Datum a čas',
@@ -307,7 +307,7 @@ $translations = array(
 	'Network' => 'Síť',
 	'Geometry' => 'Geometrie',
 	'Relations' => 'Vztahy',
-	
+
 	'Editor' => 'Editor',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$6.$4.$1',
@@ -318,11 +318,11 @@ $translations = array(
 	'now' => 'teď',
 	'yes' => 'ano',
 	'no' => 'ne',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Soubor existuje.',
 	'Please use one of the extensions %s.' => 'Prosím použijte jednu z koncovek %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Pozměnit schéma',
 	'Create schema' => 'Vytvořit schéma',
@@ -331,7 +331,7 @@ $translations = array(
 	'Schema has been altered.' => 'Schéma bylo změněno.',
 	'Schema' => 'Schéma',
 	'Invalid schema.' => 'Nesprávné schéma.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekvence',
 	'Create sequence' => 'Vytvořit sekvenci',
@@ -339,11 +339,20 @@ $translations = array(
 	'Sequence has been created.' => 'Sekvence byla vytvořena.',
 	'Sequence has been altered.' => 'Sekvence byla změněna.',
 	'Alter sequence' => 'Pozměnit sekvenci',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Uživatelské typy',
 	'Create type' => 'Vytvořit typ',
 	'Type has been dropped.' => 'Typ byl odstraněn.',
 	'Type has been created.' => 'Typ byl vytvořen.',
 	'Alter type' => 'Pozměnit typ',
+
+	// Plugins
+	'Columns' => 'Sloupce',
+	'Nullable' => 'Povoleno null',
+	'Default' => 'Výchozí',
+	'Yes' => 'Ano',
+	'No' => 'Ne',
+	'One Time Password' => 'Jednorázové heslo',
+	'Invalid OTP code.' => 'Neplatný kód OTP.',
 );

adminer/lang/da.inc.php

@@ -9,7 +9,7 @@ $translations = array(
 	'Logout' => 'Log ud',
 	'Logged as: %s' => 'Logget ind som: %s',
 	'Logout successful.' => 'Log af vellykket.',
-	'Invalid credentials.' => 'Ugyldige log ind oplysninger.',
+	'Invalid server or credentials.' => null,
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-kodeordet er udløbet. <a href="https://www.adminer.org/en/extension/"%s>Implementer</a> en metode for %s for at gøre det permanent.',
 	'Language' => 'Sprog',
 	'Invalid CSRF token. Send the form again.' => 'Ugyldigt CSRF-token - Genindsend formen.',
@@ -279,4 +279,35 @@ $translations = array(
 	'Type has been created.' => 'Typen er oprettet.',
 	'Alter type' => 'Ændre type',
 	'Saving' => 'Gemmer',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ja',
+	'No' => 'Nej',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/de.inc.php

@@ -3,7 +3,7 @@ $translations = array(
 	'Login' => 'Login',
 	'Logout successful.' => 'Abmeldung erfolgreich.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Danke, dass Sie Adminer genutzt haben. <a href="https://www.adminer.org/de/donation/">Spenden willkommen!</a>',
-	'Invalid credentials.' => 'Ungültige Anmelde-Informationen.',
+	'Invalid server or credentials.' => 'Ungültige Server oder Anmelde-Informationen.',
 	'Server' => 'Server',
 	'Username' => 'Benutzer',
 	'Password' => 'Passwort',
@@ -286,4 +286,28 @@ $translations = array(
 	'no' => 'nein',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Das Master-Passwort ist abgelaufen. <a href="https://www.adminer.org/de/extension/"%s>Implementieren</a> Sie die %s Methode, um es permanent zu machen.',
 	'%d / ' => '%d / ',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Full table scan' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ja',
+	'No' => 'Nein',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/el.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logout' => 'Αποσύνδεση',
 	'Logged as: %s' => 'Συνδεθήκατε ως %s',
 	'Logout successful.' => 'Αποσυνδεθήκατε με επιτυχία.',
-	'Invalid credentials.' => 'Εσφαλμένα Διαπιστευτήρια.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Επανειλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτό.', 'Επανειλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτά.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Έληξε ο Κύριος Κωδικός. <a href="https://www.adminer.org/en/extension/"%s>Ενεργοποιήστε</a> τη μέθοδο %s για να τον κάνετε μόνιμο.',
 	'Language' => 'Γλώσσα',
@@ -22,10 +22,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Η συνεδρία έληξε, παρακαλώ συνδεθείτε ξανά.',
 	'%s version: %s through PHP extension %s' => '%s έκδοση: %s μέσω επέκτασης PHP %s',
 	'Refresh' => 'Ανανέωση',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Δικαιώματα',
 	'Create user' => 'Δημιουργία Χρήστη',
 	'User has been dropped.' => 'Ο Χρήστης διαγράφηκε.',
@@ -36,14 +36,14 @@ $translations = array(
 	'Routine' => 'Ρουτίνα',
 	'Grant' => 'Παραχώρηση',
 	'Revoke' => 'Ανάκληση',
-	
+
 	'Process list' => 'Λίστα διεργασιών',
 	'%d process(es) have been killed.' => array('Τερματίστηκε %d διεργασία.', 'Τερματίστηκαν %d διεργασίες.'),
 	'Kill' => 'Τερματισμός',
-	
+
 	'Variables' => 'Μεταβλητές',
 	'Status' => 'Κατάσταση',
-	
+
 	'SQL command' => 'Εντολή SQL',
 	'%d query(s) executed OK.' => array('Το ερώτημα %d εκτελέστηκε ΟΚ.', 'Τα ερώτηματα %d εκτελέστηκαν ΟΚ.'),
 	'Query executed OK, %d row(s) affected.' => array('Το ερώτημα εκτελέστηκε ΟΚ, επηρεάστηκε %d σειρά.', 'Το ερώτημα εκτελέστηκε ΟΚ, επηρεάστηκαν %d σειρές.'),
@@ -57,7 +57,7 @@ $translations = array(
 	'History' => 'Ιστορικό',
 	'Clear' => 'Καθαρισμός',
 	'Edit all' => 'Επεξεργασία όλων',
-	
+
 	'File upload' => 'Μεταφόρτωση αρχείου',
 	'From server' => 'Από διακομιστή',
 	'Webserver file %s' => 'Αρχείο %s από διακομιστή web',
@@ -69,7 +69,7 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Πολλά δεδομένα POST. Μείωστε τα περιεχόμενα ή αυξήστε την σχετική ρύθμιση %s.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Μπορείτε να μεταφορτώσετε ένα μεγάλο αρχείο SQL μέσω FTP και να το εισάγετε από το διακομιστή.',
 	'You are offline.' => 'Βρίσκεστε εκτός σύνδεσης.',
-	
+
 	'Export' => 'Εξαγωγή',
 	'Output' => 'Αποτέλεσμα',
 	'open' => 'άνοιγμα',
@@ -77,7 +77,7 @@ $translations = array(
 	'Saving' => 'Γίνεται Αποθήκευση',
 	'Format' => 'Μορφή',
 	'Data' => 'Δεδομένα',
-	
+
 	'Database' => 'Β. Δεδομένων',
 	'database' => 'β. δεδομένων',
 	'Use' => 'χρήση',
@@ -91,10 +91,10 @@ $translations = array(
 	'Alter database' => 'Τροποποίηση Β.Δ.',
 	'Create database' => 'Δημιουργία Β.Δ.',
 	'Database schema' => 'Σχήμα Β.Δ.',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Μόνιμος Σύνδεσμος',
-	
+
 	// thousands separator - must contain single byte
 	',' => '.',
 	'0123456789' => '0123456789',
@@ -117,7 +117,7 @@ $translations = array(
 	'Tables have been moved.' => 'Οι πίνακες μεταφέρθηκαν.',
 	'Copy' => 'Αντιγραφή',
 	'Tables have been copied.' => 'Οι πίνακες αντιγράφηκαν.',
-	
+
 	'Routines' => 'Ρουτίνες',
 	'Routine has been called, %d row(s) affected.' => array('Η ρουτίνα εκτελέστηκε, επηρεάστηκε %d σειρά.', 'Η ρουτίνα εκτελέστηκε, επηρεάστηκαν %d σειρές.'),
 	'Call' => 'Εκτέλεση',
@@ -130,7 +130,7 @@ $translations = array(
 	'Alter function' => 'Τροποποίηση λειτουργίας',
 	'Alter procedure' => 'Τροποποίηση διαδικασίας',
 	'Return type' => 'Επιστρεφόμενος τύπος',
-	
+
 	'Events' => 'Γεγονός',
 	'Event has been dropped.' => 'Το γεγονός διαγράφηκε.',
 	'Event has been altered.' => 'Το γεγονός τροποποιήθηκε.',
@@ -143,7 +143,7 @@ $translations = array(
 	'Start' => 'Έναρξη',
 	'End' => 'Λήξη',
 	'On completion preserve' => 'Κατά την ολοκλήρωση διατήρησε',
-	
+
 	'Tables' => 'Πίνακες',
 	'Tables and views' => 'Πίνακες και Προβολές',
 	'Table' => 'Πίνακας',
@@ -175,12 +175,12 @@ $translations = array(
 	'Move down' => 'Μετακίνηση προς τα κάτω',
 	'Remove' => 'Αφαίρεση',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Υπέρβαση μέγιστου επιτρεπόμενου αριθμού πεδίων. Παρακαλώ αυξήστε %s.',
-	
+
 	'Partition by' => 'Τμηματοποίηση ανά',
 	'Partitions' => 'Τμήματα',
 	'Partition name' => 'Όνομα Τμήματος',
 	'Values' => 'Τιμές',
-	
+
 	'View' => 'Προβολή',
 	'Materialized view' => 'Υλοποιημένη προβολή',
 	'View has been dropped.' => 'Η προβολή διαγράφηκε.',
@@ -188,14 +188,14 @@ $translations = array(
 	'View has been created.' => 'Η προβολή δημιουργήθηκε.',
 	'Alter view' => 'Τροποποίηση προβολής',
 	'Create view' => 'Δημιουργία προβολής',
-	
+
 	'Indexes' => 'Δείκτες',
 	'Indexes have been altered.' => 'Οι δείκτες τροποποιήθηκαν.',
 	'Alter indexes' => 'Τροποποίηση δεικτών',
 	'Add next' => 'Προσθήκη επόμενου',
 	'Index Type' => 'Τύπος δείκτη',
 	'Column (length)' => 'Στήλη (μήκος)',
-	
+
 	'Foreign keys' => 'Εξαρτημένα κλειδιά',
 	'Foreign key' => 'Εξαρτημένο κλειδί',
 	'Foreign key has been dropped.' => 'Το εξαρτημένο κλειδί διαγράφηκε.',
@@ -211,7 +211,7 @@ $translations = array(
 	'ON DELETE' => 'ΚΑΤΑ ΤΗ ΔΙΑΓΡΑΦΗ',
 	'ON UPDATE' => 'ΚΑΤΑ ΤΗΝ ΑΛΛΑΓΗ',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Οι στήλες στην πηγή και το στόχο πρέπει να έχουν τον ίδιο τύπο, πρέπει να υπάρχει δείκτης στη στήλη στόχο και να υπάρχουν εξαρτημένα δεδομένα.',
-	
+
 	'Triggers' => 'Εναύσματα',
 	'Add trigger' => 'Προσθήκη εναύσματος',
 	'Trigger has been dropped.' => 'Το έναυσμα διαγράφηκε.',
@@ -222,7 +222,7 @@ $translations = array(
 	'Time' => 'Ώρα',
 	'Event' => 'Γεγονός',
 	'Name' => 'Όνομα',
-	
+
 	'select' => 'επιλογή',
 	'Select' => 'Επιλογή',
 	'Select data' => 'Επιλέξτε δεδομένα',
@@ -248,16 +248,16 @@ $translations = array(
 	'Loading' => 'Φορτώνει',
 	'Whole result' => 'Όλο το αποτέλεσμα',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
-	
+
 	'Import' => 'Εισαγωγή',
 	'%d row(s) have been imported.' => array('$d σειρά εισήχθη.', '%d σειρές εισήχθησαν.'),
 	'File must be in UTF-8 encoding.' => 'Το αρχείο πρέπει να έχει κωδικοποίηση UTF-8.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Τροποποίηση',
 	'Ctrl+click on a value to modify it.' => 'Πιέστε Ctrl+click σε μια τιμή για να την τροποποιήσετε.',
 	'Use edit link to modify this value.' => 'Χρησιμοποιήστε το σύνδεσμο επεξεργασία για να τροποποιήσετε την τιμή.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Η εγγραφή%s εισήχθη.',
 	'Item has been deleted.' => 'Η εγγραφή διαγράφηκε.',
@@ -277,14 +277,14 @@ $translations = array(
 	'Clone' => 'Κλωνοποίηση',
 	'Delete' => 'Διαγραφή',
 	'You have no privileges to update this table.' => 'Δεν έχετε δικαίωμα να τροποποιήσετε αυτό τον πίνακα.',
-	
+
 	'E-mail' => 'E-mail',
 	'From' => 'Από',
 	'Subject' => 'Θέμα',
 	'Attachments' => 'Συνημμένα',
 	'Send' => 'Αποστολή',
 	'%d e-mail(s) have been sent.' => array('%d e-mail απεστάλη.', '%d e-mail απεστάλησαν.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Αριθμοί',
 	'Date and time' => 'Ημερομηνία και ώρα',
@@ -294,7 +294,7 @@ $translations = array(
 	'Network' => 'Δίκτυο',
 	'Geometry' => 'Γεωμετρία',
 	'Relations' => 'Συσχετήσεις',
-	
+
 	'Editor' => 'Επεξεργαστής',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$5/$3/$1',
@@ -305,11 +305,11 @@ $translations = array(
 	'now' => 'τώρα',
 	'yes' => 'ναι',
 	'no' => 'όχι',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Το αρχείο υπάρχει.',
 	'Please use one of the extensions %s.' => 'Παρακαλώ χρησιμοποιείστε μια από τις επεκτάσεις %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Τροποποίηση σχήματος',
 	'Create schema' => 'Δημιουργία σχήματος',
@@ -318,7 +318,7 @@ $translations = array(
 	'Schema has been altered.' => 'Το σχήμα τροποποιήθηκε.',
 	'Schema' => 'Σχήμα',
 	'Invalid schema.' => 'Άκυρο σχήμα.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Αλληλουχία',
 	'Create sequence' => 'Δημιουργία αλληλουχίας',
@@ -326,11 +326,33 @@ $translations = array(
 	'Sequence has been created.' => 'Η αλληλουχία δημιουργήθηκε.',
 	'Sequence has been altered.' => 'Η αλληλουχία τροποποιήθηκε.',
 	'Alter sequence' => 'Τροποποίηση αλληλουχίας',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Τύποι χρήστη',
 	'Create type' => 'Δημιουργία τύπου',
 	'Type has been dropped.' => 'Ο τύπος διαγράφηκε.',
 	'Type has been created.' => 'Ο τύπος δημιουργήθηκε.',
 	'Alter type' => 'Τροποποίηση τύπου',
+
+	'Drop %s?' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/es.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Login',
 	'Logout successful.' => 'Sesión finalizada con éxito.',
-	'Invalid credentials.' => 'Usuario y/o clave de acceso incorrecta.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Servidor',
 	'Username' => 'Usuario',
 	'Password' => 'Contraseña',
@@ -265,4 +265,49 @@ $translations = array(
 	'Permanent link' => 'Enlace permanente',
 	'Edit all' => 'Editar todos',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/et.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Logi sisse',
 	'Logout successful.' => 'Väljalogimine õnnestus.',
-	'Invalid credentials.' => 'Ebakorrektsed andmed.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Server',
 	'Username' => 'Kasutajanimi',
 	'Password' => 'Parool',
@@ -265,4 +265,49 @@ $translations = array(
 	'Permanent link' => 'Püsilink',
 	'Edit all' => 'Muuda kõiki',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/fa.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logout' => 'خروج',
 	'Logged as: %s' => 'ورود به عنوان: %s',
 	'Logout successful.' => 'با موفقیت خارج شدید.',
-	'Invalid credentials.' => 'اعتبار سنجی نامعتبر.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('ورودهای ناموفق بیش از حد، %d دقیقه دیگر تلاش نمایید.', 'ورودهای ناموفق بیش از حد، %d دقیقه دیگر تلاش نمایید.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'رمز اصلی باطل شده است. روش %s را <a href="https://www.adminer.org/en/extension/"%s>پیاده سازی</a> کرده تا آن را دائمی سازید.',
 	'Language' => 'زبان',
@@ -21,10 +21,10 @@ $translations = array(
 	'Session expired, please login again.' => 'نشست پایان یافته، لطفا دوباره وارد شوید.',
 	'%s version: %s through PHP extension %s' => 'نسخه %s : %s توسعه پی اچ پی %s',
 	'Refresh' => 'بازیابی',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'rtl',
-	
+
 	'Privileges' => 'امتیازات',
 	'Create user' => 'ایجاد کاربر',
 	'User has been dropped.' => 'کاربر حذف شد.',
@@ -35,14 +35,14 @@ $translations = array(
 	'Routine' => 'روتین',
 	'Grant' => 'اعطا',
 	'Revoke' => 'لغو کردن',
-	
+
 	'Process list' => 'لیست فرآیند',
 	'%d process(es) have been killed.' => '%d فرآیند متوقف شد.',
 	'Kill' => 'حذف فرآیند',
-	
+
 	'Variables' => 'متغیرها',
 	'Status' => 'وضعیت',
-	
+
 	'SQL command' => 'دستور SQL',
 	'%d query(s) executed OK.' => '%d کوئری اجرا شد.',
 	'Query executed OK, %d row(s) affected.' => 'کوئری اجرا شد. %d سطر تغیر کرد.',
@@ -56,7 +56,7 @@ $translations = array(
 	'History' => 'تاریخ',
 	'Clear' => 'پاک کردن',
 	'Edit all' => 'ویرایش همه',
-	
+
 	'File upload' => 'بارگذاری فایل',
 	'From server' => 'از سرور',
 	'Webserver file %s' => '%s فایل وب سرور',
@@ -75,7 +75,7 @@ $translations = array(
 	'save' => 'ذخیره',
 	'Format' => 'حذف',
 	'Data' => 'داده',
-	
+
 	'Database' => 'پایگاه داده',
 	'database' => 'پایگاه داده',
 	'Use' => 'استفاده',
@@ -89,10 +89,10 @@ $translations = array(
 	'Alter database' => 'ویرایش پایگاه داده',
 	'Create database' => 'ایجاد پایگاه داده',
 	'Database schema' => 'ساختار پایگاه داده',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'ارتباط دائم',
-	
+
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '۰۱۲۳۴۵۶۷۸۹',
@@ -115,7 +115,7 @@ $translations = array(
 	'Tables have been moved.' => 'جدولها انتقال داده شدند.',
 	'Copy' => 'کپی کردن',
 	'Tables have been copied.' => 'جدولها کپی شدند.',
-	
+
 	'Routines' => 'روالها',
 	'Routine has been called, %d row(s) affected.' => array('روال فراخوانی شد %d سطر متاثر شد.', 'روال فراخوانی شد %d سطر متاثر شد.'),
 	'Call' => 'صدا زدن',
@@ -128,7 +128,7 @@ $translations = array(
 	'Alter function' => 'ویرایش تابع',
 	'Alter procedure' => 'ویرایش زیربرنامه',
 	'Return type' => 'برگرداندن نوع',
-	
+
 	'Events' => 'رویدادها',
 	'Event has been dropped.' => 'رویداد حذف شد.',
 	'Event has been altered.' => 'رویداد ویرایش شد.',
@@ -141,7 +141,7 @@ $translations = array(
 	'Start' => 'آغاز',
 	'End' => 'پایان',
 	'On completion preserve' => 'تکمیل حفاظت فعال است',
-	
+
 	'Tables' => 'جدولها',
 	'Tables and views' => 'جدولها و نمایه ها',
 	'Table' => 'جدول',
@@ -173,12 +173,12 @@ $translations = array(
 	'Move down' => 'انتقال به پایین',
 	'Remove' => 'حذف',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'حداکثر تعداد فیلدهای مجاز اشباع شد. لطفا %s را افزایش دهید.',
-	
+
 	'Partition by' => 'بخشبندی توسط',
 	'Partitions' => 'بخشبندیها',
 	'Partition name' => 'نام بخش',
 	'Values' => 'مقادیر',
-	
+
 	'View' => 'نمایش',
 	'Materialized view' => 'نمایه مادی',
 	'View has been dropped.' => 'نمایش حذف شد.',
@@ -186,14 +186,14 @@ $translations = array(
 	'View has been created.' => 'نمایش ایجاد شد.',
 	'Alter view' => 'حذف نمایش',
 	'Create view' => 'ایجاد نمایش',
-	
+
 	'Indexes' => 'ایندکسها',
 	'Indexes have been altered.' => 'ایندکسها ویرایش شدند.',
 	'Alter indexes' => 'ویرایش ایندکسها',
 	'Add next' => 'افرودن بعدی',
 	'Index Type' => 'نوع ایندکس',
 	'Column (length)' => 'ستون (طول)',
-	
+
 	'Foreign keys' => 'کلیدهای خارجی',
 	'Foreign key' => 'کلید خارجی',
 	'Foreign key has been dropped.' => 'کلید خارجی حذف شد.',
@@ -209,7 +209,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'داده مبدا و مقصد ستونها بایستی شبیه هم باشند.',
-	
+
 	'Triggers' => 'تریگرها',
 	'Add trigger' => 'افزودن تریگر',
 	'Trigger has been dropped.' => 'تریگر حذف شد.',
@@ -220,7 +220,7 @@ $translations = array(
 	'Time' => 'زمان',
 	'Event' => 'رویداد',
 	'Name' => 'نام',
-	
+
 	'select' => 'انتخاب',
 	'Select' => 'انتخاب',
 	'Select data' => 'انتخاب داده',
@@ -246,16 +246,16 @@ $translations = array(
 	'Loading' => 'در حال بارگزاری',
 	'Whole result' => 'همه نتایج',
 	'%d byte(s)' => array('%d بایت', '%d بایت'),
-	
+
 	'Import' => 'وارد کردن',
 	'%d row(s) have been imported.' => array('%d سطر وارد شد.', '%d سطر وارد شد.'),
 	'File must be in UTF-8 encoding.' => 'فرمت فایل باید UTF-8 باشید.',
-	
+
 	// in-place editing in select
 	'Modify' => 'ویرایش',
 	'Ctrl+click on a value to modify it.' => 'برای ویرایش بر روی مقدار ctrl+click کنید.',
 	'Use edit link to modify this value.' => 'از لینک ویرایش برای ویرایش این مقدار استفاده کنید.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => '%s آیتم درج شد.',
 	'Item has been deleted.' => 'آیتم حذف شد.',
@@ -275,14 +275,14 @@ $translations = array(
 	'Clone' => 'تکثیر',
 	'Delete' => 'حذف',
 	'You have no privileges to update this table.' => 'شما اختیار ویرایش این جدول را ندارید.',
-	
+
 	'E-mail' => 'پست الکترونیک',
 	'From' => 'فرستنده',
 	'Subject' => 'موضوع',
 	'Attachments' => 'پیوست ها',
 	'Send' => 'ارسال',
 	'%d e-mail(s) have been sent.' => array('%d ایمیل ارسال شد.', '%d ایمیل ارسال شد.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'اعداد',
 	'Date and time' => 'تاریخ و زمان',
@@ -292,7 +292,7 @@ $translations = array(
 	'Network' => 'شبکه',
 	'Geometry' => 'هندسه',
 	'Relations' => 'رابطه ها',
-	
+
 	'Editor' => 'ویرایشگر',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',
@@ -307,7 +307,7 @@ $translations = array(
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'فایل موجود است.',
 	'Please use one of the extensions %s.' => 'لطفا یکی از پسوندها را انتخاب نمائید %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'ویرایش ساختار',
 	'Create schema' => 'ایجاد ساختار',
@@ -316,7 +316,7 @@ $translations = array(
 	'Schema has been altered.' => 'ساختار ویرایش شد.',
 	'Schema' => 'ساختار',
 	'Invalid schema.' => 'ساختار نامعتبر.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'صف ها',
 	'Create sequence' => 'ایجاد صف',
@@ -324,11 +324,35 @@ $translations = array(
 	'Sequence has been created.' => 'صف ایجاد شد.',
 	'Sequence has been altered.' => 'صف ویرایش شد.',
 	'Alter sequence' => 'ویرایش صف',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'انواع کاربر',
 	'Create type' => 'ایجاد نوع',
 	'Type has been dropped.' => 'نوع حذف شد.',
 	'Type has been created.' => 'نوع ایجاد شد.',
 	'Alter type' => 'ویرایش نوع',
+
+	'Drop %s?' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/fi.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logout' => 'Kirjaudu ulos',
 	'Logged as: %s' => 'Olet kirjautunut käyttäjänä: %s',
 	'Logout successful.' => 'Uloskirjautuminen onnistui.',
-	'Invalid credentials.' => 'Virheelliset kirjautumistiedot.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Liian monta epäonnistunutta sisäänkirjautumisyritystä, kokeile uudestaan %d minuutin kuluttua.', 'Liian monta epäonnistunutta sisäänkirjautumisyritystä, kokeile uudestaan %d minuutin kuluttua.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-salasana ei ole enää voimassa. <a href="https://www.adminer.org/en/extension/"%s>Toteuta</a> %s-metodi sen tekemiseksi pysyväksi.',
 	'Language' => 'Kieli',
@@ -22,10 +22,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Istunto vanhentunut, kirjaudu uudelleen.',
 	'%s version: %s through PHP extension %s' => '%s versio: %s PHP-laajennuksella %s',
 	'Refresh' => 'Virkistä',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Oikeudet',
 	'Create user' => 'Luo käyttäjä',
 	'User has been dropped.' => 'Käyttäjä poistettiin.',
@@ -36,14 +36,14 @@ $translations = array(
 	'Routine' => 'Rutiini',
 	'Grant' => 'Myönnä',
 	'Revoke' => 'Kiellä',
-	
+
 	'Process list' => 'Prosessilista',
 	'%d process(es) have been killed.' => array('%d prosessi lopetettu.', '%d prosessia lopetettu..'),
 	'Kill' => 'Lopeta',
-	
+
 	'Variables' => 'Muuttujat',
 	'Status' => 'Tila',
-	
+
 	'SQL command' => 'SQL-komento',
 	'%d query(s) executed OK.' => array('%d kysely onnistui.', '%d kyselyä onnistui.'),
 	'Query executed OK, %d row(s) affected.' => array('Kysely onnistui, kohdistui %d riviin.', 'Kysely onnistui, kohdistui %d riviin.'),
@@ -57,7 +57,7 @@ $translations = array(
 	'History' => 'Historia',
 	'Clear' => 'Tyhjennä',
 	'Edit all' => 'Muokkaa kaikkia',
-	
+
 	'File upload' => 'Tiedoston lataus palvelimelle',
 	'From server' => 'Verkkopalvelimella Adminer-kansiossa oleva tiedosto',
 	'Webserver file %s' => 'Verkkopalvelintiedosto %s',
@@ -69,7 +69,7 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Liian suuri POST-datamäärä. Pienennä dataa tai kasvata arvoa %s konfigurointitiedostossa.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Voit ladata suuren SQL-tiedoston FTP:n kautta ja tuoda sen sitten palvelimelta.',
 	'You are offline.' => 'Olet offline-tilassa.',
-	
+
 	'Export' => 'Vienti',
 	'Output' => 'Tulos',
 	'open' => 'avaa',
@@ -77,7 +77,7 @@ $translations = array(
 	'Saving' => 'Tallennetaan',
 	'Format' => 'Muoto',
 	'Data' => 'Data',
-	
+
 	'Database' => 'Tietokanta',
 	'database' => 'tietokanta',
 	'Use' => 'Käytä',
@@ -91,10 +91,10 @@ $translations = array(
 	'Alter database' => 'Muuta tietokantaa',
 	'Create database' => 'Luo tietokanta',
 	'Database schema' => 'Tietokantakaava',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Pysyvä linkki',
-	
+
 	// thousands separator - must contain single byte
 	',' => ',',
 	'0123456789' => '0123456789',
@@ -117,7 +117,7 @@ $translations = array(
 	'Tables have been moved.' => 'Taulut on siirretty.',
 	'Copy' => 'Kopioi',
 	'Tables have been copied.' => 'Taulut on kopioitu.',
-	
+
 	'Routines' => 'Rutiinit',
 	'Routine has been called, %d row(s) affected.' => array('Rutiini kutsuttu, kohdistui %d riviin.', 'Rutiini kutsuttu, kohdistui %d riviin.'),
 	'Call' => 'Kutsua',
@@ -130,7 +130,7 @@ $translations = array(
 	'Alter function' => 'Muuta funktiota',
 	'Alter procedure' => 'Muuta proseduuria',
 	'Return type' => 'Palautustyyppi',
-	
+
 	'Events' => 'Tapahtumat',
 	'Event has been dropped.' => 'Tapahtuma on poistettu.',
 	'Event has been altered.' => 'Tapahtumaa on muutettu.',
@@ -143,7 +143,7 @@ $translations = array(
 	'Start' => 'Aloitus',
 	'End' => 'Lopetus',
 	'On completion preserve' => 'Säilytä, kun valmis',
-	
+
 	'Tables' => 'Taulut',
 	'Tables and views' => 'Taulut ja näkymät',
 	'Table' => 'Taulu',
@@ -175,12 +175,12 @@ $translations = array(
 	'Move down' => 'Siirrä alas',
 	'Remove' => 'Poista',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Kenttien sallittu enimmäismäärä ylitetty. Kasvata arvoa %s.',
-	
+
 	'Partition by' => 'Osioi arvolla',
 	'Partitions' => 'Osiot',
 	'Partition name' => 'Osion nimi',
 	'Values' => 'Arvot',
-	
+
 	'View' => 'Näkymä',
 	'Materialized view' => 'Materialisoitunut näkymä',
 	'View has been dropped.' => 'Näkymä on poistettu.',
@@ -188,14 +188,14 @@ $translations = array(
 	'View has been created.' => 'Näkymä on luotu.',
 	'Alter view' => 'Muuta näkymää',
 	'Create view' => 'Luo näkymä',
-	
+
 	'Indexes' => 'Indeksit',
 	'Indexes have been altered.' => 'Indeksejä on muutettu.',
 	'Alter indexes' => 'Muuta indeksejä',
 	'Add next' => 'Lisää seuraava',
 	'Index Type' => 'Indeksityyppi',
 	'Column (length)' => 'Sarake (pituus)',
-	
+
 	'Foreign keys' => 'Vieraat avaimet',
 	'Foreign key' => 'Vieras avain',
 	'Foreign key has been dropped.' => 'Vieras avain on poistettu.',
@@ -211,7 +211,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Lähde- ja kohdesarakkeiden tulee olla samaa tietotyyppiä, kohdesarakkeisiin tulee olla indeksi ja dataa, johon viitataan, täytyy olla.',
-	
+
 	'Triggers' => 'Liipaisimet',
 	'Add trigger' => 'Lisää liipaisin',
 	'Trigger has been dropped.' => 'Liipaisin on poistettu.',
@@ -222,7 +222,7 @@ $translations = array(
 	'Time' => 'Aika',
 	'Event' => 'Tapahtuma',
 	'Name' => 'Nimi',
-	
+
 	'select' => 'valitse',
 	'Select' => 'Valitse',
 	'Select data' => 'Valitse data',
@@ -248,16 +248,16 @@ $translations = array(
 	'Loading' => 'Ladataan',
 	'Whole result' => 'Koko tulos',
 	'%d byte(s)' => array('%d tavu', '%d tavua'),
-	
+
 	'Import' => 'Tuonti',
 	'%d row(s) have been imported.' => array('%d rivi tuotiin.', '%d riviä tuotiin.'),
 	'File must be in UTF-8 encoding.' => 'Tiedoston täytyy olla UTF-8-muodossa.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Muuta',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+napsauta arvoa muuttaaksesi.',
 	'Use edit link to modify this value.' => 'Käytä muokkaa-linkkiä muuttaaksesi tätä arvoa.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Tietue%s lisättiin.',
 	'Item has been deleted.' => 'Tietue poistettiin.',
@@ -277,14 +277,14 @@ $translations = array(
 	'Clone' => 'Kloonaa',
 	'Delete' => 'Poista',
 	'You have no privileges to update this table.' => 'Sinulla ei ole oikeutta päivittää tätä taulua.',
-	
+
 	'E-mail' => 'S-posti',
 	'From' => 'Lähettäjä',
 	'Subject' => 'Aihe',
 	'Attachments' => 'Liitteet',
 	'Send' => 'Lähetä',
 	'%d e-mail(s) have been sent.' => array('% sähköpostiviestiä lähetetty.', '% sähköpostiviestiä lähetetty.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Numerot',
 	'Date and time' => 'Päiväys ja aika',
@@ -294,7 +294,7 @@ $translations = array(
 	'Network' => 'Verkko',
 	'Geometry' => 'Geometria',
 	'Relations' => 'Suhteet',
-	
+
 	'Editor' => 'Editori',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$5.$3.$1',
@@ -305,11 +305,11 @@ $translations = array(
 	'now' => 'nyt',
 	'yes' => 'kyllä',
 	'no' => 'ei',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Tiedosto on olemassa.',
 	'Please use one of the extensions %s.' => 'Käytä jotain %s-laajennuksista.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Muuta kaavaa',
 	'Create schema' => 'Luo kaava',
@@ -318,7 +318,7 @@ $translations = array(
 	'Schema has been altered.' => 'Kaavaa muutettiin.',
 	'Schema' => 'Kaava',
 	'Invalid schema.' => 'Kaava ei kelpaa.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekvenssit',
 	'Create sequence' => 'Luo sekvenssi',
@@ -326,7 +326,7 @@ $translations = array(
 	'Sequence has been created.' => 'Sekvenssi on luotu.',
 	'Sequence has been altered.' => 'Sekvenssiä on muutettu.',
 	'Alter sequence' => 'Muuta sekvenssiä',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Käyttäjän tyypit',
 	'Create type' => 'Luo tyyppi',
@@ -347,4 +347,12 @@ $translations = array(
 	'Unknown error.' => 'Tuntematon virhe.',
 	'Database does not support password.' => 'Tietokanta ei tue salasanaa.',
 	'Disable %s or enable %s or %s extensions.' => 'Poista käytöstä %s tai ota käyttöön laajennus %s tai %s.',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Kyllä',
+	'No' => 'Ei',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/fr.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Authentification',
 	'Logout successful.' => 'Au revoir !',
-	'Invalid credentials.' => 'Authentification échouée.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Serveur',
 	'Username' => 'Utilisateur',
 	'Password' => 'Mot de passe',
@@ -288,4 +288,26 @@ $translations = array(
 	'Default value' => 'Valeur par défaut',
 	'If you did not send this request from Adminer then close this page.' => 'Si vous n\'avez pas envoyé cette requête depuis Adminer, alors fermez cette page.',
 	'You are offline.' => 'Vous êtes hors ligne.',
+
+	'Drop %s?' => 'Supprimer %s?',
+	'overwrite' => 'écraser',
+	'DB' => 'BD',
+	'ATTACH queries are not supported.' => 'Requêtes ATTACH ne sont pas supportées.',
+	'Warnings' => 'Avertissements',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer ne supporte pas l\'accès aux bases de données sans mot de passe, <a href="https://www.adminer.org/en/password/"%s>plus d\'information</a>.',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => 'Cette action sera exécutée après s\'être connecté avec les mêmes données de connexion.',
+	'Connecting to privileged ports is not allowed.' => 'La connexion aux ports privilégiés n\'est pas autorisée.',
+	'There is a space in the input password which might be the cause.' => 'Il y a un espace dans le mot de passe entré qui pourrait en être la cause.',
+	'Unknown error.' => 'Erreur inconnue',
+	'Database does not support password.' => 'La base de données ne support pas les mots de passe',
+	'Disable %s or enable %s or %s extensions.' => 'Désactiver %s ou activer %s or %s extensions.',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Oui',
+	'No' => 'Non',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/gl.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Conectar',
 	'Logout successful.' => 'Pechouse a sesión con éxito.',
-	'Invalid credentials.' => 'Credenciais (usuario e/ou contrasinal) inválidos.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Servidor',
 	'Username' => 'Usuario',
 	'Password' => 'Contrasinal',
@@ -288,4 +288,26 @@ $translations = array(
 	'Saving' => 'Gardando',
 	'yes' => 'si',
 	'no' => 'non',
+
+	'Drop %s?' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Si',
+	'No' => 'Non',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/he.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'התחברות',
 	'Logout successful.' => 'ההתחברות הצליחה',
-	'Invalid credentials.' => 'פרטי התחברות שגויים',
+	'Invalid server or credentials.' => null,
 	'Server' => 'שרת',
 	'Username' => 'שם משתמש',
 	'Password' => 'סיסמה',
@@ -290,4 +290,24 @@ $translations = array(
 	'Saving' => 'שומר',
 	'yes' => 'כן',
 	'no' => 'לא',
+
+	'Drop %s?' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/hu.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Belépés',
 	'Logout successful.' => 'Sikeres kilépés.',
-	'Invalid credentials.' => 'Érvénytelen adatok.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Szerver',
 	'Username' => 'Felhasználó',
 	'Password' => 'Jelszó',
@@ -264,4 +264,50 @@ $translations = array(
 	'Permanent link' => 'Hivatkozás',
 	'Edit all' => 'Összes szerkesztése',
 	'HH:MM:SS' => 'óó:pp:mm',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/id.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logout' => 'Keluar',
 	'Logged as: %s' => 'Masuk sebagai: %s',
 	'Logout successful.' => 'Berhasil keluar.',
-	'Invalid credentials.' => 'Akses tidak sah.',
+	'Invalid server or credentials.' => null,
 	'Language' => 'Bahasa',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF tidak sah. Kirim ulang formulir.',
 	'No extension' => 'Ekstensi tidak ada',
@@ -313,4 +313,46 @@ $translations = array(
 	'Type has been dropped.' => 'Jenis berhasil dihapus.',
 	'Type has been created.' => 'Jenis berhasil dibuat.',
 	'Alter type' => 'Ubah jenis',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/it.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Autenticazione',
 	'Logout successful.' => 'Uscita effettuata con successo.',
-	'Invalid credentials.' => 'Credenziali non valide.',
+	'Invalid server or credentials.' => 'Server o credenziali non valide.',
 	'Server' => 'Server',
 	'Username' => 'Utente',
 	'Password' => 'Password',
@@ -265,4 +265,49 @@ $translations = array(
 	'Permanent link' => 'Link permanente',
 	'Edit all' => 'Modifica tutto',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => 'Scartare %s?',
+	'Tables have been optimized.' => 'Le tabelle sono state ottimizzate',
+	'Materialized view' => 'Vista materializzata',
+	'Vacuum' => 'Aspira',
+	'Selected' => 'Selezionato',
+	'overwrite' => 'sovrascrivi',
+	'DB' => 'DB',
+	'File must be in UTF-8 encoding.' => 'Il file deve avere codifica UTF-8.',
+	'Modify' => 'Modifica',
+	'Load more data' => 'Carica piú dati',
+	'Loading' => 'Caricamento',
+	'ATTACH queries are not supported.' => 'ATTACH queries non sono supportate.',
+	'Warnings' => 'Attenzione',
+	'%d / ' => array('%d / '),
+	'Limit rows' => 'Limite righe',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer non supporta accesso a databse senza password, <a href="https://www.adminer.org/it/password/"%s>piú informazioni</a>.',
+	'Default value' => 'Valore predefinito',
+	'Full table scan' => 'Analizza intera tabella',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Troppi tentativi infruttuosi di login, si prega di riprovare in %d minuto.', 'Troppi tentativi infruttuosi di login, si prega di riprovare in %d minuti.'),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'La password principale é scaduta. <a href="https://www.adminer.org/it/extension/"%s>Implementare</a> %s come metodo per renderla permanente.',
+	'The action will be performed after successful login with the same credentials.' => 'La azione verrá eseguita dopo un login valido con le stesse credenziali.',
+	'Connecting to privileged ports is not allowed.' => 'LA connessione a porte privilegiate non é permessa.',
+	'There is a space in the input password which might be the cause.' => 'Esiste uno spazio nella passoword inserita che potrebbe essere la causa.',
+	'If you did not send this request from Adminer then close this page.' => 'Se non hai inviato tu la richiesta tramite Adminer puoi chiudere la pagina.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Puoi caricare un grande file SQL tramite FTP ed impirtarlo dal server.',
+	'Size' => 'Taglia',
+	'Compute' => 'Elabora',
+	'You are offline.' => 'Sei disconnesso.',
+	'You have no privileges to update this table.' => 'Non hai i privilegi per aggiornare questa tabella.',
+	'Saving' => 'Salvataggio',
+	'Unknown error.' => 'Errore sconosciuto',
+	'Database does not support password.' => 'Il database non supporta password.',
+	'Disable %s or enable %s or %s extensions.' => 'Disabilita %s o abilita %s oppure %s estensioni.',
+	'yes' => 'si',
+	'no' => 'no',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Si',
+	'No' => 'No',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/ja.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'ログイン',
 	'Logout successful.' => 'ログアウト',
-	'Invalid credentials.' => '不正なログイン',
+	'Invalid server or credentials.' => null,
 	'Server' => 'サーバ',
 	'Username' => 'ユーザ名',
 	'Password' => 'パスワード',
@@ -274,4 +274,40 @@ $translations = array(
 	'yes' => 'はい',
 	'no' => 'いいえ',
 	'Default value' => '既定値',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/ka.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'შესვლა',
 	'Logout successful.' => 'გამოხვედით სისტემიდან.',
-	'Invalid credentials.' => 'არასწორი მომხმარებელი ან პაროლი.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'სერვერი',
 	'Username' => 'მომხმარებელი',
 	'Password' => 'პაროლი',
@@ -300,4 +300,14 @@ $translations = array(
 	'Unknown error.' => 'უცნობი შეცდომა.',
 	'Database does not support password.' => 'ბაზაში არაა მხარდაჭერილი პაროლი.',
 	'Disable %s or enable %s or %s extensions.' => 'გათიშეთ %s ან ჩართეთ %s ან %s გაფართოება.',
+
+	'overwrite' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/ko.inc.php

@@ -121,7 +121,7 @@ $translations = array(
 	'Indexes have been altered.' => '색인을 변경했습니다.',
 	'Indexes' => '색인',
 	'Insert' => '삽입',
-	'Invalid credentials.' => '잘못된 로그인',
+	'Invalid server or credentials.' => null,
 	'Invalid CSRF token. Send the form again.' => '잘못된 CSRF 토큰입니다. 다시 보내주십시오.',
 	'Invalid database.' => '잘못된 데이터베이스입니다.',
 	'Invalid schema.' => '잘못된 스키마입니다.',
@@ -277,4 +277,37 @@ $translations = array(
 	'You are offline.' => '오프라인입니다.',
 	'You can upload a big SQL file via FTP and import it from server.' => '큰 SQL 파일은 FTP를 통하여 업로드하여 서버에서 가져올 수 있습니다.',
 	'You have no privileges to update this table.' => '이 테이블을 업데이트할 권한이 없습니다.',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'User types' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'ATTACH queries are not supported.' => null,
+	'%d / ' => array(),
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/lt.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logout' => 'Atsijungti',
 	'Logged as: %s' => 'Prisijungęs kaip: %s',
 	'Logout successful.' => 'Jūs atsijungėte nuo sistemos.',
-	'Invalid credentials.' => 'Neteisingi prisijungimo duomenys.',
+	'Invalid server or credentials.' => null,
 	'Language' => 'Kalba',
 	'Invalid CSRF token. Send the form again.' => 'Neteisingas CSRF tokenas. Bandykite siųsti formos duomenis dar kartą.',
 	'No extension' => 'Nėra plėtiio',
@@ -19,10 +19,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Sesijos galiojimas baigėsi. Prisijunkite iš naujo.',
 	'%s version: %s through PHP extension %s' => '%s versija: %s per PHP plėtinį %s',
 	'Refresh' => 'Atnaujinti',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Privilegijos',
 	'Create user' => 'Sukurti vartotoją',
 	'User has been dropped.' => 'Vartotojas ištrintas.',
@@ -33,14 +33,14 @@ $translations = array(
 	'Routine' => 'Procedūra',
 	'Grant' => 'Suteikti',
 	'Revoke' => 'Atšaukti',
-	
+
 	'Process list' => 'Procesų sąrašas',
 	'%d process(es) have been killed.' => array('%d procesas nutrauktas.', '%d procesai nutraukti.', '%d procesų nutraukta.'),
 	'Kill' => 'Nutraukti',
-	
+
 	'Variables' => 'Kintamieji',
 	'Status' => 'Būsena',
-	
+
 	'SQL command' => 'SQL užklausa',
 	'%d query(s) executed OK.' => array('%d užklausa įvykdyta.', '%d užklausos įvykdytos.', '%d užklausų įvykdyta.'),
 	'Query executed OK, %d row(s) affected.' => array('Užklausa įvykdyta. Pakeistas %d įrašas.', 'Užklausa įvykdyta. Pakeisti %d įrašai.', 'Užklausa įvykdyta. Pakeista %d įrašų.'),
@@ -54,7 +54,7 @@ $translations = array(
 	'History' => 'Istorija',
 	'Clear' => 'Išvalyti',
 	'Edit all' => 'Redaguoti visus',
-	
+
 	'File upload' => 'Failo įkėlimas',
 	'From server' => 'Iš serverio',
 	'Webserver file %s' => 'Failas %s iš serverio',
@@ -64,14 +64,14 @@ $translations = array(
 	'Unable to upload a file.' => 'Nepavyko įkelti failo.',
 	'Maximum allowed file size is %sB.' => 'Maksimalus failo dydis - %sB.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Per daug POST duomenų. Sumažinkite duomenų kiekį arba padidinkite konfigūracijos nustatymą %s.',
-	
+
 	'Export' => 'Eksportas',
 	'Output' => 'Išvestis',
 	'open' => 'atidaryti',
 	'save' => 'išsaugoti',
 	'Format' => 'Formatas',
 	'Data' => 'Duomenys',
-	
+
 	'Database' => 'Duomenų bazė',
 	'database' => 'duomenų bazė',
 	'Use' => 'Naudoti',
@@ -85,10 +85,10 @@ $translations = array(
 	'Alter database' => 'Redaguoti duomenų bazę',
 	'Create database' => 'Sukurti duomenų bazę',
 	'Database schema' => 'Duomenų bazės schema',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Pastovi nuoroda',
-	
+
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -110,7 +110,7 @@ $translations = array(
 	'Tables have been moved.' => 'Lentelės perkeltos.',
 	'Copy' => 'Kopijuoti',
 	'Tables have been copied.' => 'Lentelės nukopijuotos.',
-	
+
 	'Routines' => 'Procedūros',
 	'Routine has been called, %d row(s) affected.' => array('Procedūra įvykdyta. %d įrašas pakeistas.', 'Procedūra įvykdyta. %d įrašai pakeisti.', 'Procedūra įvykdyta. %d įrašų pakeista.'),
 	'Call' => 'Vykdyti',
@@ -123,7 +123,7 @@ $translations = array(
 	'Alter function' => 'Keisti funkciją',
 	'Alter procedure' => 'Keiskti procedūrą',
 	'Return type' => 'Grąžinimo tipas',
-	
+
 	'Events' => 'Įvykiai',
 	'Event has been dropped.' => 'Įvykis pašalintas.',
 	'Event has been altered.' => 'Įvykis pakeistas.',
@@ -136,7 +136,7 @@ $translations = array(
 	'Start' => 'Pradžia',
 	'End' => 'Pabaiga',
 	'On completion preserve' => 'Įvykdžius išsaugoti',
-	
+
 	'Tables' => 'Lentelės',
 	'Tables and views' => 'Lentelės ir vaizdai',
 	'Table' => 'Lentelė',
@@ -164,26 +164,26 @@ $translations = array(
 	'Move down' => 'Perkelti žemyn',
 	'Remove' => 'Pašalinti',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Viršytas maksimalus leidžiamų stulpelių kiekis. Padidinkite %s.',
-	
+
 	'Partition by' => 'Skirstyti pagal',
 	'Partitions' => 'Skirsniai',
 	'Partition name' => 'Skirsnio pavadinimas',
 	'Values' => 'Reikšmės',
-	
+
 	'View' => 'Vaizdas',
 	'View has been dropped.' => 'Vaizdas pašalintas.',
 	'View has been altered.' => 'Vaizdas pakeistas.',
 	'View has been created.' => 'Vaizdas sukurtas.',
 	'Alter view' => 'Redaguoti vaizdą',
 	'Create view' => 'Sukurti vaizdą',
-	
+
 	'Indexes' => 'Indeksai',
 	'Indexes have been altered.' => 'Indeksai pakeisti.',
 	'Alter indexes' => 'Redaguoti indeksus',
 	'Add next' => 'Pridėti kitą',
 	'Index Type' => 'Indekso tipas',
 	'Column (length)' => 'Stulpelis (ilgis)',
-	
+
 	'Foreign keys' => 'Išoriniai raktai',
 	'Foreign key' => 'Išorinis raktas',
 	'Foreign key has been dropped.' => 'Išorinis raktas pašalintas.',
@@ -199,7 +199,7 @@ $translations = array(
 	'ON DELETE' => 'Ištrinant',
 	'ON UPDATE' => 'Atnaujinant',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Šaltinio ir tikslinis stulpelis turi būti to paties tipo, tiksliniame stulpelyje turi būti naudojamas indeksas ir duomenys turi egzistuoti.',
-	
+
 	'Triggers' => 'Trigeriai',
 	'Add trigger' => 'Pridėti trigerį',
 	'Trigger has been dropped.' => 'Trigeris pašalintas.',
@@ -210,7 +210,7 @@ $translations = array(
 	'Time' => 'Laikas',
 	'Event' => 'Įvykis',
 	'Name' => 'Pavadinimas',
-	
+
 	'select' => 'atrinkti',
 	'Select' => 'Atrinkti',
 	'Select data' => 'Atrinkti duomenis',
@@ -231,13 +231,13 @@ $translations = array(
 	'last' => 'paskutinis',
 	'Whole result' => 'Visas rezultatas',
 	'%d byte(s)' => array('%d baitas', '%d baigai', '%d baitų'),
-	
+
 	'Import' => 'Importas',
 	'%d row(s) have been imported.' => array('%d įrašas įkelta.', '%d įrašai įkelti.', '%d įrašų įkelta.'),
-	
+
 	// in-place editing in select
 	'Use edit link to modify this value.' => 'Norėdami redaguoti reikšmę naudokite redagavimo nuorodą.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Įrašas%s sukurtas.',
 	'Item has been deleted.' => 'Įrašas ištrintas.',
@@ -255,14 +255,14 @@ $translations = array(
 	'Save and insert next' => 'Išsaugoti ir įrašyti kitą',
 	'Clone' => 'Klonuoti',
 	'Delete' => 'Trinti',
-	
+
 	'E-mail' => 'El. paštas',
 	'From' => 'Nuo',
 	'Subject' => 'Antraštė',
 	'Attachments' => 'Priedai',
 	'Send' => 'Siųsti',
 	'%d e-mail(s) have been sent.' => array('Išsiųstas %d laiškas.', 'Išsiųsti %d laiškai.', 'Išsiųsta %d laiškų.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Skaičiai',
 	'Date and time' => 'Data ir laikas',
@@ -272,7 +272,7 @@ $translations = array(
 	'Network' => 'Tinklas',
 	'Geometry' => 'Geometrija',
 	'Relations' => 'Ryšiai',
-	
+
 	'Editor' => 'Redaktorius',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',
@@ -281,11 +281,11 @@ $translations = array(
 	// hint for time format - use language equivalents for hour, minute and second shortcuts
 	'HH:MM:SS' => 'HH:MM:SS',
 	'now' => 'dabar',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Failas egzistuoja.',
 	'Please use one of the extensions %s.' => 'Naudokite vieną iš plėtinių %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Keisti schemą',
 	'Create schema' => 'Sukurti schemą',
@@ -294,7 +294,7 @@ $translations = array(
 	'Schema has been altered.' => 'Schema pakeista.',
 	'Schema' => 'Schema',
 	'Invalid schema.' => 'Neteisinga schema.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekos',
 	'Create sequence' => 'Sukurti seką',
@@ -302,11 +302,57 @@ $translations = array(
 	'Sequence has been created.' => 'Seka sukurta.',
 	'Sequence has been altered.' => 'Seka pakeista.',
 	'Alter sequence' => 'Keisti seką',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Vartotojų tipai',
 	'Create type' => 'Sukurti tipą',
 	'Type has been dropped.' => 'Tipas pašalintas.',
 	'Type has been created.' => 'Tipas sukurtas.',
 	'Alter type' => 'Keisti tipą',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/lv.inc.php

@@ -0,0 +1,313 @@
+<?php
+$translations = array(
+	'Login' => 'Ieiet',
+	'Logout successful.' => 'Jūs veiksmīgi izgājāt no sistēmas.',
+	'Invalid server or credentials.' => null,
+	'Server' => 'Serveris',
+	'Username' => 'Lietotājs',
+	'Password' => 'Parole',
+	'Select database' => 'Izvēlēties datubāzi',
+	'Invalid database.' => 'Nederīga datubāze.',
+	'Table has been dropped.' => 'Tabula dzēsta.',
+	'Table has been altered.' => 'Tabula mainīta.',
+	'Table has been created.' => 'Tabula izveidota.',
+	'Alter table' => 'Mainīt tabulu',
+	'Create table' => 'Izveidot tabulu',
+	'Table name' => 'Tabulas nosaukums',
+	'engine' => 'Tabulas tips',
+	'collation' => 'Kolācija',
+	'Column name' => 'Lauka nosaukums',
+	'Type' => 'Tips',
+	'Length' => 'Garums',
+	'Auto Increment' => 'Auto inkrements',
+	'Options' => 'Opcijas',
+	'Save' => 'Saglabāt',
+	'Drop' => 'Dzēst',
+	'Database has been dropped.' => 'Datubāze tika nodzēsta.',
+	'Database has been created.' => 'Datubāze tika izveidota.',
+	'Database has been renamed.' => 'Datubāze tika pārsaukta.',
+	'Database has been altered.' => 'Datubāze tika mainīta.',
+	'Alter database' => 'Mainīt datubāzi',
+	'Create database' => 'Izveidot datubāzi',
+	'SQL command' => 'SQL pieprasījums',
+	'Logout' => 'Iziet',
+	'database' => 'datubāze',
+	'Use' => 'Lietot',
+	'No tables.' => 'Datubāzē nav tabulu.',
+	'select' => 'izvēlēties',
+	'Item has been deleted.' => 'Ieraksts dzests.',
+	'Item has been updated.' => 'Ieraksts atjaunots.',
+	'Item%s has been inserted.' => 'Ieraksti tika ievietoti.',
+	'Edit' => 'Rediģēt',
+	'Insert' => 'Ievietot',
+	'Save and insert next' => 'Saglabāt un ievietot nākamo',
+	'Delete' => 'Dzēst',
+	'Database' => 'Datubāze',
+	'Routines' => 'Procedūras un funkcijas',
+	'Indexes have been altered.' => 'Indeksi mainīti.',
+	'Indexes' => 'Indeksi',
+	'Alter indexes' => 'Izmainīt indeksus',
+	'Add next' => 'Pievienot vēl',
+	'Language' => 'Valoda',
+	'Select' => 'Izvēlēties',
+	'New item' => 'Jauns ieraksts',
+	'Search' => 'Meklēšana',
+	'Sort' => 'Kārtošana',
+	'descending' => 'dilstoši',
+	'Limit' => 'Limits',
+	'No rows.' => 'Nav rindu.',
+	'Action' => 'Darbība',
+	'edit' => 'rediģēt',
+	'Page' => 'Lapa',
+	'Query executed OK, %d row(s) affected.' => array('Pieprasījums pabeigts, izmainīts %d ieraksts.', 'Pieprasījums pabeigts, izmainīti %d ieraksti.', 'Pieprasījums pabeigts, izmainīti %d ieraksti.'),
+	'Error in query' => 'Kļūda pieprasījumā',
+	'Execute' => 'Izpidīt',
+	'Table' => 'Tabula',
+	'Foreign keys' => 'Ārejā atslēgas',
+	'Triggers' => 'Trigeri',
+	'View' => 'Skats',
+	'Unable to select the table' => 'Tabula nav pieejama',
+	'Invalid CSRF token. Send the form again.' => 'Nederīgs CSRF žetons. Nosūtiet formu vēl vienu reizi.',
+	'Comment' => 'Komentārs',
+	'Default values' => 'Noklusētā vērtība',
+	'%d byte(s)' => array('%d baits', '%d baiti', '%d baiti'),
+	'No commands to execute.' => 'Nav izpildāmu komandu.',
+	'Unable to upload a file.' => 'Neizdevās ielādēt failu uz servera.',
+	'File upload' => 'Augšupielāde',
+	'File uploads are disabled.' => 'Augšupielādes aizliegtas.',
+	'Routine has been called, %d row(s) affected.' => array('Procedūra izsaukta, izmainīts %d ieraksts.', 'Procedūra izsaukta, izmainīti %d ieraksti.', 'Procedūra izsaukta, izmainīti %d ieraksti.'),
+	'Call' => 'Izsaukt',
+	'No extension' => 'Nav paplašinājuma',
+	'None of the supported PHP extensions (%s) are available.' => 'Neviens PHP no atbalstītajiem paplašinājumiem (%s) nav pieejams.',
+	'Session support must be enabled.' => 'Sesiju atbalstam jābūt ieslēgtam.',
+	'Session expired, please login again.' => 'Sesijas laiks ir beidzies, piesakies no jauna sistēmā.',
+	'Text length' => 'Teksta garums',
+	'Foreign key has been dropped.' => 'Ārejā atslēga dzēsta.',
+	'Foreign key has been altered.' => 'Ārejā atslēga izmainīta.',
+	'Foreign key has been created.' => 'Ārejā atslēga izveidota.',
+	'Foreign key' => 'Ārejā atslēga',
+	'Target table' => 'Mērķa tabula',
+	'Change' => 'Mainīt',
+	'Source' => 'Avots',
+	'Target' => 'Mērķis',
+	'Add column' => 'Pievienot lauku',
+	'Alter' => 'Izmainīt',
+	'Add foreign key' => 'Pievienot ārējo atslēgu',
+	'ON DELETE' => 'Pie dzēšanas',
+	'ON UPDATE' => 'Pie atjaunošanas',
+	'Index Type' => 'Indeksa tips',
+	'Column (length)' => 'Lauks (garums)',
+	'View has been dropped.' => 'Skats dzēsts.',
+	'View has been altered.' => 'Skats izmainīts.',
+	'View has been created.' => 'Skats izveidots.',
+	'Alter view' => 'Izmainīt skatu',
+	'Create view' => 'Izveidot skatu',
+	'Name' => 'Nosaukums',
+	'Process list' => 'Procesu saraksts',
+	'%d process(es) have been killed.' => array('Pabeigts %d process.', 'Pabeigti %d procesi.', 'Pabeigti %d procesi.'),
+	'Kill' => 'Nobeigt',
+	'Parameter name' => 'Parametra nosaukums',
+	'Database schema' => 'Datubāzes shēma',
+	'Create procedure' => 'Izveidot procedūru',
+	'Create function' => 'Izveidot funkciju',
+	'Routine has been dropped.' => 'Procedūru dzēsta.',
+	'Routine has been altered.' => 'Procedūru izmainīta.',
+	'Routine has been created.' => 'Procedūru izveidota.',
+	'Alter function' => 'Mainīt funkciju',
+	'Alter procedure' => 'Mainīt procedūru',
+	'Return type' => 'Atgriezt tips',
+	'Add trigger' => 'Pievienot trigeri',
+	'Trigger has been dropped.' => 'Trigeris dzēsts.',
+	'Trigger has been altered.' => 'Trigeris izmainīts.',
+	'Trigger has been created.' => 'Trigeris izveidots.',
+	'Alter trigger' => 'Izmainīt trigeri',
+	'Create trigger' => 'Izveidot trigeri',
+	'Time' => 'Laiks',
+	'Event' => 'Notikums',
+	'%s version: %s through PHP extension %s' => 'Versija %s: %s ar PHP paplašinājumu %s',
+	'%d row(s)' => array('%d rinda', '%d rindas', '%d rindu'),
+	'Remove' => 'Noņemt',
+	'Are you sure?' => 'Vai Tu esi pārliecināts?',
+	'Privileges' => 'Tiesības',
+	'Create user' => 'Izveidot lietotāju',
+	'User has been dropped.' => 'Lietotājs dzests.',
+	'User has been altered.' => 'Lietotājs izmainīts.',
+	'User has been created.' => 'Lietotājs izveidots.',
+	'Hashed' => 'Sajaukts',
+	'Column' => 'Lauks',
+	'Routine' => 'Procedūra',
+	'Grant' => 'Atļaut',
+	'Revoke' => 'Aizliegt',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST metodes pieprasījums apjoms par lielu. Atsūtiet mazāka apjoma pieprasījumu kā konfigurācijas %s.',
+	'Logged as: %s' => 'Ielogojies kā: %s',
+	'Move up' => 'Pārvietot uz augšu',
+	'Move down' => 'Pārvietot uz leju',
+	'Functions' => 'Funkcijas',
+	'Aggregation' => 'Agregācija',
+	'Export' => 'Eksports',
+	'Output' => 'Izejas dati',
+	'open' => 'atvērt',
+	'save' => 'saglabāt',
+	'Format' => 'Formāts',
+	'Tables' => 'Tabulas',
+	'Data' => 'Dati',
+	'Event has been dropped.' => 'Notikums dzēsts.',
+	'Event has been altered.' => 'Notikums izmainīts.',
+	'Event has been created.' => 'Notikums izveidots.',
+	'Alter event' => 'Izmainīt notikumu',
+	'Create event' => 'Izveidot notikumu',
+	'At given time' => 'Norāditā laikā',
+	'Every' => 'Katru',
+	'Events' => 'Notikumi',
+	'Schedule' => 'Grafiks',
+	'Start' => 'Sākums',
+	'End' => 'Beigas',
+	'Status' => 'Statuss',
+	'On completion preserve' => 'Beigās saglabāt',
+	'Tables and views' => 'Tabulas un skati',
+	'Data Length' => 'Datu apjoms',
+	'Index Length' => 'Indeksu izmērs',
+	'Data Free' => 'Brīvā vieta',
+	'Collation' => 'Kolācija',
+	'Analyze' => 'Analizēt',
+	'Optimize' => 'Optimizēt',
+	'Check' => 'Pārbaudīt',
+	'Repair' => 'Salabot',
+	'Truncate' => 'Iztīrīt',
+	'Tables have been truncated.' => 'Tabulas iztīrītas.',
+	'Rows' => 'Rindas',
+	',' => ' ',
+	'0123456789' => '0123456789',
+	'Tables have been moved.' => 'Tabulas pārvietotas.',
+	'Move to other database' => 'Pārvietot uz citu datubāzi',
+	'Move' => 'Pārvietot',
+	'Engine' => 'Dzinējs',
+	'Save and continue edit' => 'Saglabāt un turpināt rediģēt',
+	'original' => 'oriģināls',
+	'%d item(s) have been affected.' => array('Izmainīts %d ieraksts.', 'Izmainīti %d ieraksti.', 'Izmainīti %d ieraksti.'),
+	'Whole result' => 'Viss rezultāts',
+	'Tables have been dropped.' => 'Tabulas dzēstas.',
+	'Clone' => 'Klonēt',
+	'Partition by' => 'Sadalīt pēc',
+	'Partitions' => 'Partīcijas',
+	'Partition name' => 'Partīcijas nosaukums',
+	'Values' => 'Vērtības',
+	'%d row(s) have been imported.' => array('Importēta %d rinda.', 'Importētas %d rindas.', 'Importētas %d rindas.'),
+	'Import' => 'Imports',
+	'Stop on error' => 'Astāties kļūdas gadījumā',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Sasniegts maksimālais lauku skaita ierobežojums. Palieliniet %s.',
+	'anywhere' => 'jebkurā vietā',
+	'%.3f s' => '%.3f s',
+	'$1-$3-$5' => '$5.$3.$1',
+	'[yyyy]-mm-dd' => 'dd.mm.[gggg]',
+	'History' => 'Vēsture',
+	'Variables' => 'Mainīgie',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Lauku tipiem jābūt vienādiem, rezultējošā laukā jābut indeksa datiem.',
+	'Relations' => 'Relācijas',
+	'Run file' => 'Izpildīt failu',
+	'Clear' => 'Notīrīt',
+	'Maximum allowed file size is %sB.' => 'Faila maksimālais izmērs — %sB.',
+	'Numbers' => 'Skaitļi',
+	'Date and time' => 'Datums un laiks',
+	'Strings' => 'Virknes',
+	'Binary' => 'Binārie',
+	'Lists' => 'Saraksti',
+	'Editor' => 'Redaktors',
+	'E-mail' => 'Epasts',
+	'From' => 'No',
+	'Subject' => 'Tēma',
+	'Send' => 'Sūtīt',
+	'%d e-mail(s) have been sent.' => array('Nosūtīts %d epasts.', 'Nosūtīti %d epasti.', 'Nosūtīti %d epasti.'),
+	'Webserver file %s' => 'Fails %s uz servera',
+	'File does not exist.' => 'Fails neeksistē.',
+	'%d in total' => 'Kopā %d',
+	'Permanent login' => 'Atcerēties mani',
+	'Databases have been dropped.' => 'Datubāzes dzēstas.',
+	'Search data in tables' => 'Meklēt tabulās',
+	'Schema' => 'Shēma',
+	'Alter schema' => 'Izmainīt shēmu',
+	'Create schema' => 'Jauna shēma',
+	'Schema has been dropped.' => 'Shēma dzēsta.',
+	'Schema has been created.' => 'Izveidota jauna shēma.',
+	'Schema has been altered.' => 'Shēma izmainīta.',
+	'Sequences' => 'Virknes',
+	'Create sequence' => 'Izveidot virkni',
+	'Alter sequence' => 'Izmainīt virkni',
+	'Sequence has been dropped.' => 'Virkne dzēsta.',
+	'Sequence has been created.' => 'Izveidota virkne.',
+	'Sequence has been altered.' => 'Virkne izmainīta.',
+	'User types' => 'Lietotāju tipi',
+	'Create type' => 'Izveidot tipu',
+	'Alter type' => 'Izmainīt tipu',
+	'Type has been dropped.' => 'Tips dzēsts.',
+	'Type has been created.' => 'Tips izveidots.',
+	'Ctrl+click on a value to modify it.' => 'Lai izmainītu vērtību, izmanto Ctrl + peles klikšķi.',
+	'Use edit link to modify this value.' => 'Izmainīt vērtību var tikai ar saiti "Izmainīt".',
+	'last' => 'pēdējā',
+	'From server' => 'No servera',
+	'System' => 'Sistēma',
+	'Select data' => 'Izvēlēties datus',
+	'Show structure' => 'Parādīt struktūru',
+	'empty' => 'tukšs',
+	'Network' => 'Tīkls',
+	'Geometry' => 'Ģeometrija',
+	'File exists.' => 'Fails eksistē.',
+	'Attachments' => 'Pielikumi',
+	'%d query(s) executed OK.' => array('%d pieprasījums veiksmīgs.', '%d pieprasījumi veiksmīgi.', '%d pieprasījumi veiksmīgi.'),
+	'Show only errors' => 'Rādīt tikai kļūdas',
+	'Refresh' => 'Atjaunot',
+	'Invalid schema.' => 'Nederīga shēma.',
+	'Please use one of the extensions %s.' => 'Izmainojiet kādu no paplašinājumiem %s.',
+	'now' => 'tagad',
+	'ltr' => 'ltr',
+	'Tables have been copied.' => 'Tabulas nokopētas.',
+	'Copy' => 'kopēt',
+	'Permanent link' => 'Pastāvīga saite',
+	'Edit all' => 'Rediģēt visus',
+	'HH:MM:SS' => 'HH:MM:SS',
+	'Tables have been optimized.' => 'Tabulas optimizētas.',
+	'Materialized view' => 'Matrializēts skats',
+	'Vacuum' => 'Vakums',
+	'Selected' => 'Izvēlētie',
+	'File must be in UTF-8 encoding.' => 'Failam jābūt UTF-8 kodējumam.',
+	'Modify' => 'Izmainīt',
+	'Loading' => 'Ielāde',
+	'Load more data' => 'Ielādēt vēl datus',
+	'ATTACH queries are not supported.' => 'ATTACH-pieprasījumi nav atbalstīti.',
+	'%d / ' => '%d / ',
+	'Limit rows' => 'Rindu limits',
+	'Default value' => 'Noklusētā vērtība',
+	'Full table scan' => 'Pilna tabulas analīze',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Pieteikšanās mēģinājumu skaits par lielu. Mēginiet pēc %d minūtes.', 'Pieteikšanās mēģinājumu skaits par lielu. Mēginiet pēc %d minūtēm.', 'Pieteikšanās mēģinājumu skaits par lielu. Mēginiet pēc %d minūtēm.'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-parole nav derīga. <a href="https://www.adminer.org/en/extension/"%s>Implementējiet</a> metodi %s, lai padarīgu šo par ierastu metodi.',
+	'If you did not send this request from Adminer then close this page.' => 'Ja nesūtījāt šo pieprasījumu no Adminer, tad aizveriet pārlūka logu.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Varat ielādēt lielu SQL failu uz servera un tad importēt to.',
+	'Size' => 'Izmērs',
+	'Compute' => 'Izskaitļot',
+	'You are offline.' => 'Jūs est bezsasaistē.',
+	'You have no privileges to update this table.' => 'Jums nav pieejas labot šo tabulu.',
+	'Saving' => 'Saglabāšana',
+	'yes' => 'jā',
+	'no' => 'nē',
+	'Drop %s?' => 'Dzēst %s?',
+	'overwrite' => 'pārrakstīt',
+	'DB' => 'DB',
+	'Warnings' => 'Brīdinājumi',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer neatbalsta pieeju bez paroles, <a href="https://www.adminer.org/en/password/"%s>vairāk informācijas šeit</a>.',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Paldies, ka izmantoji Adminer, vai vēlies veikt <a href="https://www.adminer.org/en/donation/">ziedojumu</a>.',
+	'The action will be performed after successful login with the same credentials.' => 'Darbība tiks pabeigta pēc derīgas pieteikšanās sistēmā.',
+	'Connecting to privileged ports is not allowed.' => 'Pieeja priviliģētiem portiem nav atļauta.',
+	'There is a space in the input password which might be the cause.' => 'Parole satur atstarpi, kas varētu būt lieka.',
+	'Unknown error.' => 'Nezināma kļūda.',
+	'Database does not support password.' => 'Datubāze neatbalsta paroli.',
+
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Jā',
+	'No' => 'Nē',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+);

adminer/lang/ms.inc.php

@@ -11,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => 'Log masuk sebagai: %s',
 	'Logout successful.' => 'Log keluar berjaya.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Terima kasih kerana menggunakan Adminer, pertimbangkan untuk <a href="https://www.adminer.org/en/donation/">menderma</a>.',
-	'Invalid credentials.' => 'Akses tidak sah.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => 'Terlalu banyak percubaan log masuk yang gagal, sila cuba lagi dalam masa %d minit.',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Kata laluan utama telah luput. <a href="https://www.adminer.org/en/extension/"%s>Gunakan</a> cara %s untuk mengekalkannya.',
 	'Language' => 'Bahasa',
@@ -337,4 +337,22 @@ $translations = array(
 	'Type has been dropped.' => 'Jenis telah dijatuhkan.',
 	'Type has been created.' => 'Jenis telah dibuat.',
 	'Alter type' => 'Ubah jenis',
+
+	'overwrite' => null,
+	'DB' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ya',
+	'No' => 'Tidak',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/nl.inc.php

@@ -1,8 +1,8 @@
 <?php
 $translations = array(
-	'Login' => 'Inloggen',
+	'Login' => 'Aanmelden',
-	'Logout successful.' => 'Uitloggen geslaagd.',
+	'Logout successful.' => 'Successvol afgemeld.',
-	'Invalid credentials.' => 'Ongeldige logingegevens.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Server',
 	'Username' => 'Gebruikersnaam',
 	'Password' => 'Wachtwoord',
@@ -31,7 +31,7 @@ $translations = array(
 	'Alter database' => 'Database aanpassen',
 	'Create database' => 'Database aanmaken',
 	'SQL command' => 'SQL opdracht',
-	'Logout' => 'Uitloggen',
+	'Logout' => 'Afmelden',
 	'database' => 'database',
 	'Use' => 'Gebruik',
 	'No tables.' => 'Geen tabellen.',
@@ -41,7 +41,7 @@ $translations = array(
 	'Item%s has been inserted.' => 'Item%s toegevoegd.',
 	'Edit' => 'Bewerk',
 	'Insert' => 'Toevoegen',
-	'Save and insert next' => 'Opslaan, daarna toevoegen',
+	'Save and insert next' => 'Opslaan en volgende toevoegen',
 	'Delete' => 'Verwijderen',
 	'Database' => 'Database',
 	'Routines' => 'Procedures',
@@ -60,7 +60,7 @@ $translations = array(
 	'Action' => 'Acties',
 	'edit' => 'bewerk',
 	'Page' => 'Pagina',
-	'Query executed OK, %d row(s) affected.' => array('Query uitgevoerd, %d rij geraakt.', 'Query uitgevoerd, %d rijen beïnvloed.'),
+	'Query executed OK, %d row(s) affected.' => array('Query uitgevoerd, %d rij aangepast.', 'Query uitgevoerd, %d rijen aangepast.'),
 	'Error in query' => 'Fout in query',
 	'Execute' => 'Uitvoeren',
 	'Table' => 'Tabel',
@@ -81,7 +81,7 @@ $translations = array(
 	'No extension' => 'Geen extensie',
 	'None of the supported PHP extensions (%s) are available.' => 'Geen geldige PHP extensies beschikbaar (%s).',
 	'Session support must be enabled.' => 'Sessies moeten geactiveerd zijn.',
-	'Session expired, please login again.' => 'Uw sessie is verlopen. Gelieve opnieuw in te loggen.',
+	'Session expired, please login again.' => 'Uw sessie is verlopen. Gelieve opnieuw aan te melden.',
 	'Text length' => 'Tekst lengte',
 	'Foreign key has been dropped.' => 'Foreign key verwijderd.',
 	'Foreign key has been altered.' => 'Foreign key aangepast.',
@@ -265,4 +265,49 @@ $translations = array(
 	'Permanent link' => 'Permanente link',
 	'Edit all' => 'Alles bewerken',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => 'Verwijder %s?',
+	'Tables have been optimized.' => 'Tabellen zijn geoptimaliseerd.',
+	'Materialized view' => 'Materialized view',
+	'Vacuum' => 'Vacuum',
+	'Selected' => 'Geselecteerd',
+	'overwrite' => 'overschrijven',
+	'DB' => 'DB',
+	'File must be in UTF-8 encoding.' => 'Het bestand moet met UTF-8 encodering zijn opgeslagen.',
+	'Modify' => 'Aanpassen',
+	'Load more data' => 'Meer data inladen',
+	'Loading' => 'Aan het laden',
+	'ATTACH queries are not supported.' => 'ATTACH queries worden niet ondersteund',
+	'Warnings' => 'Waarschuwingen',
+	'%d / ' => '%d / ',
+	'Limit rows' => 'Rijen beperken',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer ondersteunt geen toegang tot databases zonder wachtwoord, <a href="https://www.adminer.org/en/password/"%s>meer informatie</a>.',
+	'Default value' => 'Standaardwaarde',
+	'Full table scan' => 'Full table scan',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Teveel foutieve aanmeldpogingen, probeer opnieuw binnen %d minuut.', 'Teveel foutieve aanmeldpogingen, probeer opnieuw binnen %d minuten.'),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master wachtwoord verlopen. <a href="https://www.adminer.org/en/extension/"%s>Implementeer</a> de %s methode om het permanent te maken.',
+	'The action will be performed after successful login with the same credentials.' => 'Deze actie zal uitgevoerd worden na het succesvol aanmelden met dezelfde gebruikersgegevens',
+	'Connecting to privileged ports is not allowed.' => 'Verbindingen naar geprivilegieerde poorten is niet toegestaan.',
+	'There is a space in the input password which might be the cause.' => 'Er staat een spatie in het wachtwoord, wat misschien de oorzaak is.',
+	'If you did not send this request from Adminer then close this page.' => 'Als u deze actie niet via Adminer hebt gedaan, gelieve deze pagina dan te sluiten.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'U kan een groot SQL-bestand uploaden via FTP en het importeren via de server.',
+	'Size' => 'Grootte',
+	'Compute' => 'Bereken',
+	'You are offline.' => 'U bent offline.',
+	'You have no privileges to update this table.' => 'U bent niet gemachtigd om deze tabel aan te passen.',
+	'Saving' => 'Opslaan',
+	'Unknown error.' => 'Onbekende fout',
+	'Database does not support password.' => 'Database ondersteunt het wachtwoord niet.',
+	'Disable %s or enable %s or %s extensions.' => 'Schakel %s uit or schakel extensies %s of %s in.',
+	'yes' => 'ja',
+	'no' => 'neen',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ja',
+	'No' => 'Neen',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/no.inc.php

@@ -9,7 +9,7 @@ $translations = array(
 	'Logout' => 'Logg ut',
 	'Logged as: %s' => 'Logget inn som: %s',
 	'Logout successful.' => 'Utlogging vellykket.',
-	'Invalid credentials.' => 'Ugylding innloggingsinformasjon.',
+	'Invalid server or credentials.' => null,
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Master-passord er utløpt. <a href="https://www.adminer.org/en/extension/"%s>Implementer</a> en metode for %s for å gjøre det permanent.',
 	'Language' => 'Språk',
 	'Invalid CSRF token. Send the form again.' => 'Ugylding CSRF-token - Send inn skjemaet igjen.',
@@ -279,4 +279,35 @@ $translations = array(
 	'Type has been created.' => 'Type er opprettet.',
 	'Alter type' => 'Endre type',
 	'Saving' => 'Lagrer',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ja',
+	'No' => 'Nei',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/pl.inc.php

@@ -11,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => 'Zalogowany jako: %s',
 	'Logout successful.' => 'Wylogowano pomyślnie.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Dziękujemy za używanie Adminera, rozważ proszę <a href="https://www.adminer.org/pl/donation/">dotację</a>.',
-	'Invalid credentials.' => 'Nieprawidłowe dane logowania.',
+	'Invalid server or credentials.' => 'Nieprawidłowy serwer lub dane logowania.',
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Za dużo nieudanych prób logowania, spróbuj ponownie za %d minutę.', 'Za dużo nieudanych prób logowania, spróbuj ponownie za %d minuty.', 'Za dużo nieudanych prób logowania, spróbuj ponownie za %d minut.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Ważność hasła głównego wygasła. <a href="https://www.adminer.org/pl/extension/"%s>Zaimplementuj</a> własną metodę %s, aby ustawić je na stałe.',
 	'Language' => 'Język',
@@ -42,10 +42,10 @@ $translations = array(
 	'Process list' => 'Lista procesów',
 	'%d process(es) have been killed.' => array('Przerwano %d wątek.', 'Przerwano %d wątki.', 'Przerwano %d wątków.'),
 	'Kill' => 'Przerwij wykonywanie',
-	
+
 	'Variables' => 'Zmienne',
 	'Status' => 'Status',
-	
+
 	'SQL command' => 'Zapytanie SQL',
 	'%d query(s) executed OK.' => array('Pomyślnie wykonano %d zapytanie.', 'Pomyślnie wykonano %d zapytania.', 'Pomyślnie wykonano %d zapytań.'),
 	'Query executed OK, %d row(s) affected.' => array('Zapytanie wykonane pomyślnie, zmieniono %d rekord.', 'Zapytanie wykonane pomyślnie, zmieniono %d rekordy.', 'Zapytanie wykonane pomyślnie, zmieniono %d rekordów.'),
@@ -60,7 +60,7 @@ $translations = array(
 	'History' => 'Historia',
 	'Clear' => 'Wyczyść',
 	'Edit all' => 'Edytuj wszystkie',
-	
+
 	'File upload' => 'Wgranie pliku',
 	'From server' => 'Z serwera',
 	'Webserver file %s' => 'Plik %s na serwerze',
@@ -72,14 +72,14 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Przesłano zbyt dużo danych. Zmniejsz objętość danych lub zwiększ zmienną konfiguracyjną %s.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Większe pliki SQL możesz wgrać na serwer poprzez FTP przed zaimportowaniem.',
 	'You are offline.' => 'Jesteś offline.',
-	
+
 	'Export' => 'Eksport',
 	'Output' => 'Rezultat',
 	'open' => 'otwórz',
 	'save' => 'zapisz',
 	'Format' => 'Format',
 	'Data' => 'Dane',
-	
+
 	'Database' => 'Baza danych',
 	'database' => 'baza danych',
 	'Use' => 'Wybierz',
@@ -93,10 +93,10 @@ $translations = array(
 	'Alter database' => 'Zmień bazę danych',
 	'Create database' => 'Utwórz bazę danych',
 	'Database schema' => 'Schemat bazy danych',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Trwały link',
-	
+
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -119,7 +119,7 @@ $translations = array(
 	'Tables have been moved.' => 'Tabele zostały przeniesione.',
 	'Copy' => 'Kopiuj',
 	'Tables have been copied.' => 'Tabele zostały skopiowane.',
-	
+
 	'Routines' => 'Procedury i funkcje',
 	'Routine has been called, %d row(s) affected.' => array('Procedura została uruchomiona, zmieniono %d rekord.', 'Procedura została uruchomiona, zmieniono %d rekordy.', 'Procedura została uruchomiona, zmieniono %d rekordów.'),
 	'Call' => 'Uruchom',
@@ -132,7 +132,7 @@ $translations = array(
 	'Alter function' => 'Zmień funkcję',
 	'Alter procedure' => 'Zmień procedurę',
 	'Return type' => 'Zwracany typ',
-	
+
 	'Events' => 'Wydarzenia',
 	'Event has been dropped.' => 'Wydarzenie zostało usunięte.',
 	'Event has been altered.' => 'Wydarzenie zostało zmienione.',
@@ -145,7 +145,7 @@ $translations = array(
 	'Start' => 'Początek',
 	'End' => 'Koniec',
 	'On completion preserve' => 'Nie kasuj wydarzenia po przeterminowaniu',
-	
+
 	'Tables' => 'Tabele',
 	'Tables and views' => 'Tabele i perspektywy',
 	'Table' => 'Tabela',
@@ -178,12 +178,12 @@ $translations = array(
 	'Move down' => 'Przesuń w dół',
 	'Remove' => 'Usuń',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Przekroczono maksymalną liczbę pól. Zwiększ %s.',
-	
+
 	'Partition by' => 'Partycjonowanie',
 	'Partitions' => 'Partycje',
 	'Partition name' => 'Nazwa partycji',
 	'Values' => 'Wartości',
-	
+
 	'View' => 'Perspektywa',
 	'Materialized view' => 'Zmaterializowana perspektywa',
 	'View has been dropped.' => 'Perspektywa została usunięta.',
@@ -191,14 +191,14 @@ $translations = array(
 	'View has been created.' => 'Perspektywa została utworzona.',
 	'Alter view' => 'Zmień perspektywę',
 	'Create view' => 'Utwórz perspektywę',
-	
+
 	'Indexes' => 'Indeksy',
 	'Indexes have been altered.' => 'Indeksy zostały zmienione.',
 	'Alter indexes' => 'Zmień indeksy',
 	'Add next' => 'Dodaj następny',
 	'Index Type' => 'Typ indeksu',
 	'Column (length)' => 'Kolumna (długość)',
-	
+
 	'Foreign keys' => 'Klucze obce',
 	'Foreign key' => 'Klucz obcy',
 	'Foreign key has been dropped.' => 'Klucz obcy został usunięty.',
@@ -214,7 +214,7 @@ $translations = array(
 	'ON DELETE' => 'W przypadku usunięcia',
 	'ON UPDATE' => 'W przypadku zmiany',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Źródłowa i docelowa kolumna muszą być tego samego typu, powinien istnieć indeks na docelowej kolumnie oraz muszą istnieć dane referencyjne.',
-	
+
 	'Triggers' => 'Wyzwalacze',
 	'Add trigger' => 'Dodaj wyzwalacz',
 	'Trigger has been dropped.' => 'Wyzwalacz został usunięty.',
@@ -225,7 +225,7 @@ $translations = array(
 	'Time' => 'Czas',
 	'Event' => 'Wydarzenie',
 	'Name' => 'Nazwa',
-	
+
 	'select' => 'przeglądaj',
 	'Select' => 'pokaż',
 	'Select data' => 'Pokaż dane',
@@ -251,16 +251,16 @@ $translations = array(
 	'Loading' => 'Wczytywanie',
 	'Whole result' => 'Wybierz wszystkie',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtów'),
-	
+
 	'Import' => 'Import',
 	'%d row(s) have been imported.' => array('%d rekord został zaimportowany.', '%d rekordy zostały zaimportowane.', '%d rekordów zostało zaimportowanych.'),
 	'File must be in UTF-8 encoding.' => 'Kodowanie pliku musi być ustawione na UTF-8.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Zmień',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+kliknij wartość, aby ją edytować.',
 	'Use edit link to modify this value.' => 'Użyj linku edycji aby zmienić tę wartość.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Rekord%s został dodany.',
 	'Item has been deleted.' => 'Rekord został usunięty.',
@@ -281,14 +281,14 @@ $translations = array(
 	'Clone' => 'Duplikuj',
 	'Delete' => 'Usuń',
 	'You have no privileges to update this table.' => 'Brak uprawnień do edycji tej tabeli',
-	
+
 	'E-mail' => 'E-mail',
 	'From' => 'Nadawca',
 	'Subject' => 'Temat',
 	'Attachments' => 'Załączniki',
 	'Send' => 'Wyślij',
 	'%d e-mail(s) have been sent.' => array('Wysłano %d e-mail.', 'Wysłano %d e-maile.', 'Wysłano %d e-maili.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Numeryczne',
 	'Date and time' => 'Data i czas',
@@ -298,7 +298,7 @@ $translations = array(
 	'Network' => 'Sieć',
 	'Geometry' => 'Geometria',
 	'Relations' => 'Relacje',
-	
+
 	'Editor' => 'Edytor',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$6.$4.$1',
@@ -309,11 +309,11 @@ $translations = array(
 	'now' => 'teraz',
 	'yes' => 'tak',
 	'no' => 'nie',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Plik już istnieje.',
 	'Please use one of the extensions %s.' => 'Proszę użyć jednego z rozszerzeń: %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Zmień schemat',
 	'Create schema' => 'Utwórz schemat',
@@ -322,7 +322,7 @@ $translations = array(
 	'Schema has been altered.' => 'Schemat został zmieniony.',
 	'Schema' => 'Schemat',
 	'Invalid schema.' => 'Nieprawidłowy schemat.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekwencje',
 	'Create sequence' => 'Utwórz sekwencję',
@@ -330,11 +330,29 @@ $translations = array(
 	'Sequence has been created.' => 'Sekwencja została utworzona.',
 	'Sequence has been altered.' => 'Sekwencja została zmieniona.',
 	'Alter sequence' => 'Zmień sekwencję',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Typy użytkownika',
 	'Create type' => 'Utwórz typ',
 	'Type has been dropped.' => 'Typ został usunięty.',
 	'Type has been created.' => 'Typ został utworzony.',
 	'Alter type' => 'Zmień typ',
+
+	'overwrite' => null,
+	'DB' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Tak',
+	'No' => 'Nie',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/pt-br.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Entrar',
 	'Logout successful.' => 'Saída bem sucedida.',
-	'Invalid credentials.' => 'Identificação inválida.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Servidor',
 	'Username' => 'Usuário',
 	'Password' => 'Senha',
@@ -260,4 +260,54 @@ $translations = array(
 	'Please use one of the extensions %s.' => 'Por favor use uma das extensões %s.',
 	'now' => 'agora',
 	'ltr' => 'ltr',
+
+	'Drop %s?' => null,
+	'Tables have been copied.' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'Copy' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Permanent link' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Edit all' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+	'HH:MM:SS' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/pt.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Entrar',
 	'Logout successful.' => 'Sessão terminada com sucesso.',
-	'Invalid credentials.' => 'Identificação inválida.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Servidor',
 	'Username' => 'Nome de utilizador',
 	'Password' => 'Senha',
@@ -260,4 +260,54 @@ $translations = array(
 	'Please use one of the extensions %s.' => 'Por favor use uma das extensões %s.',
 	'now' => 'agora',
 	'ltr' => 'ltr',
+
+	'Drop %s?' => null,
+	'Tables have been copied.' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'Copy' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Permanent link' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Edit all' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+	'HH:MM:SS' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/ro.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Intră',
 	'Logout successful.' => 'Ați ieșit cu succes.',
-	'Invalid credentials.' => 'Numele de utilizator sau parola este greșită.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Server',
 	'Username' => 'Nume de utilizator',
 	'Password' => 'Parola',
@@ -265,4 +265,49 @@ $translations = array(
 	'Permanent link' => 'Adresă permanentă',
 	'Edit all' => 'Editează tot',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/ru.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Войти',
 	'Logout successful.' => 'Вы успешно покинули систему.',
-	'Invalid credentials.' => 'Неправильное имя пользователя или пароль.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Сервер',
 	'Username' => 'Имя пользователя',
 	'Password' => 'Пароль',
@@ -287,8 +287,8 @@ $translations = array(
 	'You are offline.' => 'Вы не выполнили вход.',
 	'You have no privileges to update this table.' => 'У вас нет прав на обновление этой таблицы.',
 	'Saving' => 'Сохранение',
-	'yes' => 'Да',
+	'yes' => 'да',
-	'no' => 'Нет',
+	'no' => 'нет',
 	'Drop %s?' => 'Удалить %s?',
 	'overwrite' => 'перезаписать',
 	'DB' => 'DB',
@@ -300,4 +300,14 @@ $translations = array(
 	'There is a space in the input password which might be the cause.' => 'В введеном пароле есть пробел, это может быть причиною.',
 	'Unknown error.' => 'Неизвестная ошибка.',
 	'Database does not support password.' => 'База данных не поддерживает пароль.',
+
+	'Disable %s or enable %s or %s extensions.' => 'Отключите %s или включите расширения %s или %s.',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Да',
+	'No' => 'Нет',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/sk.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Prihlásiť sa',
 	'Logout successful.' => 'Odhlásenie prebehlo v poriadku.',
-	'Invalid credentials.' => 'Neplatné prihlasovacie údaje.',
+	'Invalid server or credentials.' => 'Neplatný server alebo prihlasovacie údaje.',
 	'Server' => 'Server',
 	'Username' => 'Používateľ',
 	'Password' => 'Heslo',
@@ -70,7 +70,7 @@ $translations = array(
 	'Unable to select the table' => 'Tabuľku sa nepodarilo vypísať',
 	'Invalid CSRF token. Send the form again.' => 'Neplatný token CSRF. Odošlite formulár znova.',
 	'Comment' => 'Komentár',
-	'Default values' => 'Východzie hodnoty',
+	'Default values' => 'Predvolené hodnoty',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtov'),
 	'No commands to execute.' => 'Žiadne príkazy na vykonanie.',
 	'Unable to upload a file.' => 'Súbor sa nepodarilo nahrať.',
@@ -94,8 +94,8 @@ $translations = array(
 	'Add column' => 'Pridať stĺpec',
 	'Alter' => 'Zmeniť',
 	'Add foreign key' => 'Pridať cudzí kľúč',
-	'ON DELETE' => 'ON DELETE',
+	'ON DELETE' => 'Pri zmazaní',
-	'ON UPDATE' => 'ON UPDATE',
+	'ON UPDATE' => 'Pri aktualizácii',
 	'Index Type' => 'Typ indexu',
 	'Column (length)' => 'Stĺpec (dĺžka)',
 	'View has been dropped.' => 'Pohľad bol odstránený.',
@@ -265,4 +265,47 @@ $translations = array(
 	'Permanent link' => 'Permanentný odkaz',
 	'Edit all' => 'Upraviť všetko',
 	'HH:MM:SS' => 'HH:MM:SS',
+	'Drop %s?' => 'Odstrániť %s?',
+	'Tables have been optimized.' => 'Tabuľky boli optimalizované.',
+	'Materialized view' => 'Materializovaný pohľad',
+	'Vacuum' => 'Vyčistiť',
+	'Selected' => 'Označené',
+	'overwrite' => 'prepísať',
+	'DB' => 'DB',
+	'File must be in UTF-8 encoding.' => 'Súbor musí byť v kódovaní UTF-8.',
+	'Modify' => 'Zmeniť',
+	'Load more data' => 'Nahráť ďalšie dáta',
+	'Loading' => 'Nahráva sa',
+	'ATTACH queries are not supported.' => 'Dotazy ATTACH nie sú podporované.',
+	'Warnings' => 'Varovania',
+	'%d / ' => '%d / ',
+	'Limit rows' => 'Limit riadkov',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer nepodporuje prístup k databáze bez hesla, <a href="https://www.adminer.org/cs/password/"%s>viac informácií</a>.',
+	'Default value' => 'Predvolená hodnota',
+	'Full table scan' => 'Prechod celej tabuľky',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Príliš veľa pokusov o prihlásenie, skúste to znova za %d minutu.', 'Príliš veľa pokusov o prihlásenie, skúste to znova za %d minuty.', 'Príliš veľa pokusov o prihlásenie, skúste to znova za %d minút.'),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Vďaka za používanie Admineru, <a href="https://www.adminer.org/cs/donation/">prispejte</a> na vývoj.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Platnosť hlavného hesla vypršala. <a href="https://www.adminer.org/cs/extension/"%s>Implementujte</a> metodu %s, aby platilo natrvalo.',
+	'The action will be performed after successful login with the same credentials.' => 'Akcia sa vykoná po úspešnom prihlásení s rovnakými prihlasovacími údajmi.',
+	'Connecting to privileged ports is not allowed.' => 'Pripojenie k privilegovaným portom nie je povolené.',
+	'There is a space in the input password which might be the cause.' =>  'V zadanom hesle je medzera, ktorá môže byť príčinou.',
+	'If you did not send this request from Adminer then close this page.' => 'Pokiaľ ste tento požiadavok neodoslali z Adminera, zatvorte túto stránku.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Veľký SQL soubor môžete nahrať pomocou FTP a importovať ho zo servera.',
+	'Size' => 'Veľkosť',
+	'Compute' => 'Spočítať',
+	'You are offline.' => 'Ste offline.',
+	'You have no privileges to update this table.' => 'Nemáte oprávnenie na aktualizáciu tejto tabuľky.',
+	'Saving' => 'Ukladá sa',
+	'Unknown error.' => 'Neznáma chyba.',
+	'Database does not support password.' => 'Databáza nepodporuje heslo.',
+	'Disable %s or enable %s or %s extensions.' => 'Zakážte %s alebo povoľte rozšírenie %s alebo %s.',
+	'yes' => 'áno',
+	'no' => 'nie',
+	'Yes' => 'Áno',
+	'No' => 'Nie',
+	'Columns' => 'Stĺpce',
+	'Nullable' => 'Povolené null',
+	'Default' => 'Predvolené',
+	'One Time Password' => 'Jednorázové heslo',
+	'Invalid OTP code.' => 'Neplatný kód OTP.',
 );

adminer/lang/sl.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logout' => 'Odjavi se',
 	'Logged as: %s' => 'Prijavljen kot: %s',
 	'Logout successful.' => 'Prijava uspešna.',
-	'Invalid credentials.' => 'Neveljavne pravice.',
+	'Invalid server or credentials.' => 'Neveljaven strežnik ali pravice.',
 	'Language' => 'Jezik',
 	'Invalid CSRF token. Send the form again.' => 'Neveljaven token CSRF. Pošljite formular še enkrat.',
 	'No extension' => 'Brez dodatkov',
@@ -19,10 +19,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Seja je potekla. Prosimo, ponovno se prijavite.',
 	'%s version: %s through PHP extension %s' => 'Verzija %s: %s preko dodatka za PHP %s',
 	'Refresh' => 'Osveži',
-	
+
 	// text direction
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Pravice',
 	'Create user' => 'Ustvari uporabnika',
 	'User has been dropped.' => 'Uporabnik je odstranjen.',
@@ -33,14 +33,14 @@ $translations = array(
 	'Routine' => 'Postopek',
 	'Grant' => 'Dovoli',
 	'Revoke' => 'Odvzemi',
-	
+
 	'Process list' => 'Seznam procesov',
 	'%d process(es) have been killed.' => array('Končan je %d proces.', 'Končana sta %d procesa.', 'Končani so %d procesi.', 'Končanih je %d procesov.'),
 	'Kill' => 'Končaj',
-	
+
 	'Variables' => 'Spremenljivke',
 	'Status' => 'Stanje',
-	
+
 	'SQL command' => 'Ukaz SQL',
 	'%d query(s) executed OK.' => array('Uspešno se je končala %d poizvedba.', 'Uspešno sta se končali %d poizvedbi.', 'Uspešno so se končale %d poizvedbe.', 'Uspešno se je končalo %d poizvedb.'),
 	'Query executed OK, %d row(s) affected.' => array('Poizvedba se je uspešno izvedla, spremenjena je %d vrstica.', 'Poizvedba se je uspešno izvedla, spremenjeni sta %d vrstici.', 'Poizvedba se je uspešno izvedla, spremenjene so %d vrstice.', 'Poizvedba se je uspešno izvedla, spremenjenih je %d vrstic.'),
@@ -53,7 +53,7 @@ $translations = array(
 	'%.3f s' => '%.3f s',
 	'History' => 'Zgodovina',
 	'Clear' => 'Počisti',
-	
+
 	'File upload' => 'Naloži datoteko',
 	'From server' => 'z strežnika',
 	'Webserver file %s' => 'Datoteka na spletnem strežniku %s',
@@ -63,14 +63,14 @@ $translations = array(
 	'Unable to upload a file.' => 'Ne morem naložiti datoteke.',
 	'Maximum allowed file size is %sB.' => 'Največja velikost datoteke je %sB.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Preveliko podatkov za POST. Zmanjšajte število podatkov ali povečajte nastavitev za %s.',
-	
+
 	'Export' => 'Izvozi',
 	'Output' => 'Izhod rezultata',
 	'open' => 'odpri',
 	'save' => 'shrani',
 	'Format' => 'Format',
 	'Data' => 'Podatki',
-	
+
 	'Database' => 'Baza',
 	'database' => 'baza',
 	'Use' => 'Uporabi',
@@ -84,7 +84,7 @@ $translations = array(
 	'Alter database' => 'Spremeni bazo',
 	'Create database' => 'Ustvari bazo',
 	'Database schema' => 'Shema baze',
-	
+
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -106,7 +106,7 @@ $translations = array(
 	'Tables have been moved.' => 'Tabele so premaknjene.',
 	'Copy' => 'Kopiraj',
 	'Tables have been copied.' => 'Tabele so kopirane.',
-	
+
 	'Routines' => 'Postopki',
 	'Routine has been called, %d row(s) affected.' => array('Klican je bil postopek, spremenjena je %d vrstica.', 'Klican je bil postopek, spremenjeni sta %d vrstici.', 'Klican je bil postopek, spremenjene so %d vrstice.', 'Klican je bil postopek, spremenjenih je %d vrstic.'),
 	'Call' => 'Pokliči',
@@ -119,7 +119,7 @@ $translations = array(
 	'Alter function' => 'Spremeni funkcijo',
 	'Alter procedure' => 'Spremeni postopek',
 	'Return type' => 'Vračalni tip',
-	
+
 	'Events' => 'Dogodki',
 	'Event has been dropped.' => 'Dogodek je zavržen.',
 	'Event has been altered.' => 'Dogodek je spremenjen.',
@@ -132,7 +132,7 @@ $translations = array(
 	'Start' => 'Začetek',
 	'End' => 'Konec',
 	'On completion preserve' => 'Po zaključku ohrani',
-	
+
 	'Tables' => 'Tabele',
 	'Tables and views' => 'Tabele in pogledi',
 	'Table' => 'Tabela',
@@ -160,26 +160,26 @@ $translations = array(
 	'Move down' => 'Premakni dol',
 	'Remove' => 'Odstrani',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Največje število dovoljenih polje je preseženo. Prosimo, povečajte %s.',
-	
+
 	'Partition by' => 'Porazdeli po',
 	'Partitions' => 'Porazdelitve',
 	'Partition name' => 'Ime porazdelitve',
 	'Values' => 'Vrednosti',
-	
+
 	'View' => 'Pogledi',
 	'View has been dropped.' => 'Pogled je zavržen.',
 	'View has been altered.' => 'Pogled je spremenjen.',
 	'View has been created.' => 'Pogled je ustvarjen.',
 	'Alter view' => 'Spremeni pogled',
 	'Create view' => 'Ustvari pogled',
-	
+
 	'Indexes' => 'Indeksi',
 	'Indexes have been altered.' => 'Indeksi so spremenjeni.',
 	'Alter indexes' => 'Spremeni indekse',
 	'Add next' => 'Dodaj naslednjega',
 	'Index Type' => 'Tip indeksa',
 	'Column (length)' => 'Stolpec (dolžina)',
-	
+
 	'Foreign keys' => 'Tuji ključi',
 	'Foreign key' => 'Tuj ključ',
 	'Foreign key has been dropped.' => 'Tuj ključ je zavržen.',
@@ -195,7 +195,7 @@ $translations = array(
 	'ON DELETE' => 'pri brisanju',
 	'ON UPDATE' => 'pri posodabljanju',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Izvorni in ciljni stolpec mora imeti isti podatkovni tip. Obstajati mora indeks na ciljnih stolpcih in obstajati morajo referenčni podatki.',
-	
+
 	'Triggers' => 'Sprožilniki',
 	'Add trigger' => 'Dodaj sprožilnik',
 	'Trigger has been dropped.' => 'Sprožilnik je odstranjen.',
@@ -206,7 +206,7 @@ $translations = array(
 	'Time' => 'Čas',
 	'Event' => 'Dogodek',
 	'Name' => 'Naziv',
-	
+
 	'select' => 'izberi',
 	'Select' => 'Izberi',
 	'Select data' => 'Izberi podatke',
@@ -227,14 +227,14 @@ $translations = array(
 	'last' => 'Zadnja',
 	'Whole result' => 'Cel razultat',
 	'%d byte(s)' => array('%d bajt', '%d bajta', '%d bajti', '%d bajtov'),
-	
+
 	'Import' => 'Uvozi',
 	'%d row(s) have been imported.' => array('Uvožena je %d vrstica.', 'Uvoženi sta %d vrstici.', 'Uvožene so %d vrstice.', 'Uvoženih je %d vrstic.'),
-	
+
 	// in-place editing in select
 	'Ctrl+click on a value to modify it.' => 'Ctrl+klik na vrednost za urejanje.',
 	'Use edit link to modify this value.' => 'Uporabite urejanje povezave za spreminjanje te vrednosti.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Predmet%s je vstavljen.',
 	'Item has been deleted.' => 'Predmet je izbrisan.',
@@ -252,14 +252,14 @@ $translations = array(
 	'Save and insert next' => 'Shrani in vstavi tekst',
 	'Clone' => 'Kloniraj',
 	'Delete' => 'Izbriši',
-	
+
 	'E-mail' => 'E-mail',
 	'From' => 'Od',
 	'Subject' => 'Zadeva',
 	'Attachments' => 'Priponke',
 	'Send' => 'Pošlji',
 	'%d e-mail(s) have been sent.' => array('Poslan je %d e-mail.', 'Poslana sta %d e-maila.', 'Poslani so %d e-maili.', 'Poslanih je %d e-mailov.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Števila',
 	'Date and time' => 'Datum in čas',
@@ -269,18 +269,18 @@ $translations = array(
 	'Network' => 'Mrežni',
 	'Geometry' => 'Geometrčni',
 	'Relations' => 'Relacijski',
-	
+
 	'Editor' => 'Urejevalnik',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$6.$4.$1',
 	// hint for date format - use language equivalents for day, month and year shortcuts
 	'[yyyy]-mm-dd' => 'd.m.[rrrr]',
 	'now' => 'zdaj',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Datoteka obstaja.',
 	'Please use one of the extensions %s.' => 'Prosim, uporabite enega od dodatkov %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Spremeni shemo',
 	'Create schema' => 'Ustvari shemo',
@@ -289,7 +289,7 @@ $translations = array(
 	'Schema has been altered.' => 'Shema je spremenjena.',
 	'Schema' => 'Shema',
 	'Invalid schema.' => 'Neveljavna shema.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Sekvence',
 	'Create sequence' => 'Ustvari sekvenco',
@@ -297,11 +297,59 @@ $translations = array(
 	'Sequence has been created.' => 'Sekvence je ustvarjena.',
 	'Sequence has been altered.' => 'Sekvence je spremenjena.',
 	'Alter sequence' => 'Spremni sekvenco',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Uporabniški tipi',
 	'Create type' => 'Ustvari tip',
 	'Type has been dropped.' => 'Tip je zavržen.',
 	'Type has been created.' => 'Tip je ustvarjen.',
 	'Alter type' => 'Spremeni tip',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Permanent link' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Edit all' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+	'HH:MM:SS' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/sr.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logout' => 'Одјава',
 	'Logged as: %s' => 'Пријави се као: %s',
 	'Logout successful.' => 'Успешна одјава.',
-	'Invalid credentials.' => 'Неважеће дозволе.',
+	'Invalid server or credentials.' => null,
 	'Language' => 'Језик',
 	'Invalid CSRF token. Send the form again.' => 'Неважећи CSRF код. Проследите поново форму.',
 	'No extension' => 'Без додатака',
@@ -316,4 +316,43 @@ $translations = array(
 	'Type has been dropped.' => 'Тип је избрисан.',
 	'Type has been created.' => 'тип је креиран.',
 	'Alter type' => 'Уреди тип',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Да',
+	'No' => 'Не',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/sv.inc.php

@@ -11,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => 'Inloggad som: %s',
 	'Logout successful.' => 'Du är nu utloggad.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Tack för att du använder Adminer, vänligen fundera över att <a href="https://www.adminer.org/en/donation/">donera</a>.',
-	'Invalid credentials.' => 'Ogiltiga inloggningsuppgifter.',
+	'Invalid server or credentials.' => null,
 	'There is a space in the input password which might be the cause.' => 'Det finns ett mellanslag i lösenordet, vilket kan vara anledningen.',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer tillåter inte att ansluta till en databas utan lösenord. <a href="https://www.adminer.org/en/password/"%s>Mer information</a>.',
 	'Database does not support password.' => 'Databasen stödjer inte lösenord.',
@@ -346,4 +346,12 @@ $translations = array(
 	'Type has been dropped.' => 'Typ har, typ, tagits bort.',
 	'Type has been created.' => 'Typ har skapats.',
 	'Alter type' => 'Ändra typ',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ja',
+	'No' => 'Nej',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/ta.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'நுழை',
 	'Logout successful.' => 'வெற்றிக‌ர‌மாய் வெளியேறியாயிற்று.',
-	'Invalid credentials.' => 'ச‌ரியான‌ விப‌ர‌ங்க‌ள் இல்லை.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'வ‌ழ‌ங்கி (Server)',
 	'Username' => 'ப‌ய‌னாள‌ர் (User)',
 	'Password' => 'க‌ட‌வுச்சொல்',
@@ -264,4 +264,50 @@ $translations = array(
 	'Permanent link' => 'நிரந்தர இணைப்பு',
 	'Edit all' => 'அனைத்தையும் தொகு',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/th.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'เข้าสู่ระบบ',
 	'Logout successful.' => 'ออกจากระบบเรียบร้อยแล้ว.',
-	'Invalid credentials.' => 'ข้อมูลไม่ถูกต้อง.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'เซอเวอร์',
 	'Username' => 'ชื่อผู้ใช้งาน',
 	'Password' => 'รหัสผ่าน',
@@ -265,4 +265,49 @@ $translations = array(
 	'Permanent link' => 'ลิงค์ถาวร',
 	'Edit all' => 'แก้ไขทั้งหมด',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/tr.inc.php

@@ -11,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => '%s olarak giriş yapıldı.',
 	'Logout successful.' => 'Oturum başarıyla sonlandı.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Adminer kullandığınız için teşekkür ederiz <a href="https://www.adminer.org/en/donation/">bağış yapmayı düşünün</a>.',
-	'Invalid credentials.' => 'Geçersiz kimlik bilgileri.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => array('Çok fazla oturum açma denemesi yapıldı.', '%d Dakika sonra tekrar deneyiniz.'),
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Ana şifrenin süresi doldu. Kalıcı olması için <a href="https://www.adminer.org/en/extension/"%s>%s medodunu</a> kullanın.',
 	'Language' => 'Dil',
@@ -340,4 +340,19 @@ $translations = array(
 	'Type has been dropped.' => 'Tür silindi.',
 	'Type has been created.' => 'Tür oluşturuldu.',
 	'Alter type' => 'Türü değiştir',
+
+	'overwrite' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Evet',
+	'No' => 'Hayır',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/uk.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logout' => 'Вийти',
 	'Logged as: %s' => 'Ви увійшли як: %s',
 	'Logout successful.' => 'Ви вдало вийшли з системи.',
-	'Invalid credentials.' => 'Неправильні дані входу.',
+	'Invalid server or credentials.' => null,
 	'Language' => 'Мова',
 	'Invalid CSRF token. Send the form again.' => 'Недійсний CSRF токен. Надішліть форму ще раз.',
 	'No extension' => 'Нема розширень',
@@ -19,10 +19,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Сесія закінчилась, будь ласка, увійдіть в систему знову.',
 	'%s version: %s through PHP extension %s' => 'Версія %s: %s з PHP-розширенням %s',
 	'Refresh' => 'Оновити',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Привілеї',
 	'Create user' => 'Створити користувача',
 	'User has been dropped.' => 'Користувача було видалено.',
@@ -33,14 +33,14 @@ $translations = array(
 	'Routine' => 'Процедура',
 	'Grant' => 'Дозволити',
 	'Revoke' => 'Заборонити',
-	
+
 	'Process list' => 'Перелік процесів',
 	'%d process(es) have been killed.' => array('Було завершено %d процес.', 'Було завершено %d процеси.', 'Було завершёно %d процесів.'),
 	'Kill' => 'Завершити процес',
-	
+
 	'Variables' => 'Змінні',
 	'Status' => 'Статус',
-	
+
 	'SQL command' => 'SQL запит',
 	'%d query(s) executed OK.' => array('%d запит виконано успішно.', '%d запити виконано успішно.', '%d запитів виконано успішно.'),
 	'Query executed OK, %d row(s) affected.' => array('Запит виконано успішно, змінено %d рядок.', 'Запит виконано успішно, змінено %d рядки.', 'Запит виконано успішно, змінено %d рядків.'),
@@ -54,7 +54,7 @@ $translations = array(
 	'History' => 'Історія',
 	'Clear' => 'Очистити',
 	'Edit all' => 'Редагувати все',
-	
+
 	'File upload' => 'Завантажити файл',
 	'From server' => 'З сервера',
 	'Webserver file %s' => 'Файл %s на вебсервері',
@@ -64,14 +64,14 @@ $translations = array(
 	'Unable to upload a file.' => 'Неможливо завантажити файл.',
 	'Maximum allowed file size is %sB.' => 'Максимально допустимий розмір файлу %sБ.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Занадто великий об\'єм POST-даних. Зменшіть об\'єм або збільшіть параметр директиви %s конфигурації.',
-	
+
 	'Export' => 'Експорт',
 	'Output' => 'Вихідні дані',
 	'open' => 'відкрити',
 	'save' => 'зберегти',
 	'Format' => 'Формат',
 	'Data' => 'Дані',
-	
+
 	'Database' => 'База даних',
 	'database' => 'база даних',
 	'Use' => 'Обрати',
@@ -85,10 +85,10 @@ $translations = array(
 	'Alter database' => 'Змінити базу даних',
 	'Create database' => 'Створити базу даних',
 	'Database schema' => 'Схема бази даних',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Постійне посилання',
-	
+
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -110,7 +110,7 @@ $translations = array(
 	'Tables have been moved.' => 'Таблиці було перенесено.',
 	'Copy' => 'копіювати',
 	'Tables have been copied.' => 'Таблиці було зкопійовано.',
-	
+
 	'Routines' => 'Збережені процедури',
 	'Routine has been called, %d row(s) affected.' => array('Була викликана процедура, %d запис було змінено.', 'Була викликана процедура, %d записи було змінено.', 'Була викликана процедура, %d записів було змінено.'),
 	'Call' => 'Викликати',
@@ -123,7 +123,7 @@ $translations = array(
 	'Alter function' => 'Змінити функцію',
 	'Alter procedure' => 'Змінити процедуру',
 	'Return type' => 'Тип, що повернеться',
-	
+
 	'Events' => 'Події',
 	'Event has been dropped.' => 'Подію було видалено.',
 	'Event has been altered.' => 'Подію було змінено.',
@@ -136,7 +136,7 @@ $translations = array(
 	'Start' => 'Початок',
 	'End' => 'Кінець',
 	'On completion preserve' => 'Після завершення зберегти',
-	
+
 	'Tables' => 'Таблиці',
 	'Tables and views' => 'Таблиці і вигляди',
 	'Table' => 'Таблиця',
@@ -165,26 +165,26 @@ $translations = array(
 	'Move down' => 'Пересунути вниз',
 	'Remove' => 'Видалити',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Досягнута максимальна кількість доступних полів. Будь ласка, збільшіть %s.',
-	
+
 	'Partition by' => 'Розділити по',
 	'Partitions' => 'Розділи',
 	'Partition name' => 'Назва розділу',
 	'Values' => 'Значення',
-	
+
 	'View' => 'Вигляд',
 	'View has been dropped.' => 'Вигляд було видалено.',
 	'View has been altered.' => 'Вигляд було змінено.',
 	'View has been created.' => 'Вигляд було створено.',
 	'Alter view' => 'Змінити вигляд',
 	'Create view' => 'Створити вигляд',
-	
+
 	'Indexes' => 'Індекси',
 	'Indexes have been altered.' => 'Індексування було змінено.',
 	'Alter indexes' => 'Змінити індексування',
 	'Add next' => 'Додати ще',
 	'Index Type' => 'Тип індексу',
 	'Column (length)' => 'Стовпець (довжина)',
-	
+
 	'Foreign keys' => 'Зовнішні ключі',
 	'Foreign key' => 'Зовнішній ключ',
 	'Foreign key has been dropped.' => 'Зовнішній ключ було видалено.',
@@ -200,7 +200,7 @@ $translations = array(
 	'ON DELETE' => 'ПРИ ВИДАЛЕННІ',
 	'ON UPDATE' => 'ПРИ ЗМІНІ',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Стовпці повинні мати той самий тип даних, цільові стовпці повинні бути проіндексовані і дані, на які посилаються повинні існувати.',
-	
+
 	'Triggers' => 'Тригери',
 	'Add trigger' => 'Додати тригер',
 	'Trigger has been dropped.' => 'Тригер було видалено.',
@@ -211,7 +211,7 @@ $translations = array(
 	'Time' => 'Час',
 	'Event' => 'Подія',
 	'Name' => 'Назва',
-	
+
 	'select' => 'вибрати',
 	'Select' => 'Вибрати',
 	'Select data' => 'Вибрати дані',
@@ -232,14 +232,14 @@ $translations = array(
 	'last' => 'остання',
 	'Whole result' => 'Весь результат',
 	'%d byte(s)' => array('%d байт', '%d байта', '%d байтів'),
-	
+
 	'Import' => 'Імпортувати',
 	'%d row(s) have been imported.' => array('%d рядок було імпортовано.', '%d рядки було імпортовано.', '%d рядків було імпортовано.'),
-	
+
 	// in-place editing in select
 	'Ctrl+click on a value to modify it.' => 'Ctrl+клікніть на значенні щоб змінити його.',
 	'Use edit link to modify this value.' => 'Використовуйте посилання щоб змінити це значення.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Запис%s було вставлено.',
 	'Item has been deleted.' => 'Запис було видалено.',
@@ -257,14 +257,14 @@ $translations = array(
 	'Save and insert next' => 'Зберегти і вставити знову',
 	'Clone' => 'Клонувати',
 	'Delete' => 'Видалити',
-	
+
 	'E-mail' => 'E-mail',
 	'From' => 'Від',
 	'Subject' => 'Заголовок',
 	'Attachments' => 'Додатки',
 	'Send' => 'Надіслати',
 	'%d e-mail(s) have been sent.' => array('Було надіслано %d повідомлення.', 'Було надіслано %d повідомлення.', 'Було надіслано %d повідомлень.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Числа',
 	'Date and time' => 'Дата і час',
@@ -274,7 +274,7 @@ $translations = array(
 	'Network' => 'Мережа',
 	'Geometry' => 'Геометрія',
 	'Relations' => 'Зв\'язки',
-	
+
 	'Editor' => 'Редактор',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$5.$3.$1',
@@ -285,11 +285,11 @@ $translations = array(
 	'now' => 'зараз',
 	'yes' => 'так',
 	'no' => 'ні',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Файл існує.',
 	'Please use one of the extensions %s.' => 'Будь ласка, використовуйте одне з розширень %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Змінити схему',
 	'Create schema' => 'Створити схему',
@@ -298,7 +298,7 @@ $translations = array(
 	'Schema has been altered.' => 'Схему було змінено.',
 	'Schema' => 'Схема',
 	'Invalid schema.' => 'Невірна схема.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Послідовності',
 	'Create sequence' => 'Створити послідовність',
@@ -306,7 +306,7 @@ $translations = array(
 	'Sequence has been created.' => 'Послідовність було створено.',
 	'Sequence has been altered.' => 'Послідовність було змінено.',
 	'Alter sequence' => 'Змінити послідовність',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Типи користувачів',
 	'Create type' => 'Створити тип',
@@ -343,4 +343,16 @@ $translations = array(
 	'Saving' => 'Збереження',
 	'Unknown error.' => 'Невідома помилка.',
 	'Database does not support password.' => 'База даних не підтримує пароль.',
+
+	'Vacuum' => null,
+	'%d / ' => array(),
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Так',
+	'No' => 'Ні',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/vi.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logout' => 'Thoát',
 	'Logged as: %s' => 'Vào dưới tên: %s',
 	'Logout successful.' => 'Đã thoát xong.',
-	'Invalid credentials.' => 'Tài khoản sai.',
+	'Invalid server or credentials.' => null,
 	'Too many unsuccessful logins, try again in %d minute(s).' => 'Bạn gõ sai tài khoản quá nhiều lần, hãy thử lại sau %d phút nữa.',
 	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Mật khẩu đã hết hạn. <a href="https://www.adminer.org/en/extension/"%s>Thử cách làm</a> để giữ cố định.',
 	'Language' => 'Ngôn ngữ',
@@ -21,10 +21,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Phiên làm việc đã hết, hãy đăng nhập lại.',
 	'%s version: %s through PHP extension %s' => 'Phiên bản %s: %s (PHP extension: %s)',
 	'Refresh' => 'Làm mới',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Quyền truy cập',
 	'Create user' => 'Tạo người dùng',
 	'User has been dropped.' => 'Đã xoá người dùng.',
@@ -35,14 +35,14 @@ $translations = array(
 	'Routine' => 'Hàm tích hợp',
 	'Grant' => 'Cấp quyền',
 	'Revoke' => 'Tước quyền',
-	
+
 	'Process list' => 'Danh sách tiến trình',
 	'%d process(es) have been killed.' => '%d tiến trình đã dừng.',
 	'Kill' => 'Dừng',
-	
+
 	'Variables' => 'Biến',
 	'Status' => 'Trạng thái',
-	
+
 	'SQL command' => 'Câu lệnh SQL',
 	'%d query(s) executed OK.' => '%d câu lệnh đã chạy thành công.',
 	'Query executed OK, %d row(s) affected.' => 'Đã thực hiện xong, ảnh hưởng đến %d dòng.',
@@ -56,7 +56,7 @@ $translations = array(
 	'History' => 'Lịch sử',
 	'Clear' => 'Xoá',
 	'Edit all' => 'Sửa tất cả',
-	
+
 	'File upload' => 'Tải tệp lên',
 	'From server' => 'Dùng tệp trên máy chủ',
 	'Webserver file %s' => 'Tệp trên máy chủ',
@@ -67,14 +67,14 @@ $translations = array(
 	'Maximum allowed file size is %sB.' => 'Kích thước tệp tối đa là %sB.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Dữ liệu tải lên/POST quá lớn. Hãy giảm kích thước tệp hoặc tăng cấu hình (hiện tại %s).',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Bạn có thể tải tệp lên dùng FTP và nhập vào cơ sở dữ liệu.',
-	
+
 	'Export' => 'Xuất',
 	'Output' => 'Kết quả',
 	'open' => 'xem',
 	'save' => 'lưu',
 	'Format' => 'Định dạng',
 	'Data' => 'Dữ liệu',
-	
+
 	'Database' => 'Cơ sở dữ liệu',
 	'database' => 'cơ sở dữ liệu',
 	'Use' => 'Sử dụng',
@@ -88,10 +88,10 @@ $translations = array(
 	'Alter database' => 'Thay đổi CSDL',
 	'Create database' => 'Tạo CSDL',
 	'Database schema' => 'Cấu trúc CSDL',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Liên kết cố định',
-	
+
 	// thousands separator - must contain single byte
 	',' => ',',
 	'0123456789' => '0123456789',
@@ -114,7 +114,7 @@ $translations = array(
 	'Tables have been moved.' => 'Bảng.',
 	'Copy' => 'Sao chép',
 	'Tables have been copied.' => 'Bảng đã được sao chép.',
-	
+
 	'Routines' => 'Routines',
 	'Routine has been called, %d row(s) affected.' => 'Đã chạy routine, thay đổi %d dòng.',
 	'Call' => 'Gọi',
@@ -139,7 +139,7 @@ $translations = array(
 	'Start' => 'Bắt đầu',
 	'End' => 'Kết thúc',
 	'On completion preserve' => 'Khi kết thúc, duy trì',
-	
+
 	'Tables' => 'Các bảng',
 	'Tables and views' => 'Bảng và khung nhìn',
 	'Table' => 'Bảng',
@@ -170,26 +170,26 @@ $translations = array(
 	'Move down' => 'Chuyển xuống dưới',
 	'Remove' => 'Xoá',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Thiết lập %s cần tăng thêm. (Đã vượt giới hạnố trường tối đa cho phép trong một biểu mẫu).',
-	
+
 	'Partition by' => 'Phân chia bằng',
 	'Partitions' => 'Phân hoạch',
 	'Partition name' => 'Tên phân hoạch',
 	'Values' => 'Giá trị',
-	
+
 	'View' => 'Khung nhìn',
 	'View has been dropped.' => 'Khung nhìn đã bị xoá.',
 	'View has been altered.' => 'Khung nhìn đã được sửa.',
 	'View has been created.' => 'Khung nhìn đã được tạo.',
 	'Alter view' => 'Sửa khung nhìn',
 	'Create view' => 'Tạo khung nhìn',
-	
+
 	'Indexes' => 'Chỉ mục',
 	'Indexes have been altered.' => 'Chỉ mục đã được sửa.',
 	'Alter indexes' => 'Sửa chỉ mục',
 	'Add next' => 'Thêm tiếp',
 	'Index Type' => 'Loại chỉ mục',
 	'Column (length)' => 'Cột (độ dài)',
-	
+
 	'Foreign keys' => 'Các khoá ngoại',
 	'Foreign key' => 'Khoá ngoại',
 	'Foreign key has been dropped.' => 'Khoá ngoại đã bị xoá.',
@@ -205,7 +205,7 @@ $translations = array(
 	'ON DELETE' => 'Khi xoá',
 	'ON UPDATE' => 'Khi cập nhật',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Cột gốc và cột đích phải cùng kiểu, phải đặt chỉ mục trong cột đích và dữ liệu tham chiếu phải tồn tại.',
-	
+
 	'Triggers' => 'Phản xạ',
 	'Add trigger' => 'Thêm phản xạ',
 	'Trigger has been dropped.' => 'Đã xoá phản xạ.',
@@ -216,7 +216,7 @@ $translations = array(
 	'Time' => 'Thời gian',
 	'Event' => 'Sự kiện',
 	'Name' => 'Tên',
-	
+
 	'select' => 'xem',
 	'Select' => 'Xem',
 	'Select data' => 'Xem dữ liệu',
@@ -240,16 +240,16 @@ $translations = array(
 	'Loading' => 'Đang nạp',
 	'Whole result' => 'Toàn bộ kết quả',
 	'%d byte(s)' => '%d byte(s)',
-	
+
 	'Import' => 'Nhập khẩu',
 	'%d row(s) have been imported.' => 'Đã nhập % dòng dữ liệu.',
 	'File must be in UTF-8 encoding.' => 'Tệp phải mã hoá bằng chuẩn UTF-8.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Sửa',
 	'Ctrl+click on a value to modify it.' => 'Nhấn Ctrl và bấm vào giá trị để sửa.',
 	'Use edit link to modify this value.' => 'Dùng nút sửa để thay đổi giá trị này.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Đã thêm%s.',
 	'Item has been deleted.' => 'Đã xoá.',
@@ -269,14 +269,14 @@ $translations = array(
 	'Clone' => 'Sao chép',
 	'Delete' => 'Xoá',
 	'You have no privileges to update this table.' => 'Bạn không có quyền sửa bảng này.',
-	
+
 	'E-mail' => 'Địa chỉ email',
 	'From' => 'Người gửi',
 	'Subject' => 'Chủ đề',
 	'Attachments' => 'Đính kèm',
 	'Send' => 'Gửi',
 	'%d e-mail(s) have been sent.' => '%d thư đã gửi.',
-	
+
 	// data type descriptions
 	'Numbers' => 'Số',
 	'Date and time' => 'Ngày giờ',
@@ -286,7 +286,7 @@ $translations = array(
 	'Network' => 'Mạng',
 	'Geometry' => 'Toạ độ',
 	'Relations' => 'Quan hệ',
-	
+
 	'Editor' => 'Biên tập',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1-$3-$5',
@@ -297,11 +297,11 @@ $translations = array(
 	'now' => 'hiện tại',
 	'yes' => 'có',
 	'no' => 'không',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Tệp đã có rồi.',
 	'Please use one of the extensions %s.' => 'Cần phải dùng một trong các phần mở rộng sau: %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Thay đổi schema',
 	'Create schema' => 'Tạo schema',
@@ -310,7 +310,7 @@ $translations = array(
 	'Schema has been altered.' => 'Đã thay đổi schema.',
 	'Schema' => 'Schema',
 	'Invalid schema.' => 'Schema không hợp lệ.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Dãy số',
 	'Create sequence' => 'Tạo dãy số',
@@ -318,11 +318,40 @@ $translations = array(
 	'Sequence has been created.' => 'Đã tạo dãy số.',
 	'Sequence has been altered.' => 'Đã sửa dãy số.',
 	'Alter sequence' => 'Thay đổi dãy số',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Kiểu tự định nghĩa',
 	'Create type' => 'Tạo kiểu',
 	'Type has been dropped.' => 'Đã xoá kiểu.',
 	'Type has been created.' => 'Đã tạo kiểu.',
 	'Alter type' => 'Sửa kiểu dữ liệu',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You are offline.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Có',
+	'No' => 'Không',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/xx.inc.php

@@ -11,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => 'Xx: %s',
 	'Logout successful.' => 'Xx.',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Xx <a href="https://www.adminer.org/en/donation/">xx</a>.',
-	'Invalid credentials.' => 'Xx.',
+	'Invalid server or credentials.' => 'Xx.',
 	'There is a space in the input password which might be the cause.' => 'Xx.',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Xx, <a href="https://www.adminer.org/en/password/"%s>xx</a>.',
 	'Database does not support password.' => 'Xx.',
@@ -29,10 +29,10 @@ $translations = array(
 	'The action will be performed after successful login with the same credentials.' => 'Xx.',
 	'%s version: %s through PHP extension %s' => '%s xx: %s xx %s',
 	'Refresh' => 'Xx',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'xx',
-	
+
 	'Privileges' => 'Xx',
 	'Create user' => 'Xx',
 	'User has been dropped.' => 'Xx.',
@@ -43,14 +43,14 @@ $translations = array(
 	'Routine' => 'Xx',
 	'Grant' => 'Xx',
 	'Revoke' => 'Xx',
-	
+
 	'Process list' => 'Xx',
 	'%d process(es) have been killed.' => array('%d xx.', '%d xx.'),
 	'Kill' => 'Xx',
-	
+
 	'Variables' => 'Xx',
 	'Status' => 'Xx',
-	
+
 	'SQL command' => 'Xx',
 	'%d query(s) executed OK.' => array('%d xx.', '%d xx.'),
 	'Query executed OK, %d row(s) affected.' => array('Xx, %d.', 'Xx, %d.'),
@@ -67,7 +67,7 @@ $translations = array(
 	'History' => 'Xx',
 	'Clear' => 'Xx',
 	'Edit all' => 'Xx',
-	
+
 	'File upload' => 'Xx',
 	'From server' => 'Xx',
 	'Webserver file %s' => 'Xx %s',
@@ -79,7 +79,7 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Xx %s.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Xx.',
 	'You are offline.' => 'Xx.',
-	
+
 	'Export' => 'Xx',
 	'Output' => 'Xx',
 	'open' => 'xx',
@@ -87,7 +87,7 @@ $translations = array(
 	'Saving' => 'Xx',
 	'Format' => 'Xx',
 	'Data' => 'Xx',
-	
+
 	'Database' => 'Xx',
 	'database' => 'xx',
 	'DB' => 'XX',
@@ -102,10 +102,10 @@ $translations = array(
 	'Alter database' => 'Xx',
 	'Create database' => 'Xx',
 	'Database schema' => 'Xx',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Xx',
-	
+
 	// thousands separator - must contain single byte
 	',' => 'x',
 	'0123456789' => 'xxxxxxxxxx',
@@ -129,7 +129,7 @@ $translations = array(
 	'Copy' => 'Xx',
 	'Tables have been copied.' => 'Xx.',
 	'overwrite' => 'xx',
-	
+
 	'Routines' => 'Xx',
 	'Routine has been called, %d row(s) affected.' => array('Xx, %d.', 'Xx, %d.'),
 	'Call' => 'Xx',
@@ -142,7 +142,7 @@ $translations = array(
 	'Alter function' => 'Xx',
 	'Alter procedure' => 'Xx',
 	'Return type' => 'Xx',
-	
+
 	'Events' => 'Xx',
 	'Event has been dropped.' => 'Xx.',
 	'Event has been altered.' => 'Xx.',
@@ -155,7 +155,7 @@ $translations = array(
 	'Start' => 'Xx',
 	'End' => 'Xx',
 	'On completion preserve' => 'Xx',
-	
+
 	'Tables' => 'Xx',
 	'Tables and views' => 'Xx',
 	'Table' => 'Xx',
@@ -188,12 +188,12 @@ $translations = array(
 	'Move down' => 'Xx',
 	'Remove' => 'Xx',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Xx %s.',
-	
+
 	'Partition by' => 'Xx',
 	'Partitions' => 'Xx',
 	'Partition name' => 'Xx',
 	'Values' => 'Xx',
-	
+
 	'View' => 'Xx',
 	'Materialized view' => 'Xx',
 	'View has been dropped.' => 'Xx.',
@@ -201,14 +201,14 @@ $translations = array(
 	'View has been created.' => 'Xx.',
 	'Alter view' => 'Xx',
 	'Create view' => 'Xx',
-	
+
 	'Indexes' => 'Xx',
 	'Indexes have been altered.' => 'Xx.',
 	'Alter indexes' => 'Xx',
 	'Add next' => 'Xx',
 	'Index Type' => 'Xx',
 	'Column (length)' => 'Xx',
-	
+
 	'Foreign keys' => 'Xx',
 	'Foreign key' => 'Xx',
 	'Foreign key has been dropped.' => 'Xx.',
@@ -224,7 +224,7 @@ $translations = array(
 	'ON DELETE' => 'Xx',
 	'ON UPDATE' => 'Xx',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Xx.',
-	
+
 	'Triggers' => 'Xx',
 	'Add trigger' => 'Xx',
 	'Trigger has been dropped.' => 'Xx.',
@@ -235,7 +235,7 @@ $translations = array(
 	'Time' => 'Xx',
 	'Event' => 'Xx',
 	'Name' => 'Xx',
-	
+
 	'select' => 'xx',
 	'Select' => 'Xx',
 	'Select data' => 'Xx',
@@ -261,16 +261,16 @@ $translations = array(
 	'Loading' => 'Xx',
 	'Whole result' => 'Xx',
 	'%d byte(s)' => array('%d xx', '%d xx'),
-	
+
 	'Import' => 'Xx',
 	'%d row(s) have been imported.' => array('%d xx.', '%d xx.'),
 	'File must be in UTF-8 encoding.' => 'Xx.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Xx',
 	'Ctrl+click on a value to modify it.' => 'Xx.',
 	'Use edit link to modify this value.' => 'Xx.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Xx%s.',
 	'Item has been deleted.' => 'Xx.',
@@ -290,14 +290,14 @@ $translations = array(
 	'Clone' => 'Xx',
 	'Delete' => 'Xx',
 	'You have no privileges to update this table.' => 'Xx.',
-	
+
 	'E-mail' => 'Xx',
 	'From' => 'Xx',
 	'Subject' => 'Xx',
 	'Attachments' => 'Xx',
 	'Send' => 'Xx',
 	'%d e-mail(s) have been sent.' => array('%d xx.', '%d xx.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Xx',
 	'Date and time' => 'Xx',
@@ -307,7 +307,7 @@ $translations = array(
 	'Network' => 'Xx',
 	'Geometry' => 'Xx',
 	'Relations' => 'Xx',
-	
+
 	'Editor' => 'Xx',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => 'xx',
@@ -318,11 +318,11 @@ $translations = array(
 	'now' => 'xx',
 	'yes' => 'xx',
 	'no' => 'xx',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Xx.',
 	'Please use one of the extensions %s.' => 'Xx %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Xx',
 	'Create schema' => 'Xx',
@@ -331,7 +331,7 @@ $translations = array(
 	'Schema has been altered.' => 'Xx.',
 	'Schema' => 'Xx',
 	'Invalid schema.' => 'Xx.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Xx',
 	'Create sequence' => 'Xx',
@@ -339,11 +339,20 @@ $translations = array(
 	'Sequence has been created.' => 'Xx.',
 	'Sequence has been altered.' => 'Xx.',
 	'Alter sequence' => 'Xx',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Xx',
 	'Create type' => 'Xx',
 	'Type has been dropped.' => 'Xx.',
 	'Type has been created.' => 'Xx.',
 	'Alter type' => 'Xx',
+
+	// Plugins
+	'Columns' => 'Xx',
+	'Nullable' => 'Xx',
+	'Default' => 'Xx',
+	'Yes' => 'Xx',
+	'No' => 'Xx',
+	'One Time Password' => 'Xx',
+	'Invalid OTP code.' => 'Xx.',
 );

adminer/lang/zh-tw.inc.php

@@ -11,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => '登錄為： %s',
 	'Logout successful.' => '成功登出。',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => '感謝使用Adminer，請考慮為我們<a href="https://www.adminer.org/en/donation/">捐款（英文網頁）</a>.',
-	'Invalid credentials.' => '無效的憑證。',
+	'Invalid server or credentials.' => null,
 	'There is a space in the input password which might be the cause.' => '您輸入的密碼中有一個空格，這可能是導致問題的原因。',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer預設不支援訪問沒有密碼的資料庫，<a href="https://www.adminer.org/en/password/"%s>詳情見這裡</a>.',
 	'Database does not support password.' => '資料庫不支援密碼。',
@@ -29,10 +29,10 @@ $translations = array(
 	'The action will be performed after successful login with the same credentials.' => '此操作將在成功使用相同的憑據登錄後執行。',
 	'%s version: %s through PHP extension %s' => '%s 版本：%s 透過 PHP 擴充模組 %s',
 	'Refresh' => '重新載入',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => '權限',
 	'Create user' => '建立使用者',
 	'User has been dropped.' => '已刪除使用者。',
@@ -43,14 +43,14 @@ $translations = array(
 	'Routine' => '程序',
 	'Grant' => '授權',
 	'Revoke' => '廢除',
-	
+
 	'Process list' => '處理程序列表',
 	'%d process(es) have been killed.' => '%d 個 Process(es) 被終止',
 	'Kill' => '終止',
-	
+
 	'Variables' => '變數',
 	'Status' => '狀態',
-	
+
 	'SQL command' => 'SQL 命令',
 	'%d query(s) executed OK.' => '已順利執行 %d 個查詢。',
 	'Query executed OK, %d row(s) affected.' => '執行查詢 OK，%d 行受影響。',
@@ -67,7 +67,7 @@ $translations = array(
 	'History' => '紀錄',
 	'Clear' => '清除',
 	'Edit all' => '編輯全部',
-	
+
 	'File upload' => '檔案上傳',
 	'From server' => '從伺服器',
 	'Webserver file %s' => '網頁伺服器檔案 %s',
@@ -79,7 +79,7 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST 資料太大。減少資料或者增加 %s 的設定值。',
 	'You can upload a big SQL file via FTP and import it from server.' => '您可以通過FTP上傳大型SQL檔並從伺服器導入。',
 	'You are offline.' => '您離線了。',
-	
+
 	'Export' => '匯出',
 	'Output' => '輸出',
 	'open' => '打開',
@@ -87,7 +87,7 @@ $translations = array(
 	'Saving' => '保存中',
 	'Format' => '格式',
 	'Data' => '資料',
-	
+
 	'Database' => '資料庫',
 	'database' => '資料庫',
 	'DB' => '資料庫',
@@ -102,10 +102,10 @@ $translations = array(
 	'Alter database' => '修改資料庫',
 	'Create database' => '建立資料庫',
 	'Database schema' => '資料庫結構',
-	
+
 	// link to current database schema layout
 	'Permanent link' => '永久連結',
-	
+
 	// thousands separator - must contain single byte
 	',' => ',',
 	'0123456789' => '0123456789',
@@ -129,7 +129,7 @@ $translations = array(
 	'Copy' => '複製',
 	'Tables have been copied.' => '資料表已經複製',
 	'overwrite' => '覆蓋',
-	
+
 	'Routines' => '程序',
 	'Routine has been called, %d row(s) affected.' => '程序已被執行，%d 行被影響',
 	'Call' => '呼叫',
@@ -142,7 +142,7 @@ $translations = array(
 	'Alter function' => '修改函式',
 	'Alter procedure' => '修改預存程序',
 	'Return type' => '回傳類型',
-	
+
 	'Events' => '事件',
 	'Event has been dropped.' => '已刪除事件。',
 	'Event has been altered.' => '已修改事件。',
@@ -155,7 +155,7 @@ $translations = array(
 	'Start' => '開始',
 	'End' => '結束',
 	'On completion preserve' => '在完成後儲存',
-	
+
 	'Tables' => '資料表',
 	'Tables and views' => '資料表和檢視表',
 	'Table' => '資料表',
@@ -188,12 +188,12 @@ $translations = array(
 	'Move down' => '下移',
 	'Remove' => '移除',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => '超過允許的字段數量的最大值。請增加 %s。',
-	
+
 	'Partition by' => '分區類型',
 	'Partitions' => '分區',
 	'Partition name' => '分區名稱',
 	'Values' => '值',
-	
+
 	'View' => '檢視表',
 	'Materialized view' => '物化視圖',
 	'View has been dropped.' => '已刪除檢視表。',
@@ -201,14 +201,14 @@ $translations = array(
 	'View has been created.' => '已建立檢視表。',
 	'Alter view' => '修改檢視表',
 	'Create view' => '建立檢視表',
-	
+
 	'Indexes' => '索引',
 	'Indexes have been altered.' => '已修改索引。',
 	'Alter indexes' => '修改索引',
 	'Add next' => '新增下一筆',
 	'Index Type' => '索引類型',
 	'Column (length)' => '欄位（長度）',
-	
+
 	'Foreign keys' => '外來鍵',
 	'Foreign key' => '外來鍵',
 	'Foreign key has been dropped.' => '已刪除外來鍵。',
@@ -224,7 +224,7 @@ $translations = array(
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => '來源列和目標列必須具有相同的資料類型，在目標列上必須有一個索引並且引用的資料必須存在。',
-	
+
 	'Triggers' => '觸發器',
 	'Add trigger' => '建立觸發器',
 	'Trigger has been dropped.' => '已刪除觸發器。',
@@ -235,7 +235,7 @@ $translations = array(
 	'Time' => '時間',
 	'Event' => '事件',
 	'Name' => '名稱',
-	
+
 	'select' => '選擇',
 	'Select' => '選擇',
 	'Select data' => '選擇資料',
@@ -261,16 +261,16 @@ $translations = array(
 	'Loading' => '載入中',
 	'Whole result' => '所有結果',
 	'%d byte(s)' => '%d byte(s)',
-	
+
 	'Import' => '匯入',
 	'%d row(s) have been imported.' => '已匯入 %d 行。',
 	'File must be in UTF-8 encoding.' => '檔必須使用UTF-8編碼。',
-	
+
 	// in-place editing in select
 	'Modify' => '修改',
 	'Ctrl+click on a value to modify it.' => '按住Ctrl並按一下某個值進行修改。',
 	'Use edit link to modify this value.' => '使用編輯連結來修改。',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => '已新增項目 %s。',
 	'Item has been deleted.' => '該項目已被刪除',
@@ -290,14 +290,14 @@ $translations = array(
 	'Clone' => '複製',
 	'Delete' => '刪除',
 	'You have no privileges to update this table.' => '您沒有許可權更新這個資料表。',
-	
+
 	'E-mail' => '電子郵件',
 	'From' => '來自',
 	'Subject' => '主旨',
 	'Attachments' => '附件',
 	'Send' => '寄出',
 	'%d e-mail(s) have been sent.' => '已寄出 %d 封郵件。',
-	
+
 	// data type descriptions
 	'Numbers' => '數字',
 	'Date and time' => '日期時間',
@@ -307,7 +307,7 @@ $translations = array(
 	'Network' => '網路',
 	'Geometry' => '幾何',
 	'Relations' => '關聯',
-	
+
 	'Editor' => '編輯器',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$1.$3.$5',
@@ -318,11 +318,11 @@ $translations = array(
 	'now' => '現在',
 	'yes' => '是',
 	'no' => '否',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => '檔案已存在。',
 	'Please use one of the extensions %s.' => '請使用下列其中一個擴充模組 %s。',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => '修改資料表結構',
 	'Create schema' => '建立資料表結構',
@@ -331,7 +331,7 @@ $translations = array(
 	'Schema has been altered.' => '已修改資料表結構。',
 	'Schema' => '資料表結構',
 	'Invalid schema.' => '無效的資料表結構。',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => '序列',
 	'Create sequence' => '建立序列',
@@ -339,11 +339,20 @@ $translations = array(
 	'Sequence has been created.' => '已建立序列。',
 	'Sequence has been altered.' => '已修改序列。',
 	'Alter sequence' => '修改序列',
-	
+
 	// PostgreSQL user types support
 	'User types' => '使用者類型',
 	'Create type' => '建立類型',
 	'Type has been dropped.' => '已刪除類型。',
 	'Type has been created.' => '已建立類型。',
 	'Alter type' => '修改類型',
+
+	// Plugins
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/zh.inc.php

@@ -11,7 +11,7 @@ $translations = array(
 	'Logged as: %s' => '登录用户：%s',
 	'Logout successful.' => '成功登出。',
 	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => '感谢使用Adminer，请考虑为我们<a href="https://www.adminer.org/en/donation/">捐款（英文页面）</a>.',
-	'Invalid credentials.' => '无效凭据。',
+	'Invalid server or credentials.' => null,
 	'There is a space in the input password which might be the cause.' => '您输入的密码中有一个空格，这可能是导致问题的原因。',
 	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer默认不支持访问没有密码的数据库，<a href="https://www.adminer.org/en/password/"%s>详情见这里</a>.',
 	'Database does not support password.' => '数据库不支持密码。',
@@ -29,7 +29,7 @@ $translations = array(
 	'The action will be performed after successful login with the same credentials.' => '此操作将在成功使用相同的凭据登录后执行。',
 	'%s version: %s through PHP extension %s' => '%s 版本：%s， 使用PHP扩展 %s',
 	'Refresh' => '刷新',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
 
@@ -346,4 +346,12 @@ $translations = array(
 	'Type has been dropped.' => '已删除类型。',
 	'Type has been created.' => '已创建类型。',
 	'Alter type' => '修改类型',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/script.inc.php

@@ -12,7 +12,7 @@ if ($_GET["script"] == "db") {
 			foreach ($sums + array("Auto_increment" => 0, "Rows" => 0) as $key => $val) {
 				if ($table_status[$key] != "") {
 					$val = format_number($table_status[$key]);
-					json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == ($sql == "pgsql" ? "table" : "InnoDB")
+					json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == ($jush == "pgsql" ? "table" : "InnoDB")
 						? "~ $val"
 						: $val
 					));

adminer/select.inc.php

@@ -9,6 +9,8 @@ parse_str($_COOKIE["adminer_import"], $adminer_import);
 
 $rights = array(); // privilege => 0
 $columns = array(); // selectable columns
+$search_columns = array(); // searchable columns
+$order_columns = array(); // searchable columns
 $text_length = null;
 foreach ($fields as $key => $field) {
 	$name = $adminer->fieldName($field);
@@ -18,6 +20,12 @@ foreach ($fields as $key => $field) {
 			$text_length = $adminer->selectLengthProcess();
 		}
 	}
+	if (isset($field["privileges"]["where"]) && $name != "") {
+		$search_columns[$key] = html_entity_decode(strip_tags($name), ENT_QUOTES);
+	}
+	if (isset($field["privileges"]["order"]) && $name != "") {
+		$order_columns[$key] = html_entity_decode(strip_tags($name), ENT_QUOTES);
+	}
 	$rights += $field["privileges"];
 }
 
@@ -245,8 +253,8 @@ if (!$columns && support("table")) {
 	echo '<input type="hidden" name="select" value="' . h($TABLE) . '">';
 	echo "</div>\n";
 	$adminer->selectColumnsPrint($select, $columns);
-	$adminer->selectSearchPrint($where, $columns, $indexes);
+	$adminer->selectSearchPrint($where, $search_columns, $indexes);
-	$adminer->selectOrderPrint($order, $columns, $indexes);
+	$adminer->selectOrderPrint($order, $order_columns, $indexes);
 	$adminer->selectLimitPrint($limit);
 	$adminer->selectLengthPrint($text_length);
 	$adminer->selectActionPrint($indexes);
@@ -331,12 +339,20 @@ if (!$columns && support("table")) {
 						$column = idf_escape($key);
 						$href = remove_from_uri('(order|desc)[^=]*|page') . '&order%5B0%5D=' . urlencode($key);
 						$desc = "&desc%5B0%5D=1";
+						$sortable = isset($field["privileges"]["order"]);
 						echo "<th id='th[" . h(bracket_escape($key)) . "]'>" . script("mixin(qsl('th'), {onmouseover: partial(columnMouse), onmouseout: partial(columnMouse, ' hidden')});", "");
-						echo '<a href="' . h($href . ($order[0] == $column || $order[0] == $key || (!$order && $is_group && $group[0] == $column) ? $desc : '')) . '">'; // $order[0] == $key - COUNT(*)
+						if ($sortable) {
-						echo apply_sql_function($val["fun"], $name) . "</a>"; //! columns looking like functions
+							echo '<a href="' . h($href . ($order[0] == $column || $order[0] == $key || (!$order && $is_group && $group[0] == $column) ? $desc : '')) . '">'; // $order[0] == $key - COUNT(*)
+						}
+						echo apply_sql_function($val["fun"], $name); //! columns looking like functions
+						if ($sortable) {
+							echo "</a>";
+						}
 						echo "<span class='column hidden'>";
-						echo "<a href='" . h($href . $desc) . "' title='" . lang('descending') . "' class='text'> ↓</a>";
+						if ($sortable) {
-						if (!$val["fun"]) {
+							echo "<a href='" . h($href . $desc) . "' title='" . lang('descending') . "' class='text'> ↓</a>";
+						}
+						if (!$val["fun"] && isset($field["privileges"]["where"])) {
 							echo '<a href="#fieldset-search" title="' . lang('Search') . '" class="text jsonly"> =</a>';
 							echo script("qsl('a').onclick = partial(selectSearch, '" . js_escape($key) . "');");
 						}
@@ -552,9 +568,9 @@ if (!$columns && support("table")) {
 				}
 				if ($format) {
 					print_fieldset("export", lang('Export') . " <span id='selected2'></span>");
-					$output = $adminer->dumpOutput();
-					echo ($output ? html_select("output", $output, $adminer_import["output"]) . " " : "");
 					echo html_select("format", $format, $adminer_import["format"]);
+					$output = $adminer->dumpOutput();
+					echo ($output ? " " . html_select("output", $output, $adminer_import["output"]) : "");
 					echo " <input type='submit' name='export' value='" . lang('Export') . "'>\n";
 					echo "</div></fieldset>\n";
 				}
@@ -570,7 +586,7 @@ if (!$columns && support("table")) {
 				echo script("qsl('a').onclick = partial(toggle, 'import');", "");
 				echo "<span id='import' class='hidden'>: ";
 				echo "<input type='file' name='csv_file'> ";
-				echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_import["format"], 1); // 1 - select
+				echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_import["format"]);
 				echo " <input type='submit' name='import' value='" . lang('Import') . "'>";
 				echo "</span>";
 				echo "</div>";

adminer/sql.inc.php

@@ -32,8 +32,8 @@ if (!$error && $_POST) {
 	}
 
 	if (is_string($query)) { // get_file() returns error as number, fread() as false
-		if (function_exists('memory_get_usage')) {
+		if (function_exists('memory_get_usage') && ($memory_limit = ini_bytes("memory_limit")) != "-1") {
-			@ini_set("memory_limit", max(ini_bytes("memory_limit"), 2 * strlen($query) + memory_get_usage() + 8e6)); // @ - may be disabled, 2 - substr and trim, 8e6 - other variables
+			@ini_set("memory_limit", max($memory_limit, 2 * strlen($query) + memory_get_usage() + 8e6)); // @ - may be disabled, 2 - substr and trim, 8e6 - other variables
 		}
 
 		if ($query != "" && strlen($query) < 1e6) { // don't add big queries
@@ -81,13 +81,27 @@ if (!$error && $_POST) {
 					$offset = $pos + strlen($found);
 
 					if ($found && rtrim($found) != $delimiter) { // find matching quote or comment end
-						while (preg_match('(' . ($found == '/*' ? '\*/' : ($found == '[' ? ']' : (preg_match('~^-- |^#~', $found) ? "\n" : preg_quote($found) . "|\\\\."))) . '|$)s', $query, $match, PREG_OFFSET_CAPTURE, $offset)) { //! respect sql_mode NO_BACKSLASH_ESCAPES
+						$c_style_escapes = is_c_style_escapes() || ($jush == "pgsql" && ($pos > 0 && strtolower($query[$pos - 1]) == "e"));
+
+						$pattern = '(';
+						if ($found == '/*') {
+							$pattern .= '\*/';
+						} elseif ($found == '[') {
+							$pattern .= ']';
+						} elseif (preg_match('~^-- |^#~', $found)) {
+							$pattern .= "\n";
+						} else {
+							$pattern .= preg_quote($found) . ($c_style_escapes ? "|\\\\." : "");
+						}
+						$pattern .= '|$)s';
+
+						while (preg_match($pattern, $query, $match, PREG_OFFSET_CAPTURE, $offset)) {
 							$s = $match[0][0];
 							if (!$s && $fp && !feof($fp)) {
 								$query .= fread($fp, 1e5);
 							} else {
 								$offset = $match[0][1] + strlen($s);
-								if ($s[0] != "\\") {
+								if (!isset($s[0]) || $s[0] != "\\") {
 									break;
 								}
 							}
@@ -123,7 +137,7 @@ if (!$error && $_POST) {
 
 								if ($connection->error) {
 									echo ($_POST["only_errors"] ? $print : "");
-									echo "<p class='error'>" . lang('Error in query') . ($connection->errno ? " ($connection->errno)" : "") . ": " . error() . "\n";
+									echo "<p class='error'>" . lang('Error in query') . (!empty($connection->errno) ? " ($connection->errno)" : "") . ": " . error() . "\n";
 									$errors[] = " <a href='#sql-$commands'>$commands</a>";
 									if ($_POST["error_stops"]) {
 										break 2;
@@ -169,7 +183,8 @@ if (!$error && $_POST) {
 											stop_session();
 										}
 										if (!$_POST["only_errors"]) {
-											echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $affected) . "$time\n";
+											$title = isset($connection->info) ? "title='" . h($connection->info) . "'" : "";
+											echo "<p class='message' $title>" . lang('Query executed OK, %d row(s) affected.', $affected) . "$time\n";
 										}
 									}
 									echo ($warnings ? "<div id='$warnings_id' class='hidden'>\n$warnings</div>\n" : "");
@@ -225,7 +240,7 @@ if (!isset($_GET["import"])) {
 	echo script(($_POST ? "" : "qs('textarea').focus();\n") . "qs('#form').onsubmit = partial(sqlSubmit, qs('#form'), '" . js_escape(remove_from_uri("sql|limit|error_stops|only_errors|history")) . "');");
 	echo "<p>$execute\n";
 	echo lang('Limit rows') . ": <input type='number' name='limit' class='size' value='" . h($_POST ? $_POST["limit"] : $_GET["limit"]) . "'>\n";
-	
+
 } else {
 	echo "<fieldset><legend>" . lang('File upload') . "</legend><div>";
 	$gz = (extension_loaded("zlib") ? "[.gz]" : "");

adminer/static/default.css

@@ -19,15 +19,18 @@ fieldset { display: inline; vertical-align: top; padding: .5em .8em; margin: .8e
 p { margin: .8em 20px 0 0; }
 img { vertical-align: middle; border: 0; }
 td img { max-width: 200px; max-height: 200px; }
-code { background: #eee; }
 tbody tr:hover td, tbody tr:hover th { background: #eee; }
+code { font-size: 110%; padding: 1px 2px; background: #eee; }
 pre { margin: 1em 0 0; }
-pre, textarea { font: 100%/1.25 monospace; }
+pre code { display: block; font-size: 100%; }
+pre, textarea { font: 110%/1.25 monospace; }
+pre.jush { background: #fff; }
 input, select { vertical-align: middle; }
 input.default { box-shadow: 1px 1px 1px #777; }
 input.required { box-shadow: 1px 1px 1px red; }
 input.maxlength { box-shadow: 1px 1px 1px red; }
 input.wayoff { left: -1000px; position: absolute; }
+.center { text-align: center; }
 .block { display: block; }
 .version { color: #777; font-size: 67%; }
 .js .hidden, .nojs .jsonly { display: none; }
@@ -69,7 +72,7 @@ input.wayoff { left: -1000px; position: absolute; }
 #menu p, #logins, #tables { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
 #logins li, #tables li { list-style: none; }
 #dbs { overflow: hidden; }
-#logins, #tables { white-space: nowrap; overflow: auto; }
+#logins, #tables { white-space: nowrap; overflow: hidden; }
 #logins a, #tables a, #tables span { background: #fff; }
 #content { margin: 2em 0 0 21em; padding: 10px 20px 20px 0; }
 #lang { position: absolute; top: 0; left: 0; line-height: 1.8em; padding: .3em 1em; }
@@ -90,7 +93,7 @@ input.wayoff { left: -1000px; position: absolute; }
 .rtl input.wayoff { left: auto; right: -1000px; }
 .rtl #lang, .rtl #menu { left: auto; right: 0; }
 
-@media all and (max-device-width: 880px) {
+@media all and (max-width: 880px) {
 	.pages { left: auto; }
 	#menu { position: static; width: auto; }
 	#content { margin-left: 10px; }

adminer/static/editing.js

@@ -54,7 +54,7 @@ function bodyLoad(version, maria) {
 function formField(form, name) {
 	// required in IE < 8, form.elements[name] doesn't work
 	for (var i=0; i < form.length; i++) {
-		if (form[i].name == name) {
+		if (form[i].name === name) {
 			return form[i];
 		}
 	}
@@ -83,14 +83,14 @@ function messagesPrint(el) {
 
 
 
-/** Hide or show some login rows for selected driver	
+/** Hide or show some login rows for selected driver
-* @param HTMLSelectElement	
+* @param HTMLSelectElement
-*/	
+*/
-function loginDriver(driver) {	
+function loginDriver(driver) {
-	var trs = parentTag(driver, 'table').rows;	
+	var trs = parentTag(driver, 'table').rows;
-	var disabled = /sqlite/.test(selectValue(driver));	
+	var disabled = /sqlite/.test(selectValue(driver));
 	alterClass(trs[1], 'hidden', disabled);	// 1 - row with server
-	trs[1].getElementsByTagName('input')[0].disabled = disabled;	
+	trs[1].getElementsByTagName('input')[0].disabled = disabled;
 }
 
 
@@ -104,7 +104,7 @@ var dbPrevious = {};
 */
 function dbMouseDown(event) {
 	dbCtrl = isCtrl(event);
-	if (dbPrevious[this.name] == undefined) {
+	if (dbPrevious[this.name] === undefined) {
 		dbPrevious[this.name] = this.value;
 	}
 }
@@ -118,7 +118,7 @@ function dbChange() {
 	}
 	this.form.submit();
 	this.form.target = '';
-	if (dbCtrl && dbPrevious[this.name] != undefined) {
+	if (dbCtrl && dbPrevious[this.name] !== undefined) {
 		this.value = dbPrevious[this.name];
 		dbPrevious[this.name] = undefined;
 	}
@@ -145,23 +145,23 @@ function selectFieldChange() {
 		for (var i=0; i < selects.length; i++) {
 			var select = selects[i];
 			var col = selectValue(select);
-			var match = /^(where.+)col\]/.exec(select.name);
+			var match = /^(where.+)col]/.exec(select.name);
 			if (match) {
 				var op = selectValue(form[match[1] + 'op]']);
 				var val = form[match[1] + 'val]'].value;
-				if (col in indexColumns && (!/LIKE|REGEXP/.test(op) || (op == 'LIKE' && val.charAt(0) != '%'))) {
+				if (col in indexColumns && (!/LIKE|REGEXP/.test(op) || (op === 'LIKE' && val.charAt(0) !== '%'))) {
 					return true;
 				} else if (col || val) {
 					ok = false;
 				}
 			}
-			if ((match = /^(columns.+)fun\]/.exec(select.name))) {
+			if ((match = /^(columns.+)fun]/.exec(select.name))) {
 				if (/^(avg|count|count distinct|group_concat|max|min|sum)$/.test(col)) {
 					group = true;
 				}
 				var val = selectValue(form[match[1] + 'col]']);
 				if (val) {
-					columns[col && col != 'count' ? '' : val] = 1;
+					columns[col && col !== 'count' ? '' : val] = 1;
 				}
 			}
 			if (col && /^order/.test(select.name)) {
@@ -194,7 +194,7 @@ var added = '.', rowCount;
 * @return boolean
 */
 function delimiterEqual(val, a, b) {
-	return (val == a + '_' + b || val == a + b || val == a + b.charAt(0).toUpperCase() + b.substr(1));
+	return (val === a + '_' + b || val === a + b || val === a + b.charAt(0).toUpperCase() + b.substr(1));
 }
 
 /** Escape string to use as identifier
@@ -255,7 +255,7 @@ function editingClick(event) {
 		} else if (/^drop_col\[/.test(name)) {
 			editingRemoveRow.call(el, 'fields\$1[field]');
 		} else {
-			if (name == 'auto_increment_col') {
+			if (name === 'auto_increment_col') {
 				var field = el.form['fields[' + el.value + '][field]'];
 				if (!field.value) {
 					field.value = 'id';
@@ -273,7 +273,7 @@ function editingClick(event) {
 */
 function editingInput(event) {
 	var el = getTarget(event);
-	if (/\[default\]$/.test(el.name)) {
+	if (/\[default]$/.test(el.name)) {
 		 el.previousSibling.checked = true;
 	}
 }
@@ -290,7 +290,7 @@ function editingNameChange() {
 	for (var i = opts.length; i--; ) {
 		var match = /(.+)`(.+)/.exec(opts[i].value);
 		if (!match) { // common type
-			if (candidate && i == opts.length - 2 && val == opts[candidate].value.replace(/.+`/, '') && name == 'fields[1]') { // single target table, link to column, first field - probably `id`
+			if (candidate && i === opts.length - 2 && val === opts[candidate].value.replace(/.+`/, '') && name === 'fields[1]') { // single target table, link to column, first field - probably `id`
 				return;
 			}
 			break;
@@ -300,7 +300,7 @@ function editingNameChange() {
 		var tables = [ table, table.replace(/s$/, ''), table.replace(/es$/, '') ];
 		for (var j=0; j < tables.length; j++) {
 			table = tables[j];
-			if (val == column || val == table || delimiterEqual(val, table, column) || delimiterEqual(val, column, table)) {
+			if (val === column || val === table || delimiterEqual(val, table, column) || delimiterEqual(val, column, table)) {
 				if (candidate) {
 					return;
 				}
@@ -335,7 +335,7 @@ function editingAddRow(focus) {
 	tags2 = qsa('input', row2);
 	var input = tags2[0]; // IE loose tags2 after insertBefore()
 	for (var i=0; i < tags.length; i++) {
-		if (tags[i].name == 'auto_increment_col') {
+		if (tags[i].name === 'auto_increment_col') {
 			tags2[i].value = x;
 			tags2[i].checked = false;
 		}
@@ -397,7 +397,7 @@ function editingTypeChange() {
 	var text = selectValue(type);
 	for (var i=0; i < type.form.elements.length; i++) {
 		var el = type.form.elements[i];
-		if (el.name == name + '[length]') {
+		if (el.name === name + '[length]') {
 			if (!(
 				(/(char|binary)$/.test(lastType) && /(char|binary)$/.test(text))
 				|| (/(enum|set)$/.test(lastType) && /(enum|set)$/.test(text))
@@ -406,19 +406,19 @@ function editingTypeChange() {
 			}
 			el.oninput.apply(el);
 		}
-		if (lastType == 'timestamp' && el.name == name + '[has_default]' && /timestamp/i.test(formField(type.form, name + '[default]').value)) {
+		if (lastType === 'timestamp' && el.name == name + '[has_default]' && /timestamp/i.test(formField(type.form, name + '[default]').value)) {
 			el.checked = false;
 		}
-		if (el.name == name + '[collation]') {
+		if (el.name === name + '[collation]') {
 			alterClass(el, 'hidden', !/(char|text|enum|set)$/.test(text));
 		}
-		if (el.name == name + '[unsigned]') {
+		if (el.name === name + '[unsigned]') {
 			alterClass(el, 'hidden', !/(^|[^o])int(?!er)|numeric|real|float|double|decimal|money/.test(text));
 		}
-		if (el.name == name + '[on_update]') {
+		if (el.name === name + '[on_update]') {
 			alterClass(el, 'hidden', !/timestamp|datetime/.test(text)); // MySQL supports datetime since 5.6.5
 		}
-		if (el.name == name + '[on_delete]') {
+		if (el.name === name + '[on_delete]') {
 			alterClass(el, 'hidden', !/`/.test(text));
 		}
 	}
@@ -457,13 +457,13 @@ function enumValues(s) {
 	var offset = 0;
 	var match;
 	while (match = re.exec(s)) {
-		if (offset != match.index) {
+		if (offset !== match.index) {
 			break;
 		}
 		result.push(match[2].replace(/'(')|\\(.)/g, '$1$2'));
 		offset += match[0].length;
 	}
-	return (offset == s.length ? result.join('\n') : s);
+	return (offset === s.length ? result.join('\n') : s);
 }
 
 /** Finish editing of enum or set
@@ -531,7 +531,7 @@ function dumpClick(event) {
 	var el = parentTag(getTarget(event), 'label');
 	if (el) {
 		el = qs('input', el);
-		var match = /(.+)\[\]$/.exec(el.name);
+		var match = /(.+)\[]$/.exec(el.name);
 		if (match) {
 			checkboxClick.call(el, event);
 			formUncheck('check-' + match[1]);
@@ -549,7 +549,7 @@ function foreignAddRow() {
 	this.onchange = function () { };
 	var selects = qsa('select', row);
 	for (var i=0; i < selects.length; i++) {
-		selects[i].name = selects[i].name.replace(/\]/, '1$&');
+		selects[i].name = selects[i].name.replace(']', '1]');
 		selects[i].selectedIndex = 0;
 	}
 	parentTag(this, 'table').appendChild(row);
@@ -585,7 +585,7 @@ function indexesChangeColumn(prefix) {
 	for (var tag in { 'select': 1, 'input': 1 }) {
 		var columns = qsa(tag, parentTag(this, 'td'));
 		for (var i=0; i < columns.length; i++) {
-			if (/\[columns\]/.test(columns[i].name)) {
+			if (/\[columns]/.test(columns[i].name)) {
 				var value = selectValue(columns[i]);
 				if (value) {
 					names.push(value);
@@ -593,7 +593,7 @@ function indexesChangeColumn(prefix) {
 			}
 		}
 	}
-	this.form[this.name.replace(/\].*/, '][name]')].value = prefix + names.join('_');
+	this.form[this.name.replace(/].*/, '][name]')].value = prefix + names.join('_');
 }
 
 /** Add column for index
@@ -602,9 +602,9 @@ function indexesChangeColumn(prefix) {
 */
 function indexesAddColumn(prefix) {
 	var field = this;
-	var select = field.form[field.name.replace(/\].*/, '][type]')];
+	var select = field.form[field.name.replace(/].*/, '][type]')];
 	if (!select.selectedIndex) {
-		while (selectValue(select) != "INDEX" && select.selectedIndex < select.options.length) {
+		while (selectValue(select) !== "INDEX" && select.selectedIndex < select.options.length) {
 			select.selectedIndex++;
 		}
 		select.onchange();
@@ -613,15 +613,15 @@ function indexesAddColumn(prefix) {
 	var selects = qsa('select', column);
 	for (var i = 0; i < selects.length; i++) {
 		select = selects[i];
-		select.name = select.name.replace(/\]\[\d+/, '$&1');
+		select.name = select.name.replace(/]\[\d+/, '$&1');
 		select.selectedIndex = 0;
 	}
 	field.onchange = partial(indexesChangeColumn, prefix);
 	var inputs = qsa('input', column);
 	for (var i = 0; i < inputs.length; i++) {
 		var input = inputs[i];
-		input.name = input.name.replace(/\]\[\d+/, '$&1');
+		input.name = input.name.replace(/]\[\d+/, '$&1');
-		if (input.type != 'checkbox') {
+		if (input.type !== 'checkbox') {
 			input.value = '';
 		}
 	}
@@ -670,7 +670,7 @@ var that, x, y; // em and tablePos defined in schema.inc.php
 * @this HTMLElement
 */
 function schemaMousedown(event) {
-	if ((event.which ? event.which : event.button) == 1) {
+	if ((event.which ? event.which : event.button) === 1) {
 		that = this;
 		x = event.clientX - this.offsetLeft;
 		y = event.clientY - this.offsetTop;
@@ -687,12 +687,12 @@ function schemaMousemove(event) {
 		var divs = qsa('div', that);
 		var lineSet = { };
 		for (var i=0; i < divs.length; i++) {
-			if (divs[i].className == 'references') {
+			if (divs[i].className === 'references') {
 				var div2 = qs('[id="' + (/^refs/.test(divs[i].id) ? 'refd' : 'refs') + divs[i].id.substr(4) + '"]');
 				var ref = (tablePos[divs[i].title] ? tablePos[divs[i].title] : [ div2.parentNode.offsetTop / em, 0 ]);
 				var left1 = -1;
 				var id = divs[i].id.replace(/^ref.(.+)-.+/, '$1');
-				if (divs[i].parentNode != div2.parentNode) {
+				if (divs[i].parentNode !== div2.parentNode) {
 					left1 = Math.min(0, ref[1] - left) - 1;
 					divs[i].style.left = left1 + 'em';
 					divs[i].querySelector('div').style.width = -left1 + 'em';
@@ -704,7 +704,7 @@ function schemaMousemove(event) {
 					var line = qs('[id="' + divs[i].id.replace(/^....(.+)-.+$/, 'refl$1') + '"]');
 					var top1 = top + divs[i].offsetTop / em;
 					var top2 = top + div2.offsetTop / em;
-					if (divs[i].parentNode != div2.parentNode) {
+					if (divs[i].parentNode !== div2.parentNode) {
 						top2 += ref[0] - top;
 						line.querySelector('div').style.height = Math.abs(top1 - top2) + 'em';
 					}
@@ -752,7 +752,7 @@ function helpMouseover(event, text, side) {
 	var target = getTarget(event);
 	if (!text) {
 		helpClose();
-	} else if (window.jush && (!helpIgnore || this != target)) {
+	} else if (window.jush && (!helpIgnore || this !== target)) {
 		helpOpen = 1;
 		var help = qs('#help');
 		help.innerHTML = text;
@@ -771,7 +771,7 @@ function helpMouseover(event, text, side) {
 */
 function helpMouseout(event) {
 	helpOpen = 0;
-	helpIgnore = (this != getTarget(event));
+	helpIgnore = (this !== getTarget(event));
 	setTimeout(function () {
 		if (!helpOpen) {
 			helpClose();

adminer/static/functions.js

@@ -4,7 +4,7 @@
 * @param [HTMLElement] defaults to document
 * @return HTMLElement
 */
-function qs(selector, context) {
+function qs(selector, context = null) {
 	return (context || document).querySelector(selector);
 }
 
@@ -13,7 +13,7 @@ function qs(selector, context) {
 * @param [HTMLElement] defaults to document
 * @return HTMLElement
 */
-function qsl(selector, context) {
+function qsl(selector, context = null) {
 	var els = qsa(selector, context);
 	return els[els.length - 1];
 }
@@ -23,7 +23,7 @@ function qsl(selector, context) {
 * @param [HTMLElement] defaults to document
 * @return NodeList
 */
-function qsa(selector, context) {
+function qsa(selector, context = null) {
 	return (context || document).querySelectorAll(selector);
 }
 
@@ -79,7 +79,7 @@ function alterClass(el, className, enable) {
 */
 function toggle(id) {
 	var el = qs('#' + id);
-	el.className = (el.className == 'hidden' ? '' : 'hidden');
+	el.className = (el.className === 'hidden' ? '' : 'hidden');
 	return false;
 }
 
@@ -111,7 +111,7 @@ function verifyVersion(current, url, token) {
 	if (window.postMessage && window.addEventListener) {
 		iframe.style.display = 'none';
 		addEventListener('message', function (event) {
-			if (event.origin == 'https://www.adminer.org') {
+			if (event.origin === 'https://www.adminer.org') {
 				var match = /version=(.+)/.exec(event.data);
 				if (match) {
 					cookie('adminer_version=' + match[1], 1);
@@ -139,7 +139,7 @@ function selectValue(select) {
 /** Verify if element has a specified tag name
 * @param HTMLElement
 * @param string regular expression
-* @return bool
+* @return boolean
 */
 function isTag(el, tag) {
 	var re = new RegExp('^(' + tag + ')$', 'i');
@@ -181,8 +181,8 @@ function selectCount(id, count) {
 		var inputs = qsa('input', el.parentNode.parentNode);
 		for (var i = 0; i < inputs.length; i++) {
 			var input = inputs[i];
-			if (input.type == 'submit') {
+			if (input.type === 'submit') {
-				input.disabled = (count == '0');
+				input.disabled = (count === '0');
 			}
 		}
 	}
@@ -211,13 +211,21 @@ function tableCheck() {
 	}
 }
 
-/** Uncheck single element
+/**
-* @param string
+ * Uncheck single element.
-*/
+ */
 function formUncheck(id) {
-	var el = qs('#' + id);
+	formUncheckAll("#" + id);
-	el.checked = false;
+}
-	trCheck(el);
+
+/**
+ * Uncheck elements matched by selector.
+ */
+function formUncheckAll(selector) {
+	for (const element of qsa(selector)) {
+		element.checked = false;
+		trCheck(element);
+	}
 }
 
 /** Get number of checked elements matching given name
@@ -252,7 +260,7 @@ function tableClick(event, click) {
 	var el = getTarget(event);
 	while (!isTag(el, 'tr')) {
 		if (isTag(el, 'table|a|input|textarea')) {
-			if (el.type != 'checkbox') {
+			if (el.type !== 'checkbox') {
 				return;
 			}
 			checkboxClick.call(el, event);
@@ -268,7 +276,7 @@ function tableClick(event, click) {
 		el.checked = !el.checked;
 		el.onclick && el.onclick();
 	}
-	if (el.name == 'check[]') {
+	if (el.name === 'check[]') {
 		el.form['all'].checked = false;
 		formUncheck('all-page');
 	}
@@ -288,7 +296,7 @@ function checkboxClick(event) {
 	if (!this.name) {
 		return;
 	}
-	if (event.shiftKey && (!lastChecked || lastChecked.name == this.name)) {
+	if (event.shiftKey && (!lastChecked || lastChecked.name === this.name)) {
 		var checked = (lastChecked ? lastChecked.checked : true);
 		var inputs = qsa('input', parentTag(this, 'table'));
 		var checking = !lastChecked;
@@ -333,7 +341,7 @@ function setHtml(id, html) {
 */
 function nodePosition(el) {
 	var pos = 0;
-	while (el = el.previousSibling) {
+	while ((el = el.previousSibling)) {
 		pos++;
 	}
 	return pos;
@@ -345,7 +353,7 @@ function nodePosition(el) {
 */
 function pageClick(href, page) {
 	if (!isNaN(page) && page) {
-		location.href = href + (page != 1 ? '&page=' + (page - 1) : '');
+		location.href = href + (page !== 1 ? '&page=' + (page - 1) : '');
 	}
 }
 
@@ -366,7 +374,7 @@ function menuOver(event) {
 * @this HTMLElement
 */
 function menuOut() {
-	this.style.overflow = 'auto';
+	this.style.overflow = 'hidden';
 }
 
 
@@ -388,7 +396,7 @@ function selectAddRow() {
 	for (var i=0; i < inputs.length; i++) {
 		inputs[i].name = inputs[i].name.replace(/[a-z]\[\d+/, '$&1');
 		inputs[i].className = '';
-		if (inputs[i].type == 'checkbox') {
+		if (inputs[i].type === 'checkbox') {
 			inputs[i].checked = false;
 		} else {
 			inputs[i].value = '';
@@ -402,7 +410,7 @@ function selectAddRow() {
 * @this HTMLInputElement
 */
 function selectSearchKeydown(event) {
-	if (event.keyCode == 13 || event.keyCode == 10) {
+	if (event.keyCode === 13 || event.keyCode === 10) {
 		this.onsearch = function () {
 		};
 	}
@@ -445,11 +453,11 @@ function selectSearch(name) {
 	for (var i=0; i < divs.length; i++) {
 		var div = divs[i];
 		var el = qs('[name$="[col]"]', div);
-		if (el && selectValue(el) == name) {
+		if (el && selectValue(el) === name) {
 			break;
 		}
 	}
-	if (i == divs.length) {
+	if (i === divs.length) {
 		div.firstChild.value = name;
 		div.firstChild.onchange();
 	}
@@ -487,7 +495,7 @@ function bodyKeydown(event, button) {
 	if (target.jushTextarea) {
 		target = target.jushTextarea;
 	}
-	if (isCtrl(event) && (event.keyCode == 13 || event.keyCode == 10) && isTag(target, 'select|textarea|input')) { // 13|10 - Enter
+	if (isCtrl(event) && (event.keyCode === 13 || event.keyCode === 10) && isTag(target, 'select|textarea|input')) { // 13|10 - Enter
 		target.blur();
 		if (button) {
 			target.form[button].click();
@@ -508,7 +516,7 @@ function bodyKeydown(event, button) {
 */
 function bodyClick(event) {
 	var target = getTarget(event);
-	if ((isCtrl(event) || event.shiftKey) && target.type == 'submit' && isTag(target, 'input')) {
+	if ((isCtrl(event) || event.shiftKey) && target.type === 'submit' && isTag(target, 'input')) {
 		target.form.target = '_blank';
 		setTimeout(function () {
 			// if (isCtrl(event)) { focus(); } doesn't work
@@ -524,9 +532,9 @@ function bodyClick(event) {
 * @return boolean
 */
 function editingKeydown(event) {
-	if ((event.keyCode == 40 || event.keyCode == 38) && isCtrl(event)) { // 40 - Down, 38 - Up
+	if ((event.keyCode === 40 || event.keyCode === 38) && isCtrl(event)) { // 40 - Down, 38 - Up
 		var target = getTarget(event);
-		var sibling = (event.keyCode == 40 ? 'nextSibling' : 'previousSibling');
+		var sibling = (event.keyCode === 40 ? 'nextSibling' : 'previousSibling');
 		var el = target.parentNode.parentNode[sibling];
 		if (el && (isTag(el, 'tr') || (el = el[sibling])) && isTag(el, 'tr') && (el = el.childNodes[nodePosition(target.parentNode)]) && (el = el.childNodes[nodePosition(target)])) {
 			el.focus();
@@ -614,7 +622,7 @@ function ajax(url, callback, data, message) {
 		}
 		request.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
 		request.onreadystatechange = function () {
-			if (request.readyState == 4) {
+			if (request.readyState === 4) {
 				if (/^2/.test(request.status)) {
 					callback(request);
 				} else {
@@ -656,13 +664,13 @@ function ajaxForm(form, message, button) {
 			if (/^file$/i.test(el.type) && el.value) {
 				return false;
 			}
-			if (!/^(checkbox|radio|submit|file)$/i.test(el.type) || el.checked || el == button) {
+			if (!/^(checkbox|radio|submit|file)$/i.test(el.type) || el.checked || el === button) {
 				data.push(encodeURIComponent(el.name) + '=' + encodeURIComponent(isTag(el, 'select') ? selectValue(el) : el.value));
 			}
 		}
 	}
 	data = data.join('&');
-	
+
 	var url = form.action;
 	if (!/post/i.test(form.method)) {
 		url = url.replace(/\?.*/, '') + '?' + data;
@@ -703,7 +711,7 @@ function selectClick(event, text, warning) {
 		if (!event) {
 			event = window.event;
 		}
-		if (event.keyCode == 27 && !event.shiftKey && !event.altKey && !isCtrl(event)) { // 27 - Esc
+		if (event.keyCode === 27 && !event.shiftKey && !event.altKey && !isCtrl(event)) { // 27 - Esc
 			inputBlur.apply(input);
 			td.innerHTML = original;
 		}
@@ -733,7 +741,7 @@ function selectClick(event, text, warning) {
 	td.appendChild(input);
 	setupSubmitHighlight(td);
 	input.focus();
-	if (text == 2) { // long text
+	if (text === 2) { // long text
 		return ajax(location.href + '&' + encodeURIComponent(td.id) + '=', function (request) {
 			if (request.responseText) {
 				input.value = request.responseText;
@@ -855,7 +863,7 @@ function findDefaultSubmit(el) {
 	var inputs = qsa('input', el.form);
 	for (var i = 0; i < inputs.length; i++) {
 		var input = inputs[i];
-		if (input.type == 'submit' && !input.style.zIndex) {
+		if (input.type === 'submit' && !input.style.zIndex) {
 			return input;
 		}
 	}

adminer/user.inc.php

@@ -85,8 +85,8 @@ if ($_POST && !$error) {
 					unset($grants[$object]);
 				}
 				if (preg_match('~^(.+)\s*(\(.*\))?$~U', $object, $match) && (
-					!grant("REVOKE", $revoke, $match[2], " ON $match[1] FROM $new_user") //! SQL injection
+					!grant(false, $revoke, $match[2], $match[1], $new_user) //! SQL injection
-					|| !grant("GRANT", $grant, $match[2], " ON $match[1] TO $new_user")
+					|| !grant(true, $grant, $match[2], $match[1], $new_user)
 				)) {
 					$error = true;
 					break;
@@ -100,7 +100,7 @@ if ($_POST && !$error) {
 			} elseif (!isset($_GET["grant"])) {
 				foreach ($grants as $object => $revoke) {
 					if (preg_match('~^(.+)(\(.*\))?$~U', $object, $match)) {
-						grant("REVOKE", array_keys($revoke), $match[2], " ON $match[1] FROM $new_user");
+						grant(false, array_keys($revoke), $match[2], $match[1], $new_user);
 					}
 				}
 			}
@@ -150,33 +150,63 @@ foreach ($grants as $object => $grant) {
 }
 echo "</thead>\n";
 
-foreach (array(
+foreach ([
 	"" => "",
 	"Server Admin" => lang('Server'),
 	"Databases" => lang('Database'),
 	"Tables" => lang('Table'),
 	"Columns" => lang('Column'),
 	"Procedures" => lang('Routine'),
-) as $context => $desc) {
+ ] as $context => $desc) {
 	foreach ((array) $privileges[$context] as $privilege => $comment) {
-		echo "<tr" . odd() . "><td" . ($desc ? ">$desc<td" : " colspan='2'") . ' lang="en" title="' . h($comment) . '">' . h($privilege);
+		echo "<tr" . odd() . ">";
+		if ($desc) {
+			echo "<td>$desc</td>";
+		}
+		echo "<td" . (!$desc ? " colspan='2'" : "") . ' lang="en" title="' . h($comment) . '">' . h($privilege) . "</td>";
+
 		$i = 0;
+
 		foreach ($grants as $object => $grant) {
 			$name = "'grants[$i][" . h(strtoupper($privilege)) . "]'";
 			$value = $grant[strtoupper($privilege)];
-			if ($context == "Server Admin" && $object != (isset($grants["*.*"]) ? "*.*" : ".*")) {
+
-				echo "<td>";
+			$proxiedUser = strpos($object, "@") !== false;
+			$newObject = $object == ".*";
+			$allPrivileges = $privilege == "All privileges";
+			$grantOption = $privilege == "Grant option";
+
+			if ($object == "*.*" && $privilege == "Proxy") {
+				echo "<td></td>";
+			} elseif ($proxiedUser && $privilege != "Proxy" && !$grantOption) {
+				echo "<td></td>";
+			} elseif ($context == "Server Admin" && $object != (isset($grants["*.*"]) ? "*.*" : ".*") && !(($proxiedUser || $newObject) && $privilege == "Proxy")) {
+				echo "<td></td>";
 			} elseif (isset($_GET["grant"])) {
-				echo "<td><select name=$name><option><option value='1'" . ($value ? " selected" : "") . ">" . lang('Grant') . "<option value='0'" . ($value == "0" ? " selected" : "") . ">" . lang('Revoke') . "</select>";
+				echo "<td><select name=$name>" .
+					"<option></option>" .
+					"<option value='1'" . ($value ? " selected" : "") . ">" . lang('Grant') . "</option>" .
+					"<option value='0'" . ($value == "0" ? " selected" : "") . ">" . lang('Revoke') . "</option>" .
+					"</select></td>";
 			} else {
-				echo "<td align='center'><label class='block'>";
+				echo "<td class='center'><label class='block'>";
-				echo "<input type='checkbox' name=$name value='1'" . ($value ? " checked" : "") . ($privilege == "All privileges"
+				echo "<input type='checkbox' name=$name value='1'" .
-					? " id='grants-$i-all'>" //! uncheck all except grant if all is checked
+					($value ? " checked" : "") .
-					: ">" . ($privilege == "Grant option" ? "" : script("qsl('input').onclick = function () { if (this.checked) formUncheck('grants-$i-all'); };")));
+					($allPrivileges ? " id='grants-$i-all'" : (!$grantOption ? " class='grants-$i'" : "")) .
+					">";
+
+				if ($allPrivileges) {
+					echo script("qsl('input').onclick = function () { if (this.checked) formUncheckAll('.grants-$i'); };");
+				} elseif (!$grantOption) {
+					echo script("qsl('input').onclick = function () { if (this.checked) formUncheck('grants-$i-all'); };");
+				}
 				echo "</label>";
 			}
+
 			$i++;
 		}
+
+		echo "</tr>";
 	}
 }
 

bin/export.sh

@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+# Root directory.
+BASEDIR=$( cd `dirname $0`/.. ; pwd )
+cd "$BASEDIR"
+
+php compile.php
+php compile.php en
+php compile.php de
+php compile.php cs
+php compile.php sk
+
+php compile.php mysql
+php compile.php mysql en
+php compile.php mysql de
+php compile.php mysql cs
+php compile.php mysql sk
+
+php compile.php editor
+php compile.php editor en
+php compile.php editor mysql
+php compile.php editor mysql en

changes.txt

@@ -1,8 +1,67 @@
-Adminer 4.8.2-dev:
+Adminer 4.9.3 (released 2024-10-02):
+- MySQL, PostgreSQL: Fix queries splitting and string constants.
+- MySQL: Fix where clause for JSON column.
+- MySQL: Fix editing user's proxy privilege, refactoring.
+- MariaDB: Fix comparing CURRENT_TIMESTAMP definition while altering a table.
+- PostgreSQL: Fix editing record that contains a field with GENERATED ALWAYS default value.
+- Fix using undefined Min_DB::info property.
+- Do not include unchanged PARTITION BY definition into ALTER TABLE query.
+- Do not limit unlimited memory while executing queries.
+- Fix number conversion warning while reading INI settings.
+- Hide invalid edit form if table record is not found.
+- CSS: Fix background color of <pre> used as edit field.
+- CSS: Bigger font size for code blocks.
+
+Adminer 4.9.2 (released 2024-09-18):
+- Fix textarea height for single-line inputs (used typically for SQLite text field).
+- Fix undefined property in error message if driver does not support error number (e.g. PostgreSQL).
+- PostgreSQL: Fix search fields configuration (regression from 4.9).
+- PostgreSQL: Fix search condition for network address types, add macaddr8 type.
+- PostgreSQL: Fix exporting CREATE TABLE query with GENERATED default values.
+- PostgreSQL: Fix exporting CREATE TABLE query with sequence default value.
+- PostgreSQL: Allow to set connection's sslmode with AdminerLoginSsl plugin.
+- MySQL: Do not show 'empty' enum value in strict mode.
+- Editor: Fix searching in tables.
+- Function to retrieve driver name that can be used in plugins.
+
+Adminer 4.9.1 (released 2024-09-09):
+- Compatibility with PHP 8.3.
+- Fix compiling jush external files.
+- Improved displaying of long table names in menu.
+- Replace deprecated <acronym> with <abbr>.
+- Add support for translations in plugins.
+- Add .editorconfig file.
+- MySQL: Add unix_timestamp to functions.
+- PostgreSQL: Show only accessible databases.
+- PostgreSQL: Make data length calculation more accurate.
+- PostgreSQL: Fix documentation link for SERIAL type.
+- PostgreSQL: Fix undefined properties on PHP 8.
+- Elasticsearch: Fix field selection.
+- AdminerEditForeign: Refactor and fix the plugin.
+- AdminerLoginOtp: Autocomplete hints for OTP input field, code refactoring.
+
+Adminer 4.9 (released 2024-08-19):
+- Validate server input in login form.
+- Validate connection to server in HTTP based drivers.
+- Move dependencies from submodules to Composer.
+- Update hydra and pepa-lintha-dark themes.
+- Elasticsearch 5: Make unusable driver usable again, move it to plugins.
+- Add new Elasticsearch 7 driver.
+- Set saving to file as a default export option.
+- Improve URL and email detection.
+- Fix AdminerVersionNoverify plugin blocking other plugins to modify HTML head.
+- Fix several bugs and security issues in AdminerFileUpload plugin.
+- Skip dump of generated columns.
+- Update composer.json.
+- Add script for exporting compiled adminer variants.
+
+Adminer 4.8.2 (released 2024-03-16):
 Support multi-line table comments
 MySQL: Use ST_SRID() instead of SRID() for MySQL 8 (PR #418)
 PostgreSQL: Don't reset table comments (regression from 4.2.0)
 PostgreSQL PDO: Allow editing rows identified by boolean column (PR #380)
+Update several translations: lv, bn, fr, it, nl, ru, cs, sk
+Allow responsive styles on larger devices
 
 Adminer 4.8.1 (released 2021-05-14):
 Internet Explorer or PDO in Adminer 4.7.8-4.8.0: Fix XSS in doc_link (bug #797)
@@ -99,7 +158,7 @@ SQLite: Handle error in altering table (bug #697)
 SQLite: Allow setting auto increment for empty tables
 SQLite: Preserve auto increment when recreating table
 MS SQL: Support foreign keys to other DB
-MongoDB: Allow setting authSource from environment variable 
+MongoDB: Allow setting authSource from environment variable
 
 Adminer 4.7.2 (released 2019-07-18):
 Do not attempt logging in without password (bug #676)

compile.php

@@ -7,7 +7,7 @@ function adminer_errors($errno, $errstr) {
 error_reporting(6135); // errors and warnings
 set_error_handler('adminer_errors', E_WARNING);
 include dirname(__FILE__) . "/adminer/include/version.inc.php";
-include dirname(__FILE__) . "/externals/JsShrink/jsShrink.php";
+include dirname(__FILE__) . "/vendor/vrana/jsshrink/jsShrink.php";
 
 function add_apo_slashes($s) {
 	return addcslashes($s, "\\'");
@@ -196,7 +196,7 @@ function php_shrink($input) {
 	$short_variables = array();
 	$shortening = true;
 	$tokens = token_get_all($input);
-	
+
 	// remove unnecessary { }
 	//! change also `while () { if () {;} }` to `while () if () ;` but be careful about `if () { if () { } } else { }
 	$shorten = 0;
@@ -223,13 +223,13 @@ function php_shrink($input) {
 		}
 	}
 	$tokens = array_values($tokens);
-	
+
 	foreach ($tokens as $i => $token) {
 		if ($token[0] === T_VARIABLE && !isset($special_variables[$token[1]])) {
 			$short_variables[$token[1]]++;
 		}
 	}
-	
+
 	arsort($short_variables);
 	$chars = implode(range('a', 'z')) . '_' . implode(range('A', 'Z'));
 	// preserve variable names between versions if possible
@@ -240,7 +240,7 @@ function php_shrink($input) {
 	foreach (array_keys($short_variables) as $number => $key) {
 		$short_variables[$key] = short_identifier($number, $chars); // could use also numbers and \x7f-\xff
 	}
-	
+
 	$set = array_flip(preg_split('//', '!"#$%&\'()*+,-./:;<=>?@[]^`{|}'));
 	$space = '';
 	$output = '';
@@ -418,7 +418,7 @@ if ($driver) {
 	if (count($drivers) == 1) {
 		$file = str_replace('<?php echo html_select("auth[driver]", $drivers, DRIVER) . "\n"; ?>', "<input type='hidden' name='auth[driver]' value='" . ($driver == "mysql" ? "server" : $driver) . "'>" . reset($drivers), $file);
 	}
-	$file = preg_replace('(;../externals/jush/modules/jush-(?!textarea\.|txt\.|js\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
+	$file = preg_replace('(;\.\./vendor/vrana/jush/modules/jush-(?!textarea\.|txt\.|js\.|' . preg_quote($driver == "mysql" ? "sql" : $driver) . '\.)[^.]+.js)', '', $file);
 	$file = preg_replace_callback('~doc_link\(array\((.*)\)\)~sU', function ($match) use ($driver) {
 		list(, $links) = $match;
 		$links = preg_replace("~'(?!(" . ($driver == "mysql" ? "sql|mariadb" : $driver) . ")')[^']*' => [^,]*,?~", '', $links);
@@ -427,8 +427,8 @@ if ($driver) {
 	//! strip doc_link() definition
 }
 if ($project == "editor") {
-	$file = preg_replace('~;.\.\/externals/jush/jush\.css~', '', $file);
+	$file = preg_replace('~;\.\./vendor/vrana/jush/jush\.css~', '', $file);
-	$file = preg_replace('~compile_file\(\'\.\./(externals/jush/modules/jush\.js|adminer/static/[^.]+\.gif)[^)]+\)~', "''", $file);
+	$file = preg_replace('~compile_file\(\'\.\./(vendor/vrana/jush/modules/jush\.js|adminer/static/[^.]+\.gif)[^)]+\)~', "''", $file);
 }
 $file = preg_replace_callback("~lang\\('((?:[^\\\\']+|\\\\.)*)'([,)])~s", 'lang_ids', $file);
 $file = preg_replace_callback('~\b(include|require) "([^"]*\$LANG.inc.php)";~', 'put_file_lang', $file);
@@ -440,17 +440,18 @@ if ($_SESSION["lang"]) {
 	$file = str_replace('<?php echo $LANG; ?>', $_SESSION["lang"], $file);
 }
 $file = str_replace('<?php echo script_src("static/editing.js"); ?>' . "\n", "", $file);
-$file = preg_replace('~\s+echo script_src\("\.\./externals/jush/modules/jush-(textarea|txt|js|\$jush)\.js"\);~', '', $file);
+$file = preg_replace('~\s+echo script_src\("\.\./vendor/vrana/jush/modules/jush-(textarea|txt|js|\$jush)\.js"\);~', '', $file);
-$file = str_replace('<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">' . "\n", "", $file);
+$file = str_replace('<link rel="stylesheet" type="text/css" href="../vendor/vrana/jush/jush.css">' . "\n", "", $file);
 $file = preg_replace_callback("~compile_file\\('([^']+)'(?:, '([^']*)')?\\)~", 'compile_file', $file); // integrate static files
-$replace = 'preg_replace("~\\\\\\\\?.*~", "", ME) . "?file=\1&version=' . $VERSION . '"';
+$replace = 'preg_replace("~\\\\\\\\?.*~", "", ME) . "?file=\1&version=' . substr(md5(microtime()), 0, 8) . '"';
 $file = preg_replace('~\.\./adminer/static/(default\.css|favicon\.ico)~', '<?php echo h(' . $replace . '); ?>', $file);
 $file = preg_replace('~"\.\./adminer/static/(functions\.js)"~', $replace, $file);
 $file = preg_replace('~\.\./adminer/static/([^\'"]*)~', '" . h(' . $replace . ') . "', $file);
-$file = preg_replace('~"\.\./externals/jush/modules/(jush\.js)"~', $replace, $file);
+$file = preg_replace('~"\.\./vendor/vrana/jush/modules/(jush\.js)"~', $replace, $file);
 $file = preg_replace("~<\\?php\\s*\\?>\n?|\\?>\n?<\\?php~", '', $file);
 $file = php_shrink($file);
 
-$filename = $project . (preg_match('~-dev$~', $VERSION) ? "" : "-$VERSION") . ($driver ? "-$driver" : "") . ($_SESSION["lang"] ? "-$_SESSION[lang]" : "") . ".php";
+@mkdir("temp/export", 0777, true);
+$filename = "temp/export/$project" . (preg_match('~-dev$~', $VERSION) ? "" : "-$VERSION") . ($driver ? "-$driver" : "") . ($_SESSION["lang"] ? "-$_SESSION[lang]" : "") . ".php";
 file_put_contents($filename, $file);
 echo "$filename created (" . strlen($file) . " B).\n";

composer.json

@@ -25,7 +25,43 @@
         "Apache-2.0",
         "GPL-2.0-only"
     ],
+    "require": {
+        "php": "5.6 - 8.3",
+        "ext-pdo": "*",
+        "ext-json": "*",
+        "vrana/jush": "@dev",
+        "vrana/jsshrink": "@dev"
+    },
+    "suggest": {
+        "ext-zlib": "*",
+        "ext-suhosin": "*",
+        "ext-mysqli": "*",
+        "ext-mysql": "*",
+        "ext-pgsql": "*",
+        "ext-mongo": "*",
+        "ext-sqlsrv": "*",
+        "ext-mssql": "*",
+        "ext-oci8": "*",
+        "ext-interbase": "*",
+        "ext-pdo_pgsql": "*",
+        "ext-pdo_dblib": "*",
+        "ext-pdo_sqlite": "*",
+        "ext-pdo_oci": "*"
+    },
+    "require-dev": {
+        "ext-xdebug": "*"
+    },
     "scripts": {
         "compile": "php compile.php"
-    }
+    },
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/vrana/jush.git"
+        },
+        {
+            "type": "vcs",
+            "url": "https://github.com/vrana/jsshrink.git"
+        }
+    ]
 }

designs/hever/adminer.css

@@ -18,7 +18,7 @@ a[href$="&dump="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgA
 a[href*="&import="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gEJFDQPlDJUDwAAAiNJREFUOMutk0tI1FEUh7//Y9TJghyc1KQ20lMthRAlgoKgVkWte6wid0EICUHUQjdBErRqHYmQghgU5KLQGB8FKVEMCi0G1JmRbPLJ/O89p8XYOAMZBB24HM5dfL/fOfdcB6Aj1j6kqm2qWv/o5NMk/xBOR6z9dVVpzbmQEyKxPMcBc5svbheHs91YK1hRjJWCY7FGsSKT3VcPtviquqaqVJVVY6xlZu0hYpRrpyJ/Vb7fN3sMwAG4965Hw+ElKrzdlPphPqTHaYw0EdiAQEwuW4MRg7GGzrYu7j6L8/hGg+MD7DNXmF7tpDpSg6MOYpWbzbe2VV/dMATGAuADTLt3UFEmU+OICCpK72hqW8CFExGymwAAnrya15X1QJ+PJFVVtW90QQvjRay4TmfW9XrPpOYdBFYQVXwP+mMpPM9lYCyF44K7KTI4kQJVQj4cqd1BNihowVpBAd9zuNQSZXAizcWWPXmH/WPJonp27ifGCEUOVMB34eXHNJ6Xy5C7+w3xHRDg6N4ylEKAEVSVkAfnm6MMTy1y9nhlXvHNpzSthyrYFfYBiCcylJf6WwAjOZrnOgxPLQLks+tAIDDydSkPrIuWYG2BA2NMbgYunGms5O3nRU43bDkYGEtzuTWar+OJDN5ma1szUKVh/07mv69TVxXm28JK/i/U15YQT2SKdkFEpeAV9P2D3pmmrJXywFgCY7FGCKxgrPnjMv1Y3hjif8QvwdlGGi2XXTgAAAAASUVORK5CYII=") no-repeat scroll 2px bottom; padding-left:22px;}
 a[href$="&import="] {background:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABmJLR0QA/wD/AP+gvaeTAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAB3RJTUUH3gEJFDMETKEbQAAAAjZJREFUOMuVkjFoU2EUhc//3gsvptFCIdRHh2CrQ1AcmsUYHTKJDkJrFUdx6uJkpuLspCI4xaJLNik4SMGlOKgEdekQ0EEwFhJqCw+a16RJ//+/x0Heo6XN4B0v537nHLgKAKqNxXckSyTPPyu//IP/GFVtLL6f9INrKZXC791f3UvDysPP3tryjcHt7yTPkRQRaZL8KSKvRGRtbm7OxgCPZJ8kJtOnYaw99ZUfl8UQ5XK5kMlkQBI7OzuzURTNbmxs3Nne3v60srJyd2FhoQ0AztPLtflOv/22tdtCVo3hwvhFUATZbBaO48B1XUxMTCCfz6NUKmF6evqKtfZxnMABgOdXl+c7vTZ87wQUFcRyZOepqSmIyPWkAgA8+HCfFMG3rS8QEVCIvb09pFIpkES/30cYhmi325iZmYGI4BDgReW1Wl1d3apUKrler4coitBqtUASxhh0u10Mh0N4ngeSRwEAQBIk4bou0uk0PM+D53nQWsMYA/JfLRGBtfYoQEQSx/hIKQVrbbJzHGd0ghgQHxhj4LourLXQWkNrDdd1E81IQCy21iaAOEFcU2t9PEBEEvcYeDBZrNvf38ehPwAAay3CMEQul4Pv+4f/XSkEQYBisYhOpzMywb1Go/GmUCiM5fN5+L4PpRRIIggCRFGEZrOJ9fX1TWPMzQR+0Kler58RkUcicstxnPFMJgNjDMIwxGAw2DTG1K21T5aWlraOBRycWq120hhz1hgjWusf1Wp1eJzuL3uxkTGLHB98AAAAAElFTkSuQmCC") no-repeat scroll 2px bottom; padding-left:22px;}
 
-@media all and (min-device-width: 881px) {
+@media all and (min-width: 881px) {
   #menu .links {height:22px; transition:.2s;}
   #menu .links:hover {height:5em;}
   #menu .links a {color:transparent; transition:.2s; display:block; margin-bottom:-1.25em;}

designs/lucas-sandery/adminer.css

@@ -708,7 +708,7 @@ input[type="file"]:disabled::-moz-file-upload-button {
 	margin-left: 0;
 }
 
-@media all and (max-device-width: 880px) {
+@media all and (max-width: 880px) {
 	body {
 		padding-bottom: 2em;
 	}

designs/mvt/adminer.css

@@ -374,7 +374,7 @@ thead td, thead th {
 	padding: 7px 2px;
 }
 
-thead td acronym, thead td sup, thead th acronym, thead th sup {
+thead td abbr, thead td sup, thead th acronym, thead th sup {
 	color: #cdf
 }
 

designs/nicu/adminer.css

@@ -368,7 +368,7 @@ td.nowrap {
     right: 0;
     left: auto;
 }
-@media all and (max-device-width:880px) {
+@media all and (max-width: 880px) {
     .pages {
         left: auto;
     }

designs/pappu687/adminer.css

@@ -1,7 +1,7 @@
 /*
-FLAT UI Flavored Adminer Theme by M. Mahbubur Rahman (mahbub@mahbubblog.com) 
+FLAT UI Flavored Adminer Theme by M. Mahbubur Rahman (mahbub@mahbubblog.com)
 Screenshot : http://d.pr/i/cznH
-Based on work by : Lukáš Brandejs	
+Based on work by : Lukáš Brandejs
 https://raw.github.com/vrana/adminer/master/designs/ng9/adminer.css
 */
 
@@ -119,7 +119,7 @@ code a:hover{background:transparent}
 table{
 	margin:10px 0px;
 	border:1px solid #E6E6E6;
-	background-color:#FFFFFF;	
+	background-color:#FFFFFF;
 }
 
 tbody tr:hover td,tbody tr:hover th{
@@ -133,17 +133,17 @@ thead th, thead td {
 	white-space:nowrap;
 	border-right:1px solid #34495e;
 	background:#34495e;
-	color:#FFFFFF;	
+	color:#FFFFFF;
 	padding-right:10px;
 }
-thead th acronym, thead td acronym, thead th sup, thead td sup{
+thead th abbr, thead td acronym, thead th sup, thead td sup{
 	color:#CCDDFF;
 }
 
 th,td{
 	border:1px solid rgba(233,233,233,.3);
 	padding:3px 6px;
-	vertical-align:top;	
+	vertical-align:top;
 }
 
 th a {
@@ -269,12 +269,12 @@ input[name=logout]:hover {
 	background:#ea0202;
 }
 
-#logins a, #tables a { 
+#logins a, #tables a {
 	background:none;
 }
 
-#logins a:hover, #tables a:hover { 
+#logins a:hover, #tables a:hover {
-	
+
 }
 
 #logout {
@@ -283,7 +283,7 @@ input[name=logout]:hover {
 }
 
 #logout:hover {
-	color:red;	
+	color:red;
 }
 
 .logout {
@@ -308,14 +308,14 @@ input[name=logout]:hover {
 
 
 input[type=submit] {
-	font-size:13px;	
+	font-size:13px;
 	font-weight:normal;
 	-moz-border-radius:1px;
 	-webkit-border-radius:1px;
 	border-radius:1px;
 	border:0px solid #469df5;
 	padding:4px 12px;
-	text-decoration:none;	
+	text-decoration:none;
 	background-color:#65ADC3;
 	color:#ffffff;
 	display:inline-block;
@@ -324,7 +324,7 @@ input[type=submit] {
  	-moz-box-shadow:inset 0px 0px 0px 0px #cae3fc;
  	box-shadow:inset 0px 0px 0px 0px #cae3fc;
 }
-input[type=submit]:hover {	
+input[type=submit]:hover {
 	background-color:#34495e;
 	text-shadow:0px 1px 0px #000;
 }

editor/include/adminer.inc.php

@@ -23,7 +23,7 @@ class Adminer {
 	function bruteForceKey() {
 		return $_SERVER["REMOTE_ADDR"];
 	}
-	
+
 	function serverName($server) {
 	}
 
@@ -202,7 +202,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 			$return = (preg_match('~^(1|t|true|y|yes|on)$~i', $val) ? lang('yes') : lang('no'));
 		}
 		if ($link) {
-			$return = "<a href='$link'" . (is_url($link) ? target_blank() : "") . ">$return</a>";
+			$return = "<a href='$link'" . (is_web_url($link) ? target_blank() : "") . ">$return</a>";
 		}
 		if (!$link && !like_bool($field) && preg_match(number_type(), $field["type"])) {
 			$return = "<div class='number'>$return</div>"; // Firefox doesn't support <colgroup>
@@ -342,35 +342,44 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 
 	function selectSearchProcess($fields, $indexes) {
 		global $driver;
-		$return = array();
+
+		$return = [];
+
 		foreach ((array) $_GET["where"] as $key => $where) {
 			$col = $where["col"];
 			$op = $where["op"];
 			$val = $where["val"];
+
 			if (($key < 0 ? "" : $col) . $val != "") {
 				$conds = array();
+
 				foreach (($col != "" ? array($col => $fields[$col]) : $fields) as $name => $field) {
 					if ($col != "" || is_numeric($val) || !preg_match(number_type(), $field["type"])) {
 						$name = idf_escape($name);
+
 						if ($col != "" && $field["type"] == "enum") {
 							$conds[] = (in_array(0, $val) ? "$name IS NULL OR " : "") . "$name IN (" . implode(", ", array_map('intval', $val)) . ")";
 						} else {
 							$text_type = preg_match('~char|text|enum|set~', $field["type"]);
 							$value = $this->processInput($field, (!$op && $text_type && preg_match('~^[^%]+$~', $val) ? "%$val%" : $val));
-							$conds[] = $driver->convertSearch($name, $val, $field) . ($value == "NULL" ? " IS" . ($op == ">=" ? " NOT" : "") . " $value"
+
+							$conds[] = $driver->convertSearch($name, $where, $field) . ($value == "NULL" ? " IS" . ($op == ">=" ? " NOT" : "") . " $value"
 								: (in_array($op, $this->operators) || $op == "=" ? " $op $value"
 								: ($text_type ? " LIKE $value"
 								: " IN (" . str_replace(",", "', '", $value) . ")"
 							)));
+
 							if ($key < 0 && $val == "0") {
 								$conds[] = "$name IS NULL";
 							}
 						}
 					}
 				}
+
 				$return[] = ($conds ? "(" . implode(" OR ", $conds) . ")" : "1 = 0");
 			}
 		}
+
 		return $return;
 	}
 
@@ -580,8 +589,11 @@ qsl('div').onclick = whisperClick;", "")
 		global $VERSION;
 		?>
 <h1>
-<?php echo $this->name(); ?> <span class="version"><?php echo $VERSION; ?></span>
+    <?php echo $this->name(); ?>
-<a href="https://www.adminer.org/editor/#download"<?php echo target_blank(); ?> id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
+    <?php if ($missing != "auth"): ?>
+    <span class="version"><?php echo $VERSION; ?></span>
+    <a href="https://www.adminer.org/editor/#download"<?php echo target_blank(); ?> id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
+	<?php endif; ?>
 </h1>
 <?php
 		if ($missing == "auth") {

lang.php

@@ -2,7 +2,7 @@
 <?php
 error_reporting(6135); // errors and warnings
 unset($_COOKIE["adminer_lang"]);
-$_SESSION["lang"] = $_SERVER["argv"][1]; // Adminer functions read language from session
+$_SESSION["lang"] = isset($_SERVER["argv"][1]) ? $_SERVER["argv"][1] : null; // Adminer functions read language from session
 if (isset($_SESSION["lang"])) {
 	include dirname(__FILE__) . "/adminer/include/lang.inc.php";
 	if (isset($_SERVER["argv"][2]) || (!isset($langs[$_SESSION["lang"]]) && $_SESSION["lang"] != "xx")) {
@@ -17,7 +17,9 @@ foreach (array_merge(
 	glob(dirname(__FILE__) . "/adminer/include/*.php"),
 	glob(dirname(__FILE__) . "/adminer/drivers/*.php"),
 	glob(dirname(__FILE__) . "/editor/*.php"),
-	glob(dirname(__FILE__) . "/editor/include/*.php")
+	glob(dirname(__FILE__) . "/editor/include/*.php"),
+	glob(dirname(__FILE__) . "/plugins/*.php"),
+	glob(dirname(__FILE__) . "/plugins/drivers/*.php")
 ) as $filename) {
 	$file = file_get_contents($filename);
 	if (preg_match_all("~lang\\(('(?:[^\\\\']+|\\\\.)*')([),])~", $file, $matches)) { // lang() always uses apostrophes

plugins/drivers/clickhouse.php

@@ -8,56 +8,78 @@ if (isset($_GET["clickhouse"])) {
 		var $extension = "JSON", $server_info, $errno, $_result, $error, $_url;
 		var $_db = 'default';
 
+		/**
+		 * @param string $db
+		 * @param string $query
+		 * @return Min_Result|bool
+		 */
 		function rootQuery($db, $query) {
 			@ini_set('track_errors', 1); // @ - may be disabled
 			$file = @file_get_contents("$this->_url/?database=$db", false, stream_context_create(array('http' => array(
 				'method' => 'POST',
 				'content' => $this->isQuerySelectLike($query) ? "$query FORMAT JSONCompact" : $query,
 				'header' => 'Content-type: application/x-www-form-urlencoded',
-				'ignore_errors' => 1, // available since PHP 5.2.10
+				'ignore_errors' => 1,
+				'follow_location' => 0,
+				'max_redirects' => 0,
 			))));
 
 			if ($file === false) {
-				$this->error = $php_errormsg;
+				$this->error = lang('Invalid server or credentials.');
-				return $file;
-			}
-			if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
-				$this->error = lang('Invalid credentials.') . " $http_response_header[0]";
 				return false;
 			}
-			$return = json_decode($file, true);
-			if ($return === null) {
-				if (!$this->isQuerySelectLike($query) && $file === '') {
-					return true;
-				}
 
-				$this->errno = json_last_error();
+			if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
-				if (function_exists('json_last_error_msg')) {
+				foreach ($http_response_header as $header) {
-					$this->error = json_last_error_msg();
+					if (preg_match('~^X-ClickHouse-Exception-Code:~i', $header)) {
-				} else {
+						$this->error = preg_replace('~\(version [^(]+\(.+$~', '', $file);
-					$constants = get_defined_constants(true);
+						return false;
-					foreach ($constants['json'] as $name => $value) {
-						if ($value == $this->errno && preg_match('~^JSON_ERROR_~', $name)) {
-							$this->error = $name;
-							break;
-						}
 					}
 				}
+
+				$this->error = lang('Invalid server or credentials.');
+				return false;
 			}
-			return new Min_Result($return);
+
+			if (!$this->isQuerySelectLike($query) && $file === '') {
+				return true;
+			}
+
+			$return = json_decode($file, true);
+			if ($return === null) {
+				$this->error = lang('Invalid server or credentials.');
+				return false;
+			}
+
+			if (!isset($return['rows']) || !isset($return['data']) || !isset($return['meta'])) {
+				$this->error = lang('Invalid server or credentials.');
+				return false;
+			}
+
+			return new Min_Result($return['rows'], $return['data'], $return['meta']);
 		}
 
 		function isQuerySelectLike($query) {
 			return (bool) preg_match('~^(select|show)~i', $query);
 		}
 
+		/**
+		 * @param string $query
+		 * @return bool|Min_Result
+		 */
 		function query($query) {
 			return $this->rootQuery($this->_db, $query);
 		}
 
+		/**
+		 * @param string $server
+		 * @param string $username
+		 * @param string $password
+		 * @return bool
+		 */
 		function connect($server, $username, $password) {
-			preg_match('~^(https?://)?(.*)~', $server, $match);
+			$this->_url = build_http_url($server, $username, $password, "localhost", 8123);
-			$this->_url = ($match[1] ? $match[1] : "http://") . "$username:$password@$match[2]";
+
 			$return = $this->query('SELECT 1');
 			return (bool) $return;
 		}
@@ -92,11 +114,17 @@ if (isset($_GET["clickhouse"])) {
 	class Min_Result {
 		var $num_rows, $_rows, $columns, $meta, $_offset = 0;
 
-		function __construct($result) {
+		/**
-			$this->num_rows = $result['rows'];
+		 * @param int $rows
-			$this->_rows = $result['data'];
+		 * @param array[] $data
-			$this->meta = $result['meta'];
+		 * @param array[] $meta
-			$this->columns = array_column($this->meta, 'name');
+		 */
+		function __construct($rows, array $data, array $meta) {
+			$this->num_rows = $rows;
+			$this->_rows = $data;
+			$this->meta = $meta;
+			$this->columns = array_column($meta, 'name');
+
 			reset($this->_rows);
 		}
 
@@ -212,6 +240,15 @@ if (isset($_GET["clickhouse"])) {
 		return apply_queries("DROP TABLE", $tables);
 	}
 
+	/**
+	 * @param string $hostPath
+	 * @return bool
+	 */
+	function is_server_host_valid($hostPath)
+	{
+		return strpos(rtrim($hostPath, '/'), '/') === false;
+	}
+
 	function connect() {
 		global $adminer;
 		$connection = new Min_DB;
@@ -316,7 +353,7 @@ if (isset($_GET["clickhouse"])) {
 				"default" => trim($row['default_expression']),
 				"null" => $nullable,
 				"auto_increment" => '0',
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 0),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 0, "where" => 1, "order" => 1),
 			);
 		}
 

plugins/drivers/elastic.php

@@ -0,0 +1,591 @@
+<?php
+add_driver("elastic", "Elasticsearch 7 (beta)");
+
+if (isset($_GET["elastic"])) {
+	define("DRIVER", "elastic");
+
+	if (ini_bool('allow_url_fopen')) {
+		define("ELASTIC_DB_NAME", "elastic");
+
+		class Min_DB {
+			var $extension = "JSON", $server_info, $errno, $error, $_url;
+
+			/**
+			 * @param string $path
+			 * @param array|null $content
+			 * @param string $method
+			 * @return array|false
+			 */
+			function rootQuery($path, array $content = null, $method = 'GET') {
+				@ini_set('track_errors', 1); // @ - may be disabled
+
+				$file = @file_get_contents("$this->_url/" . ltrim($path, '/'), false, stream_context_create(array('http' => array(
+					'method' => $method,
+					'content' => $content !== null ? json_encode($content) : null,
+					'header' => $content !== null ? 'Content-Type: application/json' : [],
+					'ignore_errors' => 1,
+					'follow_location' => 0,
+					'max_redirects' => 0,
+				))));
+
+				if ($file === false) {
+					$this->error = lang('Invalid server or credentials.');
+					return false;
+				}
+
+				$return = json_decode($file, true);
+				if ($return === null) {
+					$this->error = lang('Invalid server or credentials.');
+					return false;
+				}
+
+				if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
+					if (isset($return['error']['root_cause'][0]['type'])) {
+						$this->error = $return['error']['root_cause'][0]['type'] . ": " . $return['error']['root_cause'][0]['reason'];
+					} elseif (isset($return['status']) && isset($return['error']) && is_string($return['error'])) {
+						$this->error = $return['error'];
+					}
+
+					return false;
+				}
+
+				return $return;
+			}
+
+			/** Performs query relative to actual selected DB
+			 * @param string $path
+			 * @param array|null $content
+			 * @param string $method
+			 * @return array|false
+			 */
+			function query($path, array $content = null, $method = 'GET') {
+				// Support for global search through all tables
+				if ($path != "" && $path[0] == "S" && preg_match('/SELECT 1 FROM ([^ ]+) WHERE (.+) LIMIT ([0-9]+)/', $path, $matches)) {
+					global $driver;
+
+					$where = explode(" AND ", $matches[2]);
+
+					return $driver->select($matches[1], array("*"), $where, null, array(), $matches[3]);
+				}
+
+				return $this->rootQuery($path, $content, $method);
+			}
+
+			/**
+			 * @param string $server
+			 * @param string $username
+			 * @param string $password
+			 * @return bool
+			 */
+			function connect($server, $username, $password) {
+				$this->_url = build_http_url($server, $username, $password, "localhost", 9200);
+
+				$return = $this->query('');
+				if (!$return) {
+					return false;
+				}
+
+				if (!isset($return['version']['number'])) {
+					$this->error = lang('Invalid server or credentials.');
+					return false;
+				}
+
+				$this->server_info = $return['version']['number'];
+				return true;
+			}
+
+			function select_db($database) {
+				return true;
+			}
+
+			function quote($string) {
+				return $string;
+			}
+		}
+
+		class Min_Result {
+			var $num_rows, $_rows;
+
+			function __construct($rows) {
+				$this->num_rows = count($rows);
+				$this->_rows = $rows;
+
+				reset($this->_rows);
+			}
+
+			function fetch_assoc() {
+				$return = current($this->_rows);
+				next($this->_rows);
+
+				return $return;
+			}
+
+			function fetch_row() {
+				$row = $this->fetch_assoc();
+
+				return $row ? array_values($row) : false;
+			}
+		}
+	}
+
+	class Min_Driver extends Min_SQL {
+
+		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+			$data = array();
+			if ($select != array("*")) {
+				$data["fields"] = array_values($select);
+			}
+
+			if ($order) {
+				$sort = array();
+				foreach ($order as $col) {
+					$col = preg_replace('~ DESC$~', '', $col, 1, $count);
+					$sort[] = ($count ? array($col => "desc") : $col);
+				}
+				$data["sort"] = $sort;
+			}
+
+			if ($limit) {
+				$data["size"] = +$limit;
+				if ($page) {
+					$data["from"] = ($page * $limit);
+				}
+			}
+
+			foreach ($where as $val) {
+				if (preg_match('~^\((.+ OR .+)\)$~', $val, $matches)) {
+					$parts = explode(" OR ", $matches[1]);
+					$terms = array();
+					foreach ($parts as $part) {
+						list($col, $op, $val) = explode(" ", $part, 3);
+						$term = array($col => $val);
+						if ($op == "=") {
+							$terms[] = array("term" => $term);
+						} elseif (in_array($op, array("must", "should", "must_not"))) {
+							$data["query"]["bool"][$op][]["match"] = $term;
+						}
+					}
+
+					if (!empty($terms)) {
+						$data["query"]["bool"]["filter"][]["bool"]["should"] = $terms;
+					}
+				} else {
+					list($col, $op, $val) = explode(" ", $val, 3);
+					$term = array($col => $val);
+					if ($op == "=") {
+						$data["query"]["bool"]["filter"][] = array("term" => $term);
+					} elseif (in_array($op, array("must", "should", "must_not"))) {
+						$data["query"]["bool"][$op][]["match"] = $term;
+					}
+				}
+			}
+
+			$query = "$table/_search";
+			$start = microtime(true);
+			$search = $this->_conn->rootQuery($query, $data);
+
+			if ($print) {
+				echo adminer()->selectQuery("$query: " . json_encode($data), $start, !$search);
+			}
+			if (empty($search)) {
+				return false;
+			}
+
+			$return = array();
+			foreach ($search["hits"]["hits"] as $hit) {
+				$row = array();
+				if ($select == array("*")) {
+					$row["_id"] = $hit["_id"];
+				}
+
+				if ($select != array("*")) {
+					$fields = array();
+					foreach ($select as $key) {
+						$fields[$key] = $key == "_id" ? $hit["_id"] : $hit["_source"][$key];
+					}
+				} else {
+					$fields = $hit["_source"];
+				}
+				foreach ($fields as $key => $val) {
+					$row[$key] = (is_array($val) ? json_encode($val) : $val);
+				}
+
+				$return[] = $row;
+			}
+
+			return new Min_Result($return);
+		}
+
+		function update($type, $record, $queryWhere, $limit = 0, $separator = "\n") {
+			//! use $limit
+			$parts = preg_split('~ *= *~', $queryWhere);
+			if (count($parts) == 2) {
+				$id = trim($parts[1]);
+				$query = "$type/$id";
+
+				return $this->_conn->query($query, $record, 'POST');
+			}
+
+			return false;
+		}
+
+		function insert($type, $record) {
+			$id = ""; //! user should be able to inform _id
+			$query = "$type/$id";
+			$response = $this->_conn->query($query, $record, 'POST');
+			$this->_conn->last_id = $response['_id'];
+
+			return $response['created'];
+		}
+
+		function delete($table, $queryWhere, $limit = 0) {
+			//! use $limit
+			$ids = array();
+			if (isset($_GET["where"]["_id"]) && $_GET["where"]["_id"]) {
+				$ids[] = $_GET["where"]["_id"];
+			}
+			if (isset($_POST['check'])) {
+				foreach ($_POST['check'] as $check) {
+					$parts = preg_split('~ *= *~', $check);
+					if (count($parts) == 2) {
+						$ids[] = trim($parts[1]);
+					}
+				}
+			}
+
+			$this->_conn->affected_rows = 0;
+
+			foreach ($ids as $id) {
+				$query = "$table/_doc/$id";
+				$response = $this->_conn->query($query, null, 'DELETE');
+				if (isset($response['result']) && $response['result'] == 'deleted') {
+					$this->_conn->affected_rows++;
+				}
+			}
+
+			return $this->_conn->affected_rows;
+		}
+
+		function convertOperator($operator) {
+			return $operator == "LIKE %%" ? "should" : $operator;
+		}
+	}
+
+	function connect() {
+		$connection = new Min_DB;
+
+		list($server, $username, $password) = adminer()->credentials();
+		if ($password != "" && $connection->connect($server, $username, "")) {
+			return lang('Database does not support password.');
+		}
+
+		if ($connection->connect($server, $username, $password)) {
+			return $connection;
+		}
+
+		return $connection->error;
+	}
+
+	function support($feature) {
+		return preg_match("~table|columns~", $feature);
+	}
+
+	function logged_user() {
+		$credentials = adminer()->credentials();
+
+		return $credentials[1];
+	}
+
+	function get_databases() {
+		return array(ELASTIC_DB_NAME);
+	}
+
+	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
+		return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
+	}
+
+	function collations() {
+		return array();
+	}
+
+	function db_collation($db, $collations) {
+		//
+	}
+
+	function engines() {
+		return array();
+	}
+
+	function count_tables($databases) {
+		$return = connection()->rootQuery('_aliases');
+		if (empty($return)) {
+			return array(
+				ELASTIC_DB_NAME => 0
+			);
+		}
+
+		return array(
+			ELASTIC_DB_NAME => count($return)
+		);
+	}
+
+	function tables_list() {
+		$aliases = connection()->rootQuery('_aliases');
+		if (empty($aliases)) {
+			return array();
+		}
+
+		ksort($aliases);
+
+		$tables = array();
+		foreach ($aliases as $name => $index) {
+			$tables[$name] = "table";
+
+			ksort($index["aliases"]);
+			$tables += array_fill_keys(array_keys($index["aliases"]), "view");
+		}
+
+		return $tables;
+	}
+
+	function table_status($name = "", $fast = false) {
+		$stats = connection()->rootQuery('_stats');
+		$aliases = connection()->rootQuery('_aliases');
+
+		if (empty($stats) || empty($aliases)) {
+			return array();
+		}
+
+		$result = array();
+
+		if ($name != "") {
+			if (isset($stats["indices"][$name])) {
+				return format_index_status($name, $stats["indices"][$name]);
+			} else foreach ($aliases as $index_name => $index) {
+				foreach ($index["aliases"] as $alias_name => $alias) {
+					if ($alias_name == $name) {
+						return format_alias_status($alias_name, $stats["indices"][$index_name]);
+					}
+				}
+			}
+		}
+
+		ksort($stats["indices"]);
+		foreach ($stats["indices"] as $name => $index) {
+			if ($name[0] == ".") {
+				continue;
+			}
+
+			$result[$name] = format_index_status($name, $index);
+
+			if (!empty($aliases[$name]["aliases"])) {
+				ksort($aliases[$name]["aliases"]);
+				foreach ($aliases[$name]["aliases"] as $alias_name => $alias) {
+					$result[$alias_name] = format_alias_status($alias_name, $stats["indices"][$name]);
+				}
+			}
+		}
+
+		return $result;
+	}
+
+	function format_index_status($name, $index) {
+		return array(
+			"Name" => $name,
+			"Engine" => "Lucene",
+			"Oid" => $index["uuid"],
+			"Rows" => $index["total"]["docs"]["count"],
+			"Auto_increment" => 0,
+			"Data_length" => $index["total"]["store"]["size_in_bytes"],
+			"Index_length" => 0,
+			"Data_free" => $index["total"]["store"]["reserved_in_bytes"],
+		);
+	}
+
+	function format_alias_status($name, $index) {
+		return array(
+			"Name" => $name,
+			"Engine" => "view",
+			"Rows" => $index["total"]["docs"]["count"],
+		);
+	}
+
+	function is_view($table_status) {
+		return $table_status["Engine"] == "view";
+	}
+
+	function error() {
+		return h(connection()->error);
+	}
+
+	function information_schema() {
+		//
+	}
+
+	function indexes($table, $connection2 = null) {
+		return array(
+			array("type" => "PRIMARY", "columns" => array("_id")),
+		);
+	}
+
+	function fields($table) {
+		$mappings = array();
+		$mapping = connection()->rootQuery("_mapping");
+
+		if (!isset($mapping[$table])) {
+			$aliases = connection()->rootQuery('_aliases');
+
+			foreach ($aliases as $index_name => $index) {
+				foreach ($index["aliases"] as $alias_name => $alias) {
+					if ($alias_name == $table) {
+						$table = $index_name;
+						break;
+					}
+				}
+			}
+		}
+
+		if (!empty($mapping)) {
+			$mappings = $mapping[$table]["mappings"]["properties"];
+		}
+
+		$result = array(
+			"_id" => array(
+				"field" => "_id",
+				"full_type" => "text",
+				"type" => "text",
+				"privileges" => array("insert" => 1, "select" => 1, "where" => 1, "order" => 1),
+			)
+		);
+
+		foreach ($mappings as $name => $field) {
+			$has_index = !isset($field["index"]) || $field["index"];
+
+			// TODO: privileges: where => $has_index
+			// TODO: privileges: sort => $field["type"] != "text"
+
+			$result[$name] = array(
+				"field" => $name,
+				"full_type" => $field["type"],
+				"type" => $field["type"],
+				"privileges" => array(
+					"insert" => 1,
+					"select" => 1,
+					"update" => 1,
+					"where" => !isset($field["index"]) || $field["index"] ?: null,
+					"order" => $field["type"] != "text" ?: null
+				),
+			);
+		}
+
+		return $result;
+	}
+
+	function foreign_keys($table) {
+		return array();
+	}
+
+	function table($idf) {
+		return $idf;
+	}
+
+	function idf_escape($idf) {
+		return $idf;
+	}
+
+	function convert_field($field) {
+		//
+	}
+
+	function unconvert_field($field, $return) {
+		return $return;
+	}
+
+	function fk_support($table_status) {
+		//
+	}
+
+	function found_rows($table_status, $where) {
+		return null;
+	}
+
+	/** Create index
+	 * @param string
+	 * @return mixed
+	 */
+	function create_database($db) {
+		return connection()->rootQuery(urlencode($db), null, 'PUT');
+	}
+
+	/** Remove index
+	 * @param array
+	 * @return mixed
+	 */
+	function drop_databases($databases) {
+		return connection()->rootQuery(urlencode(implode(',', $databases)), null, 'DELETE');
+	}
+
+	/** Alter type
+	 * @param array
+	 * @return mixed
+	 */
+	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
+		$properties = array();
+		foreach ($fields as $f) {
+			$field_name = trim($f[1][0]);
+			$field_type = trim($f[1][1] ? $f[1][1] : "text");
+			$properties[$field_name] = array(
+				'type' => $field_type
+			);
+		}
+
+		if (!empty($properties)) {
+			$properties = array('properties' => $properties);
+		}
+
+		return connection()->query("_mapping/{$name}", $properties, 'PUT');
+	}
+
+	/** Drop types
+	 * @param array
+	 * @return bool
+	 */
+	function drop_tables($tables) {
+		$return = true;
+		foreach ($tables as $table) { //! convert to bulk api
+			$return = $return && connection()->query(urlencode($table), null, 'DELETE');
+		}
+
+		return $return;
+	}
+
+	function last_id() {
+		return connection()->last_id;
+	}
+
+	function driver_config() {
+		$types = array();
+		$structured_types = array();
+
+		foreach (array(
+			lang('Numbers') => array("long" => 3, "integer" => 5, "short" => 8, "byte" => 10, "double" => 20, "float" => 66, "half_float" => 12, "scaled_float" => 21),
+			lang('Date and time') => array("date" => 10),
+			lang('Strings') => array("string" => 65535, "text" => 65535),
+			lang('Binary') => array("binary" => 255),
+		) as $key => $val) {
+			$types += $val;
+			$structured_types[$key] = array_keys($val);
+		}
+
+		return array(
+			'possible_drivers' => array("json + allow_url_fopen"),
+			'jush' => "elastic",
+			'operators' => array("=", "must", "should", "must_not"),
+			'functions' => array(),
+			'grouping' => array(),
+			'edit_functions' => array(array("json")),
+			'types' => $types,
+			'structured_types' => $structured_types,
+		);
+	}
+}

plugins/drivers/elastic5.php

@@ -1,82 +1,105 @@
 <?php
-$drivers["elastic"] = "Elasticsearch (beta)";
+add_driver("elastic5", "Elasticsearch 5 (beta)");
 
-if (isset($_GET["elastic"])) {
+if (isset($_GET["elastic5"])) {
-	define("DRIVER", "elastic");
+	define("DRIVER", "elastic5");
 
-	if (function_exists('json_decode') && ini_bool('allow_url_fopen')) {
+	if (ini_bool('allow_url_fopen')) {
 		class Min_DB {
 			var $extension = "JSON", $server_info, $errno, $error, $_url, $_db;
 
-			/** Performs query
+			/**
-			 * @param string
+			 * @param string $path
-			 * @param array
+			 * @param array|null $content
-			 * @param string
+			 * @param string $method
-			 * @return mixed
+			 * @return array|false
 			 */
-			function rootQuery($path, $content = array(), $method = 'GET') {
+			function rootQuery($path, array $content = null, $method = 'GET') {
 				@ini_set('track_errors', 1); // @ - may be disabled
+
 				$file = @file_get_contents("$this->_url/" . ltrim($path, '/'), false, stream_context_create(array('http' => array(
 					'method' => $method,
-					'content' => $content === null ? $content : json_encode($content),
+					'content' => $content !== null ? json_encode($content) : null,
-					'header' => 'Content-Type: application/json',
+					'header' => $content !== null ? 'Content-Type: application/json' : [],
-					'ignore_errors' => 1, // available since PHP 5.2.10
+					'ignore_errors' => 1,
+					'follow_location' => 0,
+					'max_redirects' => 0,
 				))));
-				if (!$file) {
+
-					$this->error = $php_errormsg;
+				if ($file === false) {
-					return $file;
+					$this->error = lang('Invalid server or credentials.');
-				}
-				if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
-					$this->error = lang('Invalid credentials.') . " $http_response_header[0]";
 					return false;
 				}
+
 				$return = json_decode($file, true);
 				if ($return === null) {
-					$this->errno = json_last_error();
+					$this->error = lang('Invalid server or credentials.');
-					if (function_exists('json_last_error_msg')) {
+					return false;
-						$this->error = json_last_error_msg();
-					} else {
-						$constants = get_defined_constants(true);
-						foreach ($constants['json'] as $name => $value) {
-							if ($value == $this->errno && preg_match('~^JSON_ERROR_~', $name)) {
-								$this->error = $name;
-								break;
-							}
-						}
-					}
 				}
+
+				if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
+					if (isset($return['error']['root_cause'][0]['type'])) {
+						$this->error = $return['error']['root_cause'][0]['type'] . ": " . $return['error']['root_cause'][0]['reason'];
+					} else {
+						$this->error = lang('Invalid server or credentials.');
+					}
+					return false;
+				}
+
 				return $return;
 			}
 
 			/** Performs query relative to actual selected DB
-			 * @param string
+			 * @param string $path
-			 * @param array
+			 * @param array|null $content
-			 * @param string
+			 * @param string $method
-			 * @return mixed
+			 * @return array|false
 			 */
-			function query($path, $content = array(), $method = 'GET') {
+			function query($path, array $content = null, $method = 'GET') {
+				// Support for global search through all tables
+				if ($path != "" && $path[0] == "S" && preg_match('/SELECT 1 FROM ([^ ]+) WHERE (.+) LIMIT ([0-9]+)/', $path, $matches)) {
+					global $driver;
+
+					$where = explode(" AND ", $matches[2]);
+
+					return $driver->select($matches[1], array("*"), $where, null, array(), $matches[3]);
+				}
+
 				return $this->rootQuery(($this->_db != "" ? "$this->_db/" : "/") . ltrim($path, '/'), $content, $method);
 			}
 
+			/**
+			 * @param string $server
+			 * @param string $username
+			 * @param string $password
+			 * @return bool
+			 */
 			function connect($server, $username, $password) {
-				preg_match('~^(https?://)?(.*)~', $server, $match);
+				$this->_url = build_http_url($server, $username, $password, "localhost", 9200);
-				$this->_url = ($match[1] ? $match[1] : "http://") . "$username:$password@$match[2]";
+
 				$return = $this->query('');
-				if ($return) {
+				if (!$return) {
-					$this->server_info = $return['version']['number'];
+					return false;
 				}
-				return (bool) $return;
+
+				if (!isset($return['version']['number'])) {
+					$this->error = lang('Invalid server or credentials.');
+					return false;
+				}
+
+				$this->server_info = $return['version']['number'];
+				return true;
 			}
 
 			function select_db($database) {
 				$this->_db = $database;
+
 				return true;
 			}
 
 			function quote($string) {
 				return $string;
 			}
-
 		}
 
 		class Min_Result {
@@ -85,34 +108,33 @@ if (isset($_GET["elastic"])) {
 			function __construct($rows) {
 				$this->num_rows = count($rows);
 				$this->_rows = $rows;
+
 				reset($this->_rows);
 			}
 
 			function fetch_assoc() {
 				$return = current($this->_rows);
 				next($this->_rows);
+
 				return $return;
 			}
 
 			function fetch_row() {
-				return array_values($this->fetch_assoc());
+				$row = $this->fetch_assoc();
+
+				return $row ? array_values($row) : false;
 			}
-
 		}
-
 	}
 
-
-
 	class Min_Driver extends Min_SQL {
 
 		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
-			global $adminer;
 			$data = array();
-			$query = "$table/_search";
 			if ($select != array("*")) {
-				$data["fields"] = $select;
+				$data["fields"] = array_values($select);
 			}
+
 			if ($order) {
 				$sort = array();
 				foreach ($order as $col) {
@@ -121,58 +143,78 @@ if (isset($_GET["elastic"])) {
 				}
 				$data["sort"] = $sort;
 			}
+
 			if ($limit) {
 				$data["size"] = +$limit;
 				if ($page) {
 					$data["from"] = ($page * $limit);
 				}
 			}
+
 			foreach ($where as $val) {
-				list($col, $op, $val) = explode(" ", $val, 3);
+				if (preg_match('~^\((.+ OR .+)\)$~', $val, $matches)) {
-				if ($col == "_id") {
+					$parts = explode(" OR ", $matches[1]);
-					$data["query"]["ids"]["values"][] = $val;
+					$terms = array();
-				}
+					foreach ($parts as $part) {
-				elseif ($col . $val != "") {
+						list($col, $op, $val) = explode(" ", $part, 3);
-					$term = array("term" => array(($col != "" ? $col : "_all") => $val));
+						$term = array($col => $val);
+						if ($op == "=") {
+							$terms[] = array("term" => $term);
+						} elseif (in_array($op, array("must", "should", "must_not"))) {
+							$data["query"]["bool"][$op][]["match"] = $term;
+						}
+					}
+
+					if (!empty($terms)) {
+						$data["query"]["bool"]["filter"][]["bool"]["should"] = $terms;
+					}
+				} else {
+					list($col, $op, $val) = explode(" ", $val, 3);
+					$term = array($col => $val);
 					if ($op == "=") {
-						$data["query"]["filtered"]["filter"]["and"][] = $term;
+						$data["query"]["bool"]["filter"][] = array("term" => $term);
-					} else {
+					} elseif (in_array($op, array("must", "should", "must_not"))) {
-						$data["query"]["filtered"]["query"]["bool"]["must"][] = $term;
+						$data["query"]["bool"][$op][]["match"] = $term;
 					}
 				}
 			}
-			if ($data["query"] && !$data["query"]["filtered"]["query"] && !$data["query"]["ids"]) {
+
-				$data["query"]["filtered"]["query"] = array("match_all" => array());
+			$query = (min_version(7) ? "" : "$table/") . "_search";
-			}
 			$start = microtime(true);
 			$search = $this->_conn->query($query, $data);
+
 			if ($print) {
-				echo $adminer->selectQuery("$query: " . json_encode($data), $start, !$search);
+				echo adminer()->selectQuery("$query: " . json_encode($data), $start, !$search);
 			}
 			if (!$search) {
 				return false;
 			}
+
 			$return = array();
 			foreach ($search['hits']['hits'] as $hit) {
 				$row = array();
 				if ($select == array("*")) {
 					$row["_id"] = $hit["_id"];
 				}
+
 				$fields = $hit['_source'];
 				if ($select != array("*")) {
 					$fields = array();
 					foreach ($select as $key) {
-						$fields[$key] = $hit['fields'][$key];
+						$fields[$key] = $key == "_id" ? [$hit["_id"]] : $hit['fields'][$key];
 					}
 				}
+
 				foreach ($fields as $key => $val) {
 					if ($data["fields"]) {
 						$val = $val[0];
 					}
 					$row[$key] = (is_array($val) ? json_encode($val) : $val); //! display JSON and others differently
 				}
+
 				$return[] = $row;
 			}
+
 			return new Min_Result($return);
 		}
 
@@ -182,8 +224,10 @@ if (isset($_GET["elastic"])) {
 			if (count($parts) == 2) {
 				$id = trim($parts[1]);
 				$query = "$type/$id";
+
 				return $this->_conn->query($query, $record, 'POST');
 			}
+
 			return false;
 		}
 
@@ -192,16 +236,17 @@ if (isset($_GET["elastic"])) {
 			$query = "$type/$id";
 			$response = $this->_conn->query($query, $record, 'POST');
 			$this->_conn->last_id = $response['_id'];
+
 			return $response['created'];
 		}
 
 		function delete($type, $queryWhere, $limit = 0) {
 			//! use $limit
 			$ids = array();
-			if (is_array($_GET["where"]) && $_GET["where"]["_id"]) {
+			if (isset($_GET["where"]["_id"]) && $_GET["where"]["_id"]) {
 				$ids[] = $_GET["where"]["_id"];
 			}
-			if (is_array($_POST['check'])) {
+			if (isset($_POST['check'])) {
 				foreach ($_POST['check'] as $check) {
 					$parts = preg_split('~ *= *~', $check);
 					if (count($parts) == 2) {
@@ -209,30 +254,46 @@ if (isset($_GET["elastic"])) {
 					}
 				}
 			}
+
 			$this->_conn->affected_rows = 0;
+
 			foreach ($ids as $id) {
 				$query = "{$type}/{$id}";
-				$response = $this->_conn->query($query, '{}', 'DELETE');
+				$response = $this->_conn->query($query, null, 'DELETE');
-				if (is_array($response) && $response['found'] == true) {
+				if ((isset($response['found']) && $response['found']) || (isset($response['result']) && $response['result'] == 'deleted')) {
 					$this->_conn->affected_rows++;
 				}
 			}
+
 			return $this->_conn->affected_rows;
 		}
+
+		function convertOperator($operator) {
+			return $operator == "LIKE %%" ? "should" : $operator;
+		}
 	}
 
-
+	/**
+	 * @param string $hostPath
+	 * @return bool
+	 */
+	function is_server_host_valid($hostPath)
+	{
+		return strpos(rtrim($hostPath, '/'), '/') === false;
+	}
 
 	function connect() {
-		global $adminer;
 		$connection = new Min_DB;
-		list($server, $username, $password) = $adminer->credentials();
+
+		list($server, $username, $password) = adminer()->credentials();
 		if ($password != "" && $connection->connect($server, $username, "")) {
 			return lang('Database does not support password.');
 		}
+
 		if ($connection->connect($server, $username, $password)) {
 			return $connection;
 		}
+
 		return $connection->error;
 	}
 
@@ -241,36 +302,41 @@ if (isset($_GET["elastic"])) {
 	}
 
 	function logged_user() {
-		global $adminer;
+		$credentials = adminer()->credentials();
-		$credentials = $adminer->credentials();
+
 		return $credentials[1];
 	}
 
 	function get_databases() {
-		global $connection;
+		$return = connection()->rootQuery('_aliases');
-		$return = $connection->rootQuery('_aliases');
 		if ($return) {
 			$return = array_keys($return);
 			sort($return, SORT_STRING);
 		}
+
 		return $return;
 	}
 
+	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
+		return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
+	}
+
 	function collations() {
 		return array();
 	}
 
 	function db_collation($db, $collations) {
+		//
 	}
-	
+
 	function engines() {
 		return array();
 	}
 
 	function count_tables($databases) {
-		global $connection;
 		$return = array();
-		$result = $connection->query('_stats');
+
+		$result = connection()->query('_stats');
 		if ($result && $result['indices']) {
 			$indices = $result['indices'];
 			foreach ($indices as $indice => $stats) {
@@ -278,26 +344,25 @@ if (isset($_GET["elastic"])) {
 				$return[$indice] = $indexing['index_total'];
 			}
 		}
+
 		return $return;
 	}
 
 	function tables_list() {
-		global $connection;
+		if (min_version(7)) {
-
-		if (min_version(6)) {
 			return array('_doc' => 'table');
 		}
 
-		$return = $connection->query('_mapping');
+		$return = connection()->query('_mapping');
 		if ($return) {
-			$return = array_fill_keys(array_keys($return[$connection->_db]["mappings"]), 'table');
+			$return = array_fill_keys(array_keys($return[connection()->_db]["mappings"]), 'table');
 		}
+
 		return $return;
 	}
 
 	function table_status($name = "", $fast = false) {
-		global $connection;
+		$search = connection()->query("_search", array(
-		$search = $connection->query("_search", array(
 			"size" => 0,
 			"aggregations" => array(
 				"count_by_type" => array(
@@ -307,26 +372,30 @@ if (isset($_GET["elastic"])) {
 				)
 			)
 		), "POST");
+
 		$return = array();
+
 		if ($search) {
 			$tables = $search["aggregations"]["count_by_type"]["buckets"];
+
 			foreach ($tables as $table) {
 				$return[$table["key"]] = array(
 					"Name" => $table["key"],
 					"Engine" => "table",
 					"Rows" => $table["doc_count"],
 				);
+
 				if ($name != "" && $name == $table["key"]) {
 					return $return[$name];
 				}
 			}
 		}
+
 		return $return;
 	}
 
 	function error() {
-		global $connection;
+		return h(connection()->error);
-		return h($connection->error);
 	}
 
 	function information_schema() {
@@ -342,39 +411,54 @@ if (isset($_GET["elastic"])) {
 	}
 
 	function fields($table) {
-		global $connection;
-
 		$mappings = array();
-		if (min_version(6)) {
+
-			$result = $connection->query("_mapping");
+		if (min_version(7)) {
+			$result = connection()->query("_mapping");
 			if ($result) {
-				$mappings = $result[$connection->_db]['mappings']['properties'];
+				$mappings = $result[connection()->_db]['mappings']['properties'];
 			}
 		} else {
-			$result = $connection->query("$table/_mapping");
+			$result = connection()->query("$table/_mapping");
 			if ($result) {
 				$mappings = $result[$table]['properties'];
 				if (!$mappings) {
-					$mappings = $result[$connection->_db]['mappings'][$table]['properties'];
+					$mappings = $result[connection()->_db]['mappings'][$table]['properties'];
 				}
 			}
 		}
 
-		$return = array();
+		$return = array(
-		if ($mappings) {
+			"_id" => array(
-			foreach ($mappings as $name => $field) {
+				"field" => "_id",
-				$return[$name] = array(
+				"full_type" => "text",
-					"field" => $name,
+				"type" => "text",
-					"full_type" => $field["type"],
+				"privileges" => array("insert" => 1, "select" => 1, "where" => 1, "order" => 1),
-					"type" => $field["type"],
+			)
-					"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
+		);
-				);
+
-				if ($field["properties"]) { // only leaf fields can be edited
+		foreach ($mappings as $name => $field) {
-					unset($return[$name]["privileges"]["insert"]);
+			if (isset($field["index"]) && !$field["index"]) continue;
-					unset($return[$name]["privileges"]["update"]);
+
-				}
+			$return[$name] = array(
+				"field" => $name,
+				"full_type" => $field["type"],
+				"type" => $field["type"],
+				"privileges" => array(
+					"insert" => 1,
+					"select" => 1,
+					"update" => 1,
+					"where" => !isset($field["index"]) || $field["index"] ?: null,
+					"order" => $field["type"] != "text" ?: null
+				),
+			);
+
+			if ($field["properties"]) { // only leaf fields can be edited
+				unset($return[$name]["privileges"]["insert"]);
+				unset($return[$name]["privileges"]["update"]);
 			}
 		}
+
 		return $return;
 	}
 
@@ -391,6 +475,7 @@ if (isset($_GET["elastic"])) {
 	}
 
 	function convert_field($field) {
+		//
 	}
 
 	function unconvert_field($field, $return) {
@@ -398,6 +483,7 @@ if (isset($_GET["elastic"])) {
 	}
 
 	function fk_support($table_status) {
+		//
 	}
 
 	function found_rows($table_status, $where) {
@@ -405,29 +491,26 @@ if (isset($_GET["elastic"])) {
 	}
 
 	/** Create index
-	* @param string
+	 * @param string
-	* @return mixed
+	 * @return mixed
-	*/
+	 */
 	function create_database($db) {
-		global $connection;
+		return connection()->rootQuery(urlencode($db), null, 'PUT');
-		return $connection->rootQuery(urlencode($db), null, 'PUT');
 	}
 
 	/** Remove index
-	* @param array
+	 * @param array
-	* @return mixed
+	 * @return mixed
-	*/
+	 */
 	function drop_databases($databases) {
-		global $connection;
+		return connection()->rootQuery(urlencode(implode(',', $databases)), null, 'DELETE');
-		return $connection->rootQuery(urlencode(implode(',', $databases)), array(), 'DELETE');
 	}
 
 	/** Alter type
-	* @param array
+	 * @param array
-	* @return mixed
+	 * @return mixed
-	*/
+	 */
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
-		global $connection;
 		$properties = array();
 		foreach ($fields as $f) {
 			$field_name = trim($f[1][0]);
@@ -436,33 +519,34 @@ if (isset($_GET["elastic"])) {
 				'type' => $field_type
 			);
 		}
+
 		if (!empty($properties)) {
 			$properties = array('properties' => $properties);
 		}
-		return $connection->query("_mapping/{$name}", $properties, 'PUT');
+		return connection()->query("_mapping/{$name}", $properties, 'PUT');
 	}
 
 	/** Drop types
-	* @param array
+	 * @param array
-	* @return bool
+	 * @return bool
-	*/
+	 */
 	function drop_tables($tables) {
-		global $connection;
 		$return = true;
 		foreach ($tables as $table) { //! convert to bulk api
-			$return = $return && $connection->query(urlencode($table), array(), 'DELETE');
+			$return = $return && connection()->query(urlencode($table), null, 'DELETE');
 		}
+
 		return $return;
 	}
 
 	function last_id() {
-		global $connection;
+		return connection()->last_id;
-		return $connection->last_id;
 	}
 
 	function driver_config() {
 		$types = array();
 		$structured_types = array();
+
 		foreach (array(
 			lang('Numbers') => array("long" => 3, "integer" => 5, "short" => 8, "byte" => 10, "double" => 20, "float" => 66, "half_float" => 12, "scaled_float" => 21),
 			lang('Date and time') => array("date" => 10),
@@ -472,10 +556,11 @@ if (isset($_GET["elastic"])) {
 			$types += $val;
 			$structured_types[$key] = array_keys($val);
 		}
+
 		return array(
 			'possible_drivers' => array("json + allow_url_fopen"),
 			'jush' => "elastic",
-			'operators' => array("=", "query"),
+			'operators' => array("=", "must", "should", "must_not"),
 			'functions' => array(),
 			'grouping' => array(),
 			'edit_functions' => array(array("json")),

plugins/drivers/firebird.php

@@ -250,7 +250,7 @@ ORDER BY r.RDB$FIELD_POSITION';
 				"null" => (trim($row["FIELD_NOT_NULL_CONSTRAINT"]) == "YES"),
 				"auto_increment" => '0',
 				"collation" => trim($row["FIELD_COLLATION"]),
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
 				"comment" => trim($row["FIELD_DESCRIPTION"]),
 			);
 		}

plugins/drivers/simpledb.php

@@ -6,13 +6,49 @@ if (isset($_GET["simpledb"])) {
 
 	if (class_exists('SimpleXMLElement') && ini_bool('allow_url_fopen')) {
 		class Min_DB {
-			var $extension = "SimpleXML", $server_info = '2009-04-15', $error, $timeout, $next, $affected_rows, $_result;
+			var $extension = "SimpleXML", $server_info = '2009-04-15', $error, $timeout, $next, $affected_rows, $_url, $_result;
+
+			/**
+			 * @param string $server
+			 * @param string $password
+			 * @return bool
+			 */
+			function connect($server, $password) {
+				if ($server == '' || $password == '') {
+					$this->error = lang('Invalid server or credentials.');
+					return false;
+				}
+
+				$parts = parse_url($server);
+
+				if (!$parts || !isset($parts['host']) || !preg_match('~^sdb\.([a-z0-9-]+\.)?amazonaws\.com$~i', $parts['host']) ||
+					isset($parts['port'])
+				) {
+					$this->error = lang('Invalid server or credentials.');
+					return false;
+				}
+
+				$this->_url = build_http_url($server, '', '', '');
+
+				return (bool) $this->workaroundLoginRequest('ListDomains', ['MaxNumberOfDomains' => 1]);
+			}
+
+			// FIXME: This is so wrong :-( Move sdb_request to Min_DB!
+			private function workaroundLoginRequest($action, $params = array()) {
+				global $connection;
+
+				$connection = $this;
+				$result = sdb_request($action, $params);
+				$connection = null;
+
+				return $result;
+			}
 
 			function select_db($database) {
 				return ($database == "domain");
 			}
 
-			function query($query, $unbuffered = false) {
+			function query($query) {
 				$params = array('SelectExpression' => $query, 'ConsistentRead' => 'true');
 				if ($this->next) {
 					$params['NextToken'] = $this->next;
@@ -244,15 +280,26 @@ if (isset($_GET["simpledb"])) {
 
 	}
 
-
+	/**
+	 * @param string $hostPath
+	 * @return bool
+	 */
+	function is_server_host_valid($hostPath)
+	{
+		return strpos(rtrim($hostPath, '/'), '/') === false;
+	}
 
 	function connect() {
 		global $adminer;
-		list(, , $password) = $adminer->credentials();
+
-		if ($password != "") {
+		$connection = new Min_DB;
-			return lang('Database does not support password.');
+
+		list($server, , $password) = $adminer->credentials();
+		if ($connection->connect($server, $password)) {
+			return $connection;
 		}
-		return new Min_DB;
+
+		return $connection->error;
 	}
 
 	function support($feature) {
@@ -422,13 +469,16 @@ if (isset($_GET["simpledb"])) {
 		$query = str_replace('%7E', '~', substr($query, 1));
 		$query .= "&Signature=" . urlencode(base64_encode(hmac('sha1', "POST\n" . preg_replace('~^https?://~', '', $host) . "\n/\n$query", $secret, true)));
 		@ini_set('track_errors', 1); // @ - may be disabled
-		$file = @file_get_contents((preg_match('~^https?://~', $host) ? $host : "http://$host"), false, stream_context_create(array('http' => array(
+
+		$file = @file_get_contents($connection->_url, false, stream_context_create(array('http' => array(
 			'method' => 'POST', // may not fit in URL with GET
 			'content' => $query,
-			'ignore_errors' => 1, // available since PHP 5.2.10
+			'ignore_errors' => 1,
+			'follow_location' => 0,
+			'max_redirects' => 0,
 		))));
 		if (!$file) {
-			$connection->error = $php_errormsg;
+			$connection->error = error_get_last()['message'];
 			return false;
 		}
 		libxml_use_internal_errors(true);

plugins/edit-foreign.php

@@ -1,43 +1,75 @@
 <?php
 
 /** Select foreign key in edit form
-* @link https://www.adminer.org/plugins/#use
+ * @link https://www.adminer.org/plugins/#use
-* @author Jakub Vrana, https://www.vrana.cz/
+ * @author Jakub Vrana, https://www.vrana.cz/
-* @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
-* @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
+ * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
-*/
+ */
-class AdminerEditForeign {
+class AdminerEditForeign
-	var $_limit;
+{
-	
+	private $limit;
-	function __construct($limit = 0) {
+	private $foreignTables = [];
-		$this->_limit = $limit;
+	private $foreignOptions = [];
+
+	/**
+	 * @param int $limit
+	 */
+	function __construct($limit = 0)
+	{
+		$this->limit = $limit;
 	}
-	
+
-	function editInput($table, $field, $attrs, $value) {
+	/**
-		static $foreignTables = array();
+	 * @param string $table
-		static $values = array();
+	 * @param array $field
-		$foreignKeys = &$foreignTables[$table];
+	 * @param string $attrs
-		if ($foreignKeys === null) {
+	 * @param string|null $value
-			$foreignKeys = column_foreign_keys($table);
+	 *
+	 * @return string
+	 */
+	function editInput($table, array $field, $attrs, $value)
+	{
+		if (!isset($this->foreignTables[$table])) {
+			$this->foreignTables[$table] = column_foreign_keys($table);
 		}
-		foreach ((array) $foreignKeys[$field["field"]] as $foreignKey) {
+		$foreignKeys = $this->foreignTables[$table];
-			if (count($foreignKey["source"]) == 1) {
+
-				$target = $foreignKey["table"];
+		if (empty($foreignKeys[$field["field"]])) {
-				$id = $foreignKey["target"][0];
+			return "";
-				$options = &$values[$target][$id];
+		}
-				if (!$options) {
+
-					$column = idf_escape($id);
+		foreach ($foreignKeys[$field["field"]] as $foreignKey) {
-					if (preg_match('~binary~', $field["type"])) {
+			if (count($foreignKey["source"]) != 1) {
-						$column = "HEX($column)";
+				continue;
-					}
+			}
-					$options = array("" => "") + get_vals("SELECT $column FROM " . table($target) . " ORDER BY 1" . ($this->_limit ? " LIMIT " . ($this->_limit + 1) : ""));
+
-					if ($this->_limit && count($options) - 1 > $this->_limit) {
+			$target = $foreignKey["table"];
-						return;
+			$id = $foreignKey["target"][0];
-					}
+
+			if (!isset($this->foreignOptions[$target][$id])) {
+				$column = idf_escape($id);
+				if (preg_match('~binary~', $field["type"])) {
+					$column = "HEX($column)";
 				}
+
+				$values = get_vals("SELECT $column FROM " . table($target) . " ORDER BY 1" .
+					($this->limit ? " LIMIT " . ($this->limit + 1) : ""));
+
+				if ($this->limit && count($values) > $this->limit) {
+					$this->foreignOptions[$target][$id] = false;
+				} else {
+					$this->foreignOptions[$target][$id] = ["" => ""] + $values;
+				}
+			}
+
+			if ($options = $this->foreignOptions[$target][$id]) {
 				return "<select$attrs>" . optionlist($options, $value) . "</select>";
+			} else {
+				return "";
 			}
 		}
+
+		return "";
 	}
-	
 }

plugins/edit-textarea.php

@@ -10,7 +10,7 @@ class AdminerEditTextarea {
 
 	function editInput($table, $field, $attrs, $value) {
 		if (preg_match('~char~', $field["type"])) {
-			return "<textarea cols='30' rows='1' style='height: 1.2em;'$attrs>" . h($value) . '</textarea>';
+			return "<textarea cols='30' rows='1' $attrs>" . h($value) . '</textarea>';
 		}
 	}
 

plugins/enum-option.php

@@ -7,7 +7,7 @@
 * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerEnumOption {
-	
+
 	function editInput($table, $field, $attrs, $value) {
 		if ($field["type"] == "enum") {
 			$options = array();
@@ -24,7 +24,9 @@ class AdminerEnumOption {
 					$selected = "";
 				}
 			}
-			$options[0] = lang('empty');
+			if (!is_strict_mode()) {
+				$options[0] = lang('empty');
+			}
 			preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
 			foreach ($matches[1] as $i => $val) {
 				$val = stripcslashes(str_replace("''", "'", $val));
@@ -36,5 +38,5 @@ class AdminerEnumOption {
 			return "<select$attrs>" . optionlist($options, (string) $selected, 1) . "</select>"; // 1 - use keys
 		}
 	}
-	
+
 }

plugins/file-upload.php

@@ -1,5 +1,4 @@
 <?php
-//! delete
 
 /** Edit fields ending with "_path" by <input type="file"> and link to the uploaded files from select
 * @link https://www.adminer.org/plugins/#use
@@ -12,9 +11,9 @@ class AdminerFileUpload {
 	var $uploadPath, $displayPath, $extensions;
 
 	/**
-	* @param string prefix for uploading data (create writable subdirectory for each table containing uploadable fields)
+	* @param string $uploadPath prefix for uploading data (create writable subdirectory for each table containing uploadable fields)
-	* @param string prefix for displaying data, null stands for $uploadPath
+	* @param string|null $displayPath prefix for displaying data, null stands for $uploadPath
-	* @param string regular expression with allowed file extensions
+	* @param string $extensions regular expression with allowed file extensions
 	*/
 	function __construct($uploadPath = "../static/data/", $displayPath = null, $extensions = "[a-zA-Z0-9]+") {
 		$this->uploadPath = $uploadPath;
@@ -30,24 +29,56 @@ class AdminerFileUpload {
 
 	function processInput($field, $value, $function = "") {
 		if (preg_match('~(.*)_path$~', $field["field"], $regs)) {
-			$table = ($_GET["edit"] != "" ? $_GET["edit"] : $_GET["select"]);
+			$tableName = ($_GET["edit"] != "" ? $_GET["edit"] : $_GET["select"]);
-			$name = "fields-$field[field]";
+			$fieldName = $field["field"];
-			if ($_FILES[$name]["error"] || !preg_match("~(\\.($this->extensions))?\$~", $_FILES[$name]["name"], $regs2)) {
+			$files = $_FILES["fields"];
+
+			// Check upload error and file extension.
+			if ($files["error"][$fieldName] || !preg_match('~\.(' . $this->extensions . ')$~', $files["name"][$fieldName], $regs2)) {
 				return false;
 			}
-			//! unlink old
+
-			$filename = uniqid() . $regs2[0];
+			// Generate random unique file name.
-			if (!move_uploaded_file($_FILES[$name]["tmp_name"], "$this->uploadPath$table/$regs[1]-$filename")) {
+			do {
+				$filename = $this->generateName() . $regs2[0];
+
+				$targetPath = $this->uploadPath . $this->fsEncode($tableName) . "/" . $this->fsEncode($regs[1]) . "-$filename";
+			} while (file_exists($targetPath));
+
+			// Move file to final destination.
+			if (!move_uploaded_file($files["tmp_name"][$fieldName], $targetPath)) {
 				return false;
 			}
+
 			return q($filename);
 		}
 	}
 
-	function selectVal($val, &$link, $field, $original) {
+	private function fsEncode($value) {
-		if ($val != "" && preg_match('~(.*)_path$~', $field["field"], $regs)) {
+		// Encode special filesystem characters.
-			$link = "$this->displayPath$_GET[select]/$regs[1]-$val";
+		return strtr($value, [
-		}
+			'.' => '%2E',
+			'/' => '%2F',
+			'\\' => '%5C',
+		]);
 	}
 
+	private function generateName()
+	{
+		$rand = function_exists("random_int") ? "random_int" : "rand";
+
+		$result = '';
+		for ($i = 0; $i < 16; $i++) {
+			$code = $rand(97, 132); // random ASCII code for a-z and shifted 0-9
+			$result .= chr($code > 122 ? $code - 122 + 47 : $code);
+		}
+
+		return $result;
+	}
+
+	function selectVal($val, &$link, $field, $original) {
+		if ($val != "" && preg_match('~(.*)_path$~', $field["field"], $regs)) {
+			$link = $this->displayPath . "$_GET[select]/$regs[1]-$val";
+		}
+	}
 }

plugins/login-otp.php

@@ -1,54 +1,79 @@
 <?php
 
 /** Require One-Time Password at login
-* @link https://www.adminer.org/plugins/otp/
+ * @link https://www.adminer.org/plugins/otp/
-* @author Jakub Vrana, https://www.vrana.cz/
+ * @author Jakub Vrana, https://www.vrana.cz/
-* @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
-* @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
+ * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
-*/
+ */
-class AdminerLoginOtp {
+class AdminerLoginOtp
-	/** @access protected */
+{
-	var $secret;
+	/** @var string */
-	
+	private $secret;
-	/** 
+
-	* @param string decoded secret, e.g. base32_decode("SECRET")
+	/**
-	*/
+	 * @param string $secret Decoded secret, e.g. base64_decode("ENCODED_SECRET").
-	function __construct($secret) {
+	 */
+	public function __construct($secret) {
 		$this->secret = $secret;
-		if ($_POST["auth"]) {
+
-			$_SESSION["otp"] = (string) $_POST["auth"]["otp"];
+		if (isset($_POST["auth"])) {
-		}
+			$_SESSION["otp"] = (string)$_POST["auth"]["otp"];
-	}
-	
-	function loginFormField($name, $heading, $value) {
-		if ($name == 'password') {
-			return $heading . $value
-				. "<tr><th><acronym title='One Time Password' lang='en'>OTP</acronym>"
-				. "<td><input type='number' name='auth[otp]' value='" . h($_SESSION["otp"]) . "' size='6' autocomplete='off'>\n"
-			;
 		}
 	}
 
-	function login($login, $password) {
+	/**
-		if (isset($_SESSION["otp"])) {
+	 * @param string $name
-			$timeSlot = floor(time() / 30);
+	 * @param string $heading
-			foreach (array(0, -1, 1) as $skew) {
+	 * @param string $value
-				if ($_SESSION["otp"] == $this->getOtp($timeSlot + $skew)) {
+	 *
-					restart_session();
+	 * @return string|null
-					unset($_SESSION["otp"]);
+	 */
-					stop_session();
+	public function loginFormField($name, $heading, $value) {
-					return;
+		if ($name != "password") return null;
-				}
+
-			}
+		return $heading . $value .
-			return 'Invalid OTP.';
+			"<tr><th><abbr title='" . lang('One Time Password') . "' lang='en'>OTP</abbr></th>" .
-		}
+			"<td><input type='text' name='auth[otp]' value='" . h($_SESSION["otp"]) . "' " .
+			"size='6' autocomplete='one-time-code' inputmode='numeric' maxlength='6' pattern='\d{6}'/></td>" .
+			"</tr>\n";
 	}
-	
+
-	function getOtp($timeSlot) {
+	/**
-		$data = str_pad(pack('N', $timeSlot), 8, "\0", STR_PAD_LEFT);
+	 * @param string $login
-		$hash = hash_hmac('sha1', $data, $this->secret, true);
+	 * @param string $password
+	 *
+	 * @return string|null
+	 */
+	public function login($login, $password) {
+		if (!isset($_SESSION["otp"])) return null;
+
+		$timeSlot = floor(time() / 30);
+
+		foreach (array(0, -1, 1) as $skew) {
+			if ($_SESSION["otp"] == $this->getOtp($timeSlot + $skew)) {
+				restart_session();
+				unset($_SESSION["otp"]);
+				stop_session();
+
+				return null;
+			}
+		}
+
+		return lang('Invalid OTP code.');
+	}
+
+	/**
+	 * @param int $timeSlot
+	 *
+	 * @return int
+	 */
+	private function getOtp($timeSlot) {
+		$data = str_pad(pack("N", $timeSlot), 8, "\0", STR_PAD_LEFT);
+		$hash = hash_hmac("sha1", $data, $this->secret, true);
 		$offset = ord(substr($hash, -1)) & 0xF;
-		$unpacked = unpack('N', substr($hash, $offset, 4));
+		$unpacked = unpack("N", substr($hash, $offset, 4));
+
 		return ($unpacked[1] & 0x7FFFFFFF) % 1e6;
 	}
 }

plugins/login-ssl.php

@@ -1,24 +1,28 @@
 <?php
 
-/** Connect to MySQL using SSL
+/**
-* @link https://www.adminer.org/plugins/#use
+ * Connect to MySQL using SSL
-* @author Jakub Vrana, https://www.vrana.cz/
+ *
-* @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+ * @link https://www.adminer.org/plugins/#use
-* @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
+ * @author Jakub Vrana, https://www.vrana.cz/
-*/
+ * @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
-class AdminerLoginSsl {
+ * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
-	/** @access protected */
+  */
-	var $ssl;
+class AdminerLoginSsl
-	
+{
-	/** 
+	private var $ssl;
-	* @param array array("key" => filename, "cert" => filename, "ca" => filename)
+
-	*/
+	/**
-	function __construct($ssl) {
+	 * MySQL: ["key" => filename, "cert" => filename, "ca" => filename]
+	 * PostgresSQL: ["mode" => sslmode] (https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSLMODE)
+	 */
+	function __construct(array $ssl)
+	{
 		$this->ssl = $ssl;
 	}
-	
+
-	function connectSsl() {
+	function connectSsl()
+	{
 		return $this->ssl;
 	}
-	
 }