Release 4.2.0

Automatically generated queries start with the primary_key field
which is linked to edit a row. The haeckel theme changes this link
into an edit icon, and there's no problem since adminer will
automatically select the primary_key a second time.

In custom SQL queries however this second field selection can't be
inserted and the primary_key is eaten by the icon, making it hard
to find a row by id.

.gitignore

@@ -1,3 +1,4 @@
 /adminer/adminer.css
 /adminer*.php
 /editor*.php
+/vendor/

.gitmodules

@@ -1,15 +1,6 @@
 [submodule "jush"]
 	path = externals/jush
 	url = git://git.code.sf.net/p/jush/git
-[submodule "tinymce"]
-	path = externals/tinymce
-	url = git://github.com/tinymce/tinymce.git
-[submodule "jquery-ui"]
-	path = externals/jquery-ui
-	url = git://github.com/jquery/jquery-ui.git
-[submodule "jquery-timepicker"]
-	path = externals/jquery-timepicker
-	url = git://github.com/trentrichardson/jQuery-Timepicker-Addon.git
 [submodule "wymeditor"]
 	path = externals/wymeditor
 	url = git://github.com/wymeditor/wymeditor.git

adminer/create.inc.php

@@ -107,10 +107,10 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 			$name,
 			($jush == "sqlite" && ($use_all_fields || $foreign) ? $all_fields : $fields),
 			$foreign,
-			$row["Comment"],
+			($row["Comment"] != $table_status["Comment"] ? $row["Comment"] : null),
 			($row["Engine"] && $row["Engine"] != $table_status["Engine"] ? $row["Engine"] : ""),
 			($row["Collation"] && $row["Collation"] != $table_status["Collation"] ? $row["Collation"] : ""),
-			($row["Auto_increment"] != "" ? +$row["Auto_increment"] : ""),
+			($row["Auto_increment"] != "" ? number($row["Auto_increment"]) : ""),
 			$partitioning
 		));
 	}

adminer/database.inc.php

@@ -2,7 +2,6 @@
 $row = $_POST;
 
 if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP changes add.x to add_x
-	restart_session();
 	$name = trim($row["name"]);
 	if ($_POST["drop"]) {
 		$_GET["db"] = ""; // to save in global history
@@ -24,6 +23,8 @@ if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP c
 					$last = $db;
 				}
 			}
+			restart_session();
+			set_session("dbs", null);
 			queries_redirect(ME . "db=" . urlencode($last), lang('Database has been created.'), $success);
 		}
 	} else {

adminer/db.inc.php

@@ -65,15 +65,16 @@ if ($adminer->homepage()) {
 			echo "<table cellspacing='0' class='nowrap checkable' onclick='tableClick(event);' ondblclick='tableClick(event, true);'>\n";
 
 			echo '<thead><tr class="wrap"><td><input id="check-all" type="checkbox" onclick="formCheck(this, /^(tables|views)\[/);">';
+			$doc_link = doc_link(array('sql' => 'show-table-status.html'));
 			echo '<th>' . lang('Table');
-			echo '<td>' . lang('Engine');
-			echo '<td>' . lang('Collation');
-			echo '<td>' . lang('Data Length');
-			echo '<td>' . lang('Index Length');
-			echo '<td>' . lang('Data Free');
-			echo '<td>' . lang('Auto Increment');
-			echo '<td>' . lang('Rows');
-			echo (support("comment") ? '<td>' . lang('Comment') : '');
+			echo '<td>' . lang('Engine') . doc_link(array('sql' => 'storage-engines.html'));
+			echo '<td>' . lang('Collation') . doc_link(array('sql' => 'charset-mysql.html'));
+			echo '<td>' . lang('Data Length') . $doc_link;
+			echo '<td>' . lang('Index Length') . $doc_link;
+			echo '<td>' . lang('Data Free') . $doc_link;
+			echo '<td>' . lang('Auto Increment') . doc_link(array('sql' => 'example-auto-increment.html'));
+			echo '<td>' . lang('Rows') . $doc_link;
+			echo (support("comment") ? '<td>' . lang('Comment') . $doc_link : '');
 			echo "</thead>\n";
 
 			$tables = 0;
@@ -82,7 +83,7 @@ if ($adminer->homepage()) {
 				echo '<tr' . odd() . '><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "formUncheck('check-all');");
 				echo '<th>' . (support("table") || support("indexes") ? '<a href="' . h(ME) . 'table=' . urlencode($name) . '" title="' . lang('Show structure') . '">' . h($name) . '</a>' : h($name));
 				if ($view) {
-					echo '<td colspan="6"><a href="' . h(ME) . "view=" . urlencode($name) . '" title="' . lang('Alter view') . '">' . lang('View') . '</a>';
+					echo '<td colspan="6"><a href="' . h(ME) . "view=" . urlencode($name) . '" title="' . lang('Alter view') . '">' . (preg_match('~materialized~i', $type) ? lang('Materialized View') : lang('View')) . '</a>';
 					echo '<td align="right"><a href="' . h(ME) . "select=" . urlencode($name) . '" title="' . lang('Select data') . '">?</a>';
 				} else {
 					foreach (array(
@@ -144,6 +145,7 @@ if ($adminer->homepage()) {
 
 		echo '<p class="links"><a href="' . h(ME) . 'create=">' . lang('Create table') . "</a>\n";
 		echo (support("view") ? '<a href="' . h(ME) . 'view=">' . lang('Create view') . "</a>\n" : "");
+		echo (support("materializedview") ? '<a href="' . h(ME) . 'view=&amp;materialized=1">' . lang('Create materialized view') . "</a>\n" : "");
 
 		if (support("routine")) {
 			echo "<h3 id='routines'>" . lang('Routines') . "</h3>\n";
@@ -169,7 +171,7 @@ if ($adminer->homepage()) {
 
 		if (support("sequence")) {
 			echo "<h3 id='sequences'>" . lang('Sequences') . "</h3>\n";
-			$sequences = get_vals("SELECT sequence_name FROM information_schema.sequences WHERE sequence_schema = current_schema()");
+			$sequences = get_vals("SELECT sequence_name FROM information_schema.sequences WHERE sequence_schema = current_schema() ORDER BY sequence_name");
 			if ($sequences) {
 				echo "<table cellspacing='0'>\n";
 				echo "<thead><tr><th>" . lang('Name') . "</thead>\n";

adminer/drivers/elastic.inc.php

@@ -31,7 +31,7 @@ if (isset($_GET["elastic"])) {
 					return false;
 				}
 				$return = json_decode($file, true);
-				if (!$return) {
+				if ($return === null) {
 					$this->errno = json_last_error();
 					if (function_exists('json_last_error_msg')) {
 						$this->error = json_last_error_msg();
@@ -126,29 +126,37 @@ if (isset($_GET["elastic"])) {
 					$data["from"] = ($page * $limit);
 				}
 			}
-			foreach ((array) $_GET["where"] as $val) {
-				if ("$val[col]$val[val]" != "") {
-					$term = array("match" => array(($val["col"] != "" ? $val["col"] : "_all") => $val["val"]));
-					if ($val["op"] == "=") {
+			foreach ($where as $val) {
+				list($col,$op,$val) = explode(" ",$val,3);
+				if ($col == "_id") {
+					$data["query"]["ids"]["values"][] = $val;
+				}
+				elseif ($col . $val != "") {
+					$term = array("term" => array(($col != "" ? $col : "_all") => $val));
+					if ($op == "=") {
 						$data["query"]["filtered"]["filter"]["and"][] = $term;
 					} else {
 						$data["query"]["filtered"]["query"]["bool"]["must"][] = $term;
 					}
 				}
 			}
-			if ($data["query"] && !$data["query"]["filtered"]["query"]) {
+			if ($data["query"] && !$data["query"]["filtered"]["query"] && !$data["query"]["ids"]) {
 				$data["query"]["filtered"]["query"] = array("match_all" => array());
 			}
-			if ($print) {
-				echo $adminer->selectQuery("$query: " . print_r($data, true));
-			}
+			$start = microtime(true);
 			$search = $this->_conn->query($query, $data);
+			if ($print) {
+				echo $adminer->selectQuery("$query: " . print_r($data, true), format_time($start));
+			}
 			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();
@@ -157,6 +165,9 @@ if (isset($_GET["elastic"])) {
 					}
 				}
 				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;
@@ -193,6 +204,7 @@ if (isset($_GET["elastic"])) {
 		$return = $connection->rootQuery('_aliases');
 		if ($return) {
 			$return = array_keys($return);
+			sort($return, SORT_STRING);
 		}
 		return $return;
 	}
@@ -203,6 +215,10 @@ if (isset($_GET["elastic"])) {
 
 	function db_collation($db, $collations) {
 	}
+	
+	function engines() {
+		return array();
+	}
 
 	function count_tables($databases) {
 		global $connection;
@@ -217,18 +233,32 @@ if (isset($_GET["elastic"])) {
 		global $connection;
 		$return = $connection->query('_mapping');
 		if ($return) {
-			$return = array_fill_keys(array_keys(reset($return)), 'table');
+			$return = array_fill_keys(array_keys($return[$connection->_db]["mappings"]), 'table');
 		}
 		return $return;
 	}
 
 	function table_status($name = "", $fast = false) {
-		$return = tables_list();
-		if ($return) {
-			foreach ($return as $key => $type) { // _stats have just info about database
-				$return[$key] = array("Name" => $key, "Engine" => $type);
+		global $connection;
+		$search = $connection->query("_search?search_type=count", array(
+			"facets" => array(
+				"count_by_type" => array(
+					"terms" => array(
+						"field" => "_type",
+					)
+				)
+			)
+		), "POST");
+		$return = array();
+		if ($search) {
+			foreach ($search["facets"]["count_by_type"]["terms"] as $table) {
+				$return[$table["term"]] = array(
+					"Name" => $table["term"],
+					"Engine" => "table",
+					"Rows" => $table["count"],
+				);
 			}
-			if ($name != "") {
+			if ($name != "" && $name == $table["term"]) {
 				return $return[$name];
 			}
 		}
@@ -254,16 +284,26 @@ if (isset($_GET["elastic"])) {
 
 	function fields($table) {
 		global $connection;
-		$mapping = $connection->query("$table/_mapping");
+		$result = $connection->query("$table/_mapping");
 		$return = array();
-		if ($mapping) {
-			foreach ($mapping[$table]['properties'] as $name => $field) {
-				$return[$name] = array(
-					"field" => $name,
-					"full_type" => $field["type"],
-					"type" => $field["type"],
-					"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
-				);
+		if ($result) {
+			$mappings = $result[$table]['properties'];
+			if (!$mappings) {
+				$mappings = $result[$connection->_db]['mappings'][$table]['properties'];
+			}
+			if ($mappings) {
+				foreach ($mappings as $name => $field) {
+					$return[$name] = array(
+						"field" => $name,
+						"full_type" => $field["type"],
+						"type" => $field["type"],
+						"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
+					);
+					if ($field["properties"]) { // only leaf fields can be edited
+						unset($return[$name]["privileges"]["insert"]);
+						unset($return[$name]["privileges"]["update"]);
+					}
+				}
 			}
 		}
 		return $return;

adminer/drivers/firebird.inc.php

@@ -0,0 +1,320 @@
+<?php
+/**
+* @author Steve Krämer
+*/
+
+$drivers['firebird'] = 'Firebird (alpha)';
+	
+if (isset($_GET["firebird"])) {
+	$possible_drivers = array("interbase");
+	define("DRIVER", "firebird");
+
+	if (extension_loaded("interbase") ) {
+		class Min_DB {
+			var
+				$extension = "Firebird",
+				$server_info,
+				$affected_rows,
+				$errno,
+				$error,
+				$_link, $_result
+			;
+
+			function connect($server, $username, $password) {
+				$this->_link = ibase_connect($server, $username, $password); 
+				if ($this->_link) {
+					$url_parts = explode(':', $server);
+					$this->service_link = ibase_service_attach($url_parts[0], $username, $password);
+					$this->server_info = ibase_server_info($this->service_link, IBASE_SVC_SERVER_VERSION);
+				} else {
+					$this->errno = ibase_errcode();
+					$this->error = ibase_errmsg();
+				}
+				return (bool) $this->_link;
+			}
+
+			function quote($string) {
+				return "'" . str_replace("'", "''", $string) . "'";
+			}
+
+			function select_db($database) {
+				return ($database == "domain");
+			}
+
+			function query($query, $unbuffered = false) {
+				$result = ibase_query($query, $this->_link);
+				if (!$result) {
+					$this->errno = ibase_errcode();
+					$this->error = ibase_errmsg();
+					return false;
+				}
+				$this->error = "";
+				if ($result === true) {
+					$this->affected_rows = ibase_affected_rows($this->_link);
+					return true;
+				}
+				return new Min_Result($result);
+			}
+
+			function multi_query($query) {
+				return $this->_result = $this->query($query);
+			}
+
+			function store_result() {
+				return $this->_result;
+			}
+
+			function next_result() {
+				return false;
+			}
+
+			function result($query, $field = 0) {
+				$result = $this->query($query);
+				if (!$result || !$result->num_rows) {
+					return false;
+				}
+				$row = $result->fetch_row();
+				return $row[$field];
+			}
+		}
+
+		class Min_Result {
+			var $num_rows, $_result, $_offset = 0;
+
+			function Min_Result($result) {
+				$this->_result = $result;
+				// $this->num_rows = ibase_num_rows($result);
+			}
+
+			function fetch_assoc() {
+				return ibase_fetch_assoc($this->_result);
+			}
+
+			function fetch_row() {
+				return ibase_fetch_row($this->_result);
+			}
+
+			function fetch_field() {
+				$field = ibase_field_info($this->_result, $this->_offset++);
+				return (object) array(
+					'name' => $field['name'],
+					'orgname' => $field['name'],
+					'type' => $field['type'],
+					'charsetnr' => $field['length'],
+				);
+			}
+
+			function __destruct() {
+				ibase_free_result($this->_result);
+			}
+		}
+
+	}
+	
+	
+	
+	class Min_Driver extends Min_SQL {
+	}
+
+
+
+	function idf_escape($idf) {
+		return '"' . str_replace('"', '""', $idf) . '"';
+	}
+
+	function table($idf) {
+		return idf_escape($idf);
+	}
+
+	function connect() {
+		global $adminer;
+		$connection = new Min_DB;
+		$credentials = $adminer->credentials();
+		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
+			return $connection;
+		}
+		return $connection->error;
+	}
+
+	function get_databases($flush) {
+		return array("domain");
+	}
+
+	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
+		$return = ''; 
+		$return .= ($limit !== null ? $separator . "FIRST $limit" . ($offset ? " SKIP $offset" : "") : "");
+		$return .= " $query$where";
+		return $return;
+	}
+
+	function limit1($query, $where) {
+		return limit($query, $where, 1);
+	}
+
+	function db_collation($db, $collations) {
+	}
+
+	function engines() {
+		return array();
+	}
+
+	function logged_user() {
+		global $adminer;
+		$credentials = $adminer->credentials();
+		return $credentials[1];
+	}
+
+	function tables_list() {
+		global $connection;
+		$query = 'SELECT RDB$RELATION_NAME FROM rdb$relations WHERE rdb$system_flag = 0';
+		$result = ibase_query($connection->_link, $query);
+		$return = array();
+		while ($row = ibase_fetch_assoc($result)) {
+				$return[$row['RDB$RELATION_NAME']] = 'table';
+		}
+		ksort($return);	
+		return $return;
+	}
+
+	function count_tables($databases) {
+		return array();
+	}
+
+	function table_status($name = "", $fast = false) {
+		global $connection;
+		$return = array();
+		$data = tables_list();
+		foreach ($data as $index => $val) {
+			$index = trim($index);
+			$return[$index] = array(
+				'Name' => $index,
+				'Engine' => 'standard',
+			);
+			if ($name == $index) {
+				return $return[$index];
+			}
+		}
+		return $return;
+	}
+
+	function is_view($table_status) {
+		return false;
+	}
+
+	function fk_support($table_status) {
+		return preg_match('~InnoDB|IBMDB2I~i', $table_status["Engine"]);
+	}
+
+	function fields($table) {
+		global $connection;
+		$return = array();
+		$query = 'SELECT r.RDB$FIELD_NAME AS field_name,
+r.RDB$DESCRIPTION AS field_description,
+r.RDB$DEFAULT_VALUE AS field_default_value,
+r.RDB$NULL_FLAG AS field_not_null_constraint,
+f.RDB$FIELD_LENGTH AS field_length,
+f.RDB$FIELD_PRECISION AS field_precision,
+f.RDB$FIELD_SCALE AS field_scale,
+CASE f.RDB$FIELD_TYPE
+WHEN 261 THEN \'BLOB\'
+WHEN 14 THEN \'CHAR\'
+WHEN 40 THEN \'CSTRING\'
+WHEN 11 THEN \'D_FLOAT\'
+WHEN 27 THEN \'DOUBLE\'
+WHEN 10 THEN \'FLOAT\'
+WHEN 16 THEN \'INT64\'
+WHEN 8 THEN \'INTEGER\'
+WHEN 9 THEN \'QUAD\'
+WHEN 7 THEN \'SMALLINT\'
+WHEN 12 THEN \'DATE\'
+WHEN 13 THEN \'TIME\'
+WHEN 35 THEN \'TIMESTAMP\'
+WHEN 37 THEN \'VARCHAR\'
+ELSE \'UNKNOWN\'
+END AS field_type,
+f.RDB$FIELD_SUB_TYPE AS field_subtype,
+coll.RDB$COLLATION_NAME AS field_collation,
+cset.RDB$CHARACTER_SET_NAME AS field_charset
+FROM RDB$RELATION_FIELDS r
+LEFT JOIN RDB$FIELDS f ON r.RDB$FIELD_SOURCE = f.RDB$FIELD_NAME
+LEFT JOIN RDB$COLLATIONS coll ON f.RDB$COLLATION_ID = coll.RDB$COLLATION_ID
+LEFT JOIN RDB$CHARACTER_SETS cset ON f.RDB$CHARACTER_SET_ID = cset.RDB$CHARACTER_SET_ID
+WHERE r.RDB$RELATION_NAME = ' . q($table) . '
+ORDER BY r.RDB$FIELD_POSITION';
+		$result = ibase_query($connection->_link, $query);
+		while ($row = ibase_fetch_assoc($result)) {
+			$return[trim($row['FIELD_NAME'])] = array(
+				"field" => trim($row["FIELD_NAME"]),
+				"full_type" => trim($row["FIELD_TYPE"]),
+				"type" => trim($row["FIELD_SUB_TYPE"]),
+				"default" => trim($row['FIELD_DEFAULT_VALUE']),
+				"null" => (trim($row["FIELD_NOT_NULL_CONSTRAINT"]) == "YES"),
+				"auto_increment" => '0',
+				"collation" => trim($row["FIELD_COLLATION"]),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
+				"comment" => trim($row["FIELD_DESCRIPTION"]),
+			);
+		}
+		return $return;
+	}
+
+	function indexes($table, $connection2 = null) {
+		$return = array();
+		/*
+		$query = 'SELECT RDB$INDEX_SEGMENTS.RDB$FIELD_NAME AS field_name,
+RDB$INDICES.RDB$DESCRIPTION AS description,
+(RDB$INDEX_SEGMENTS.RDB$FIELD_POSITION + 1) AS field_position
+FROM RDB$INDEX_SEGMENTS
+LEFT JOIN RDB$INDICES ON RDB$INDICES.RDB$INDEX_NAME = RDB$INDEX_SEGMENTS.RDB$INDEX_NAME
+LEFT JOIN RDB$RELATION_CONSTRAINTS ON RDB$RELATION_CONSTRAINTS.RDB$INDEX_NAME = RDB$INDEX_SEGMENTS.RDB$INDEX_NAME
+WHERE UPPER(RDB$INDICES.RDB$RELATION_NAME) = ' . q($table) . '
+// AND UPPER(RDB$INDICES.RDB$INDEX_NAME) = \'TEST2_FIELD5_IDX\'
+AND RDB$RELATION_CONSTRAINTS.RDB$CONSTRAINT_TYPE IS NULL
+ORDER BY RDB$INDEX_SEGMENTS.RDB$FIELD_POSITION';
+		*/
+		return $return;
+	}
+
+	function foreign_keys($table) {
+		return array();
+	}
+
+	function collations() {
+		return array();
+	}
+
+	function information_schema($db) {
+		return false;
+	}
+
+	function error() {
+		global $connection;
+		return h($connection->error);
+	}
+
+	function types() {
+		return array();
+	}
+
+	function schemas() {
+		return array();
+	}
+
+	function get_schema() {
+		return "";
+	}
+
+	function set_schema($schema) {
+		return true;
+	}
+
+	function support($feature) {
+		return preg_match("~^(columns|sql|status|table)$~", $feature);
+	}
+
+	$jush = "firebird";
+	$operators = array("=");
+	$functions = array();
+	$grouping = array();
+	$edit_functions = array();
+}

adminer/drivers/mongo.inc.php

@@ -116,10 +116,6 @@ if (isset($_GET["mongo"])) {
 	class Min_Driver extends Min_SQL {
 		public $primary = "_id";
 		
-		function quote($value) {
-			return ($value === null ? $value : parent::quote($value));
-		}
-		
 		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
 			$select = ($select == array("*")
 				? array()
@@ -130,12 +126,12 @@ if (isset($_GET["mongo"])) {
 				$val = preg_replace('~ DESC$~', '', $val, 1, $count);
 				$sort[$val] = ($count ? -1 : 1);
 			}
-			return new Min_Result(iterator_to_array($this->_conn->_db->selectCollection($table)
+			return new Min_Result($this->_conn->_db->selectCollection($table)
 				->find(array(), $select)
 				->sort($sort)
 				->limit(+$limit)
 				->skip($page * $limit)
-			));
+			);
 		}
 		
 		function insert($table, $set) {

adminer/drivers/mssql.inc.php

@@ -66,6 +66,9 @@ if (isset($_GET["mssql"])) {
 				if (!$result) {
 					$result = $this->_result;
 				}
+				if (!$result) {
+					return false;
+				}
 				if (sqlsrv_field_metadata($result)) {
 					return new Min_Result($result);
 				}
@@ -74,7 +77,7 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function next_result() {
-				return sqlsrv_next_result($this->_result);
+				return $this->_result ? sqlsrv_next_result($this->_result) : null;
 			}
 
 			function result($query, $field = 0) {
@@ -427,7 +430,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 	}
 
 	function auto_increment() {
-		return " IDENTITY" . ($_POST["Auto_increment"] != "" ? "(" . (+$_POST["Auto_increment"]) . ",1)" : "") . " PRIMARY KEY";
+		return " IDENTITY" . ($_POST["Auto_increment"] != "" ? "(" . number($_POST["Auto_increment"]) . ",1)" : "") . " PRIMARY KEY";
 	}
 
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
@@ -567,6 +570,7 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
 	function trigger_options() {
 		return array(
 			"Timing" => array("AFTER", "INSTEAD OF"),
+			"Event" => array("INSERT", "UPDATE", "DELETE"),
 			"Type" => array("AS"),
 		);
 	}

adminer/drivers/mysql.inc.php

@@ -24,13 +24,6 @@ if (!defined("DRIVER")) {
 					(is_numeric($port) ? $port : ini_get("mysqli.default_port")),
 					(!is_numeric($port) ? $port : null)
 				);
-				if ($return) {
-					if (method_exists($this, 'set_charset')) {
-						$this->set_charset("utf8");
-					} else {
-						$this->query("SET NAMES utf8");
-					}
-				}
 				return $return;
 			}
 
@@ -75,17 +68,23 @@ if (!defined("DRIVER")) {
 				);
 				if ($this->_link) {
 					$this->server_info = mysql_get_server_info($this->_link);
-					if (function_exists('mysql_set_charset')) {
-						mysql_set_charset("utf8", $this->_link);
-					} else {
-						$this->query("SET NAMES utf8");
-					}
 				} else {
 					$this->error = mysql_error();
 				}
 				return (bool) $this->_link;
 			}
 
+			/** Sets the client character set
+			* @param string
+			* @return bool
+			*/
+			function set_charset($charset) {
+				if (function_exists('mysql_set_charset')) {
+					return mysql_set_charset($charset, $this->_link);
+				}
+				return $this->query("SET NAMES $charset");
+			}
+
 			/** Quote string to use in SQL
 			* @param string
 			* @return string escaped string enclosed in '
@@ -212,10 +211,13 @@ if (!defined("DRIVER")) {
 
 			function connect($server, $username, $password) {
 				$this->dsn("mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)), $username, $password);
-				$this->query("SET NAMES utf8"); // charset in DSN is ignored before PHP 5.3.6
 				return true;
 			}
 
+			function set_charset($charset) {
+				$this->query("SET NAMES $charset"); // charset in DSN is ignored before PHP 5.3.6
+			}
+
 			function select_db($database) {
 				// database selection is separated from the connection so dbname in DSN can't be used
 				return $this->query("USE " . idf_escape($database));
@@ -290,6 +292,7 @@ if (!defined("DRIVER")) {
 		$connection = new Min_DB;
 		$credentials = $adminer->credentials();
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
+			$connection->set_charset(charset($connection)); // available in MySQLi since PHP 5.0.5
 			$connection->query("SET sql_quote_show_create = 1, autocommit = 1");
 			return $connection;
 		}
@@ -444,7 +447,9 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function fk_support($table_status) {
-		return preg_match('~InnoDB|IBMDB2I~i', $table_status["Engine"]);
+		global $connection;
+		return preg_match('~InnoDB|IBMDB2I~i', $table_status["Engine"])
+			|| (preg_match('~NDB~i', $table_status["Engine"]) && version_compare($connection->server_info, '5.6') >= 0);
 	}
 
 	/** Get information about fields
@@ -500,7 +505,7 @@ if (!defined("DRIVER")) {
 		$return = array();
 		$create_table = $connection->result("SHOW CREATE TABLE " . table($table), 1);
 		if ($create_table) {
-			preg_match_all("~CONSTRAINT ($pattern) FOREIGN KEY \\(((?:$pattern,? ?)+)\\) REFERENCES ($pattern)(?:\\.($pattern))? \\(((?:$pattern,? ?)+)\\)(?: ON DELETE ($on_actions))?(?: ON UPDATE ($on_actions))?~", $create_table, $matches, PREG_SET_ORDER);
+			preg_match_all("~CONSTRAINT ($pattern) FOREIGN KEY ?\\(((?:$pattern,? ?)+)\\) REFERENCES ($pattern)(?:\\.($pattern))? \\(((?:$pattern,? ?)+)\\)(?: ON DELETE ($on_actions))?(?: ON UPDATE ($on_actions))?~", $create_table, $matches, PREG_SET_ORDER);
 			foreach ($matches as $match) {
 				preg_match_all("~$pattern~", $match[2], $source);
 				preg_match_all("~$pattern~", $match[5], $target);
@@ -579,7 +584,6 @@ if (!defined("DRIVER")) {
 	* @return string
 	*/
 	function create_database($db, $collation) {
-		set_session("dbs", null);
 		return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " COLLATE " . q($collation) : ""));
 	}
 
@@ -588,9 +592,10 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function drop_databases($databases) {
+		$return = apply_queries("DROP DATABASE", $databases, 'idf_escape');
 		restart_session();
 		set_session("dbs", null);
-		return apply_queries("DROP DATABASE", $databases, 'idf_escape');
+		return $return;
 	}
 
 	/** Rename database from DB
@@ -599,18 +604,21 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function rename_database($name, $collation) {
+		$return = false;
 		if (create_database($name, $collation)) {
 			//! move triggers
 			$rename = array();
 			foreach (tables_list() as $table => $type) {
 				$rename[] = table($table) . " TO " . idf_escape($name) . "." . table($table);
 			}
-			if (!$rename || queries("RENAME TABLE " . implode(", ", $rename))) {
+			$return = (!$rename || queries("RENAME TABLE " . implode(", ", $rename)));
+			if ($return) {
 				queries("DROP DATABASE " . idf_escape(DB));
-				return true;
 			}
+			restart_session();
+			set_session("dbs", null);
 		}
-		return false;
+		return $return;
 	}
 
 	/** Generate modifier for auto increment column
@@ -641,7 +649,7 @@ if (!defined("DRIVER")) {
 	* @param string
 	* @param string
 	* @param string
-	* @param int
+	* @param string number
 	* @param string
 	* @return bool
 	*/
@@ -654,20 +662,21 @@ if (!defined("DRIVER")) {
 			);
 		}
 		$alter = array_merge($alter, $foreign);
-		$status = "COMMENT=" . q($comment)
+		$status = ($comment !== null ? " COMMENT=" . q($comment) : "")
 			. ($engine ? " ENGINE=" . q($engine) : "")
 			. ($collation ? " COLLATE " . q($collation) : "")
 			. ($auto_increment != "" ? " AUTO_INCREMENT=$auto_increment" : "")
-			. $partitioning
 		;
 		if ($table == "") {
-			return queries("CREATE TABLE " . table($name) . " (\n" . implode(",\n", $alter) . "\n) $status");
+			return queries("CREATE TABLE " . table($name) . " (\n" . implode(",\n", $alter) . "\n)$status$partitioning");
 		}
 		if ($table != $name) {
 			$alter[] = "RENAME TO " . table($name);
 		}
-		$alter[] = $status;
-		return queries("ALTER TABLE " . table($table) . "\n" . implode(",\n", $alter));
+		if ($status) {
+			$alter[] = ltrim($status);
+		}
+		return ($alter || $partitioning ? queries("ALTER TABLE " . table($table) . "\n" . implode(",\n", $alter) . $partitioning) : true);
 	}
 
 	/** Run commands to alter indexes
@@ -734,7 +743,7 @@ if (!defined("DRIVER")) {
 		queries("SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO'");
 		foreach ($tables as $table) {
 			$name = ($target == DB ? table("copy_$table") : idf_escape($target) . "." . table($table));
-			if (!queries("DROP TABLE IF EXISTS $name")
+			if (!queries("\nDROP TABLE IF EXISTS $name")
 				|| !queries("CREATE TABLE $name LIKE " . table($table))
 				|| !queries("INSERT INTO $name SELECT * FROM " . table($table))
 			) {
@@ -755,7 +764,7 @@ if (!defined("DRIVER")) {
 
 	/** Get information about trigger
 	* @param string trigger name
-	* @return array array("Trigger" => , "Timing" => , "Event" => , "Type" => , "Statement" => )
+	* @return array array("Trigger" => , "Timing" => , "Event" => , "Of" => , "Type" => , "Statement" => )
 	*/
 	function trigger($name) {
 		if ($name == "") {
@@ -778,12 +787,12 @@ if (!defined("DRIVER")) {
 	}
 
 	/** Get trigger options
-	* @return array ("Timing" => array(), "Type" => array())
+	* @return array ("Timing" => array(), "Event" => array(), "Type" => array())
 	*/
 	function trigger_options() {
 		return array(
 			"Timing" => array("BEFORE", "AFTER"),
-			// Event is always INSERT, UPDATE, DELETE
+			"Event" => array("INSERT", "UPDATE", "DELETE"),
 			"Type" => array("FOR EACH ROW"),
 		);
 	}
@@ -796,7 +805,7 @@ if (!defined("DRIVER")) {
 	function routine($name, $type) {
 		global $connection, $enum_length, $inout, $types;
 		$aliases = array("bool", "boolean", "integer", "double precision", "real", "dec", "numeric", "fixed", "national char", "national varchar");
-		$type_pattern = "((" . implode("|", array_merge(array_keys($types), $aliases)) . ")\\b(?:\\s*\\(((?:[^'\")]*|$enum_length)++)\\))?\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s]+)['\"]?)?";
+		$type_pattern = "((" . implode("|", array_merge(array_keys($types), $aliases)) . ")\\b(?:\\s*\\(((?:[^'\")]|$enum_length)++)\\))?\\s*(zerofill\\s*)?(unsigned(?:\\s+zerofill)?)?)(?:\\s*(?:CHARSET|CHARACTER\\s+SET)\\s*['\"]?([^'\"\\s,]+)['\"]?)?";
 		$pattern = "\\s*(" . ($type == "FUNCTION" ? "" : $inout) . ")?\\s*(?:`((?:[^`]|``)*)`\\s*|\\b(\\S+)\\s+)$type_pattern";
 		$create = $connection->result("SHOW CREATE $type " . idf_escape($name), 2);
 		preg_match("~\\(((?:$pattern\\s*,?)*)\\)\\s*" . ($type == "FUNCTION" ? "RETURNS\\s+$type_pattern\\s+" : "") . "(.*)~is", $create, $match);
@@ -995,7 +1004,7 @@ if (!defined("DRIVER")) {
 	}
 
 	/** Check whether a feature is supported
-	* @param string "comment", "copy", "database", "drop_col", "dump", "event", "kill", "partitioning", "privileges", "procedure", "processlist", "routine", "scheme", "sequence", "status", "table", "trigger", "type", "variables", "view", "view_trigger"
+	* @param string "comment", "copy", "database", "drop_col", "dump", "event", "kill", "materializedview", "partitioning", "privileges", "procedure", "processlist", "routine", "scheme", "sequence", "status", "table", "trigger", "type", "variables", "view", "view_trigger"
 	* @return bool
 	*/
 	function support($feature) {

adminer/drivers/oracle.inc.php

@@ -317,7 +317,29 @@ ORDER BY uc.constraint_type, uic.column_position", $connection2) as $row) {
 	}
 
 	function foreign_keys($table) {
-		return array(); //!
+		$return = array();
+		$query = "SELECT c_list.CONSTRAINT_NAME as NAME,
+c_src.COLUMN_NAME as SRC_COLUMN,
+c_dest.OWNER as DEST_DB,
+c_dest.TABLE_NAME as DEST_TABLE,
+c_dest.COLUMN_NAME as DEST_COLUMN,
+c_list.DELETE_RULE as ON_DELETE
+FROM ALL_CONSTRAINTS c_list, ALL_CONS_COLUMNS c_src, ALL_CONS_COLUMNS c_dest
+WHERE c_list.CONSTRAINT_NAME = c_src.CONSTRAINT_NAME
+AND c_list.R_CONSTRAINT_NAME = c_dest.CONSTRAINT_NAME
+AND c_list.CONSTRAINT_TYPE = 'R'
+AND c_src.TABLE_NAME = " . q($table);
+		foreach (get_rows($query) as $row) {
+			$return[$row['NAME']] = array(
+				"db" => $row['DEST_DB'],
+				"table" => $row['DEST_TABLE'],
+				"source" => array($row['SRC_COLUMN']),
+				"target" => array($row['DEST_COLUMN']),
+				"on_delete" => $row['ON_DELETE'],
+				"on_update" => null,
+			);
+		}
+		return $return;
 	}
 
 	function truncate_tables($tables) {

adminer/drivers/pgsql.inc.php

@@ -225,7 +225,17 @@ if (isset($_GET["pgsql"])) {
 	}
 
 	function tables_list() {
-		return get_key_vals("SELECT table_name, table_type FROM information_schema.tables WHERE table_schema = current_schema() ORDER BY table_name");
+		$query = "SELECT table_name, table_type FROM information_schema.tables WHERE table_schema = current_schema()";
+		if (support('materializedview')) {
+			$query .= "
+UNION ALL
+SELECT matviewname, 'MATERIALIZED VIEW'
+FROM pg_matviews
+WHERE schemaname = current_schema()";
+		}
+		$query .= "
+ORDER BY 1";
+		return get_key_vals($query);
 	}
 
 	function count_tables($databases) {
@@ -234,9 +244,9 @@ if (isset($_GET["pgsql"])) {
 
 	function table_status($name = "") {
 		$return = array();
-		foreach (get_rows("SELECT relname AS \"Name\", CASE relkind WHEN 'r' THEN 'table' ELSE 'view' END AS \"Engine\", pg_relation_size(oid) AS \"Data_length\", pg_total_relation_size(oid) - pg_relation_size(oid) AS \"Index_length\", obj_description(oid, 'pg_class') AS \"Comment\", relhasoids::int AS \"Oid\", reltuples as \"Rows\"
+		foreach (get_rows("SELECT relname AS \"Name\", CASE relkind WHEN 'r' THEN 'table' WHEN 'mv' THEN 'materialized view' WHEN 'f' THEN 'foreign table' ELSE 'view' END AS \"Engine\", pg_relation_size(oid) AS \"Data_length\", pg_total_relation_size(oid) - pg_relation_size(oid) AS \"Index_length\", obj_description(oid, 'pg_class') AS \"Comment\", relhasoids::int AS \"Oid\", reltuples as \"Rows\"
 FROM pg_class
-WHERE relkind IN ('r','v')
+WHERE relkind IN ('r','v','mv','f')
 AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema())
 " . ($name != "" ? "AND relname = " . q($name) : "ORDER BY relname")
 		) as $row) { //! Index_length, Auto_increment
@@ -246,7 +256,7 @@ AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema(
 	}
 
 	function is_view($table_status) {
-		return $table_status["Engine"] == "view";
+		return in_array($table_status["Engine"], array("view", "materialized view"));
 	}
 
 	function fk_support($table_status) {
@@ -271,11 +281,17 @@ AND a.attnum > 0
 ORDER BY a.attnum"
 		) as $row) {
 			//! collation, primary
-			preg_match('~([^([]+)(\((.*)\))?((\[[0-9]*])*)$~', $row["full_type"], $match);
-			list(, $type, $length, $row["length"], $array) = $match;
+			preg_match('~([^([]+)(\((.*)\))?([a-z ]+)?((\[[0-9]*])*)$~', $row["full_type"], $match);
+			list(, $type, $length, $row["length"], $addon, $array) = $match;
 			$row["length"] .= $array;
-			$row["type"] = ($aliases[$type] ? $aliases[$type] : $type);
-			$row["full_type"] = $row["type"] . $length . $array;
+			$check_type = $type . $addon;
+			if (isset($aliases[$check_type])) {
+				$row["type"] = $aliases[$check_type];
+				$row["full_type"] = $row["type"] . $length . $array;
+			} else {
+				$row["type"] = $type;
+				$row["full_type"] = $row["type"] . $length . $addon . $array;
+			}
 			$row["null"] = !$row["attnotnull"];
 			$row["auto_increment"] = preg_match('~^nextval\\(~i', $row["default"]);
 			$row["privileges"] = array("insert" => 1, "select" => 1, "update" => 1);
@@ -467,21 +483,23 @@ ORDER BY conkey, conname") as $row) {
 	}
 
 	function drop_views($views) {
-		return queries("DROP VIEW " . implode(", ", array_map('table', $views)));
+		return drop_tables($views);
 	}
 
 	function drop_tables($tables) {
-		return queries("DROP TABLE " . implode(", ", array_map('table', $tables)));
+		foreach ($tables as $table) {
+		    $status = table_status($table);
+				if (!queries("DROP " . strtoupper($status["Engine"]) . " " . table($table))) {
+					return false;
+				}
+		}
+		return true;
 	}
 
 	function move_tables($tables, $views, $target) {
-		foreach ($tables as $table) {
-			if (!queries("ALTER TABLE " . table($table) . " SET SCHEMA " . idf_escape($target))) {
-				return false;
-			}
-		}
-		foreach ($views as $table) {
-			if (!queries("ALTER VIEW " . table($table) . " SET SCHEMA " . idf_escape($target))) {
+		foreach (array_merge($tables, $views) as $table) {
+			$status = table_status($table);
+			if (!queries("ALTER " . strtoupper($status["Engine"]) . " " . table($table) . " SET SCHEMA " . idf_escape($target))) {
 				return false;
 			}
 		}
@@ -507,6 +525,7 @@ ORDER BY conkey, conname") as $row) {
 	function trigger_options() {
 		return array(
 			"Timing" => array("BEFORE", "AFTER"),
+			"Event" => array("INSERT", "UPDATE", "DELETE"),
 			"Type" => array("FOR EACH ROW", "FOR EACH STATEMENT"),
 		);
 	}
@@ -611,7 +630,8 @@ AND typelem = 0"
 	}
 
 	function support($feature) {
-		return preg_match('~^(database|table|columns|sql|indexes|comment|view|scheme|processlist|sequence|trigger|type|variables|drop_col)$~', $feature); //! routine|
+		global $connection;
+		return preg_match('~^(database|table|columns|sql|indexes|comment|view|' . ($connection->server_info >= 9.3 ? 'materializedview|' : '') . 'scheme|processlist|sequence|trigger|type|variables|drop_col)$~', $feature); //! routine|
 	}
 
 	$jush = "pgsql";
@@ -629,7 +649,7 @@ AND typelem = 0"
 		$structured_types[$key] = array_keys($val);
 	}
 	$unsigned = array();
-	$operators = array("=", "<", ">", "<=", ">=", "!=", "~", "!~", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"); // no "SQL" to avoid SQL injection
+	$operators = array("=", "<", ">", "<=", ">=", "!=", "~", "!~", "LIKE", "LIKE %%", "ILIKE", "ILIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"); // no "SQL" to avoid SQL injection
 	$functions = array("char_length", "lower", "round", "to_hex", "to_timestamp", "upper");
 	$grouping = array("avg", "count", "count distinct", "max", "min", "sum");
 	$edit_functions = array(

adminer/drivers/sqlite.inc.php

@@ -352,20 +352,24 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		$sqls = get_key_vals("SELECT name, sql FROM sqlite_master WHERE type = 'index' AND tbl_name = " . q($table), $connection2);
 		foreach (get_rows("PRAGMA index_list(" . table($table) . ")", $connection2) as $row) {
 			$name = $row["name"];
-			if (!preg_match("~^sqlite_~", $name)) {
-				$return[$name]["type"] = ($row["unique"] ? "UNIQUE" : "INDEX");
-				$return[$name]["lengths"] = array();
-				foreach (get_rows("PRAGMA index_info(" . idf_escape($name) . ")", $connection2) as $row1) {
-					$return[$name]["columns"][] = $row1["name"];
-				}
-				$return[$name]["descs"] = array();
-				if (preg_match('~^CREATE( UNIQUE)? INDEX ' . preg_quote(idf_escape($name) . ' ON ' . idf_escape($table), '~') . ' \((.*)\)$~i', $sqls[$name], $regs)) {
-					preg_match_all('/("[^"]*+")+( DESC)?/', $regs[2], $matches);
-					foreach ($matches[2] as $val) {
-						$return[$name]["descs"][] = ($val ? '1' : null);
+			$index = array("type" => ($row["unique"] ? "UNIQUE" : "INDEX"));
+			$index["lengths"] = array();
+			$index["descs"] = array();
+			foreach (get_rows("PRAGMA index_info(" . idf_escape($name) . ")", $connection2) as $row1) {
+				$index["columns"][] = $row1["name"];
+				$index["descs"][] = null;
+			}
+			if (preg_match('~^CREATE( UNIQUE)? INDEX ' . preg_quote(idf_escape($name) . ' ON ' . idf_escape($table), '~') . ' \((.*)\)$~i', $sqls[$name], $regs)) {
+				preg_match_all('/("[^"]*+")+( DESC)?/', $regs[2], $matches);
+				foreach ($matches[2] as $key => $val) {
+					if ($val) {
+						$index["descs"][$key] = '1';
 					}
 				}
 			}
+			if (!$return[""] || $index["type"] != "UNIQUE" || $index["columns"] != $return[""]["columns"] || $index["descs"] != $return[""]["descs"] || !preg_match("~^sqlite_~", $name)) {
+				$return[$name] = $index;
+			}
 		}
 		return $return;
 	}
@@ -630,18 +634,28 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		if ($name == "") {
 			return array("Statement" => "BEGIN\n\t;\nEND");
 		}
+		$idf = '(?:[^`"\\s]+|`[^`]*`|"[^"]*")+';
+		$trigger_options = trigger_options();
 		preg_match(
-			'~^CREATE\\s+TRIGGER\\s*(?:[^`"\\s]+|`[^`]*`|"[^"]*")+\\s*(BEFORE|AFTER|INSTEAD\\s+OF)\\s+([a-z]+)\\s+ON\\s*(?:[^`"\\s]+|`[^`]*`|"[^"]*")+\\s*(?:FOR\\s*EACH\\s*ROW\\s)?(.*)~is',
+			"~^CREATE\\s+TRIGGER\\s*$idf\\s*(" . implode("|", $trigger_options["Timing"]) . ")\\s+([a-z]+)(?:\\s+OF\\s+($idf))?\\s+ON\\s*$idf\\s*(?:FOR\\s+EACH\\s+ROW\\s)?(.*)~is",
 			$connection->result("SELECT sql FROM sqlite_master WHERE type = 'trigger' AND name = " . q($name)),
 			$match
 		);
-		return array("Timing" => strtoupper($match[1]), "Event" => strtoupper($match[2]), "Trigger" => $name, "Statement" => $match[3]);
+		$of = $match[3];
+		return array(
+			"Timing" => strtoupper($match[1]),
+			"Event" => strtoupper($match[2]) . ($of ? " OF" : ""),
+			"Of" => ($of[0] == '`' || $of[0] == '"' ? idf_unescape($of) : $of),
+			"Trigger" => $name,
+			"Statement" => $match[4],
+		);
 	}
 
 	function triggers($table) {
 		$return = array();
+		$trigger_options = trigger_options();
 		foreach (get_rows("SELECT * FROM sqlite_master WHERE type = 'trigger' AND tbl_name = " . q($table)) as $row) {
-			preg_match('~^CREATE\\s+TRIGGER\\s*(?:[^`"\\s]+|`[^`]*`|"[^"]*")+\\s*([a-z]+)\\s*([a-z]+)~i', $row["sql"], $match);
+			preg_match('~^CREATE\\s+TRIGGER\\s*(?:[^`"\\s]+|`[^`]*`|"[^"]*")+\\s*(' . implode("|", $trigger_options["Timing"]) . ')\\s*(.*)\\s+ON\\b~iU', $row["sql"], $match);
 			$return[$row["name"]] = array($match[1], $match[2]);
 		}
 		return $return;
@@ -650,6 +664,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	function trigger_options() {
 		return array(
 			"Timing" => array("BEFORE", "AFTER", "INSTEAD OF"),
+			"Event" => array("INSERT", "UPDATE", "UPDATE OF", "DELETE"),
 			"Type" => array("FOR EACH ROW"),
 		);
 	}

adminer/dump.inc.php

@@ -14,14 +14,16 @@ if ($_POST && !$error) {
 	$is_sql = preg_match('~sql~', $_POST["format"]);
 
 	if ($is_sql) {
-		echo "-- Adminer $VERSION " . $drivers[DRIVER] . " dump
-
-" . ($jush != "sql" ? "" : "SET NAMES utf8;
+		echo "-- Adminer $VERSION " . $drivers[DRIVER] . " dump\n\n";
+		if ($jush == "sql") {
+			echo "SET NAMES " . charset($connection) . ";
+SET time_zone = '+00:00';
 " . ($_POST["data_style"] ? "SET foreign_key_checks = 0;
-SET time_zone = " . q(substr(preg_replace('~^[^-]~', '+\0', $connection->result("SELECT TIMEDIFF(NOW(), UTC_TIMESTAMP)")), 0, 6)) . ";
 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 " : "") . "
-");
+";
+			$connection->query("SET time_zone = '+00:00';");
+		}
 	}
 
 	$style = $_POST["db_style"];

adminer/edit.inc.php

@@ -59,14 +59,6 @@ if ($_POST && !$error && !isset($_GET["select"])) {
 	}
 }
 
-$table_name = $adminer->tableName(table_status1($TABLE, true));
-page_header(
-	($update ? lang('Edit') : lang('Insert')),
-	$error,
-	array("select" => array($TABLE, $table_name)),
-	$table_name
-);
-
 $row = null;
 if ($_POST["save"]) {
 	$row = (array) $_POST["fields"];
@@ -118,82 +110,4 @@ if (!support("table") && !$fields) {
 	}
 }
 
-if ($row === false) {
-	echo "<p class='error'>" . lang('No rows.') . "\n";
-}
-?>
-
-<div id="message"></div>
-
-<form action="" method="post" enctype="multipart/form-data" id="form">
-<?php
-if (!$fields) {
-	echo "<p class='error'>" . lang('You have no privileges to update this table.') . "\n";
-} else {
-	echo "<table cellspacing='0' onkeydown='return editingKeydown(event);'>\n";
-
-	foreach ($fields as $name => $field) {
-		echo "<tr><th>" . $adminer->fieldName($field);
-		$default = $_GET["set"][bracket_escape($name)];
-		if ($default === null) {
-			$default = $field["default"];
-			if ($field["type"] == "bit" && preg_match("~^b'([01]*)'\$~", $default, $regs)) {
-				$default = $regs[1];
-			}
-		}
-		$value = ($row !== null
-			? ($row[$name] != "" && $jush == "sql" && preg_match("~enum|set~", $field["type"])
-				? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name])
-				: $row[$name]
-			)
-			: (!$update && $field["auto_increment"]
-				? ""
-				: (isset($_GET["select"]) ? false : $default)
-			)
-		);
-		if (!$_POST["save"] && is_string($value)) {
-			$value = $adminer->editVal($value, $field);
-		}
-		$function = ($_POST["save"] ? (string) $_POST["function"][$name] : ($update && $field["on_update"] == "CURRENT_TIMESTAMP" ? "now" : ($value === false ? null : ($value !== null ? '' : 'NULL'))));
-		if (preg_match("~time~", $field["type"]) && $value == "CURRENT_TIMESTAMP") {
-			$value = "";
-			$function = "now";
-		}
-		input($field, $value, $function);
-		echo "\n";
-	}
-
-	if (!support("table")) {
-		echo "<tr>"
-			. "<th><input name='field_keys[]' onkeyup='keyupChange.call(this);' onchange='fieldChange(this);' value=''>" // needs empty value for keyupChange()
-			. "<td class='function'>" . html_select("field_funs[]", $adminer->editFunctions(array("null" => isset($_GET["select"]))))
-			. "<td><input name='field_vals[]'>"
-			. "\n"
-		;
-	}
-
-	echo "</table>\n";
-}
-?>
-<p>
-<?php
-if ($fields) {
-	echo "<input type='submit' value='" . lang('Save') . "'>\n";
-	if (!isset($_GET["select"])) {
-		echo "<input type='submit' name='insert' value='" . ($update
-			? lang('Save and continue edit') . "' onclick='return !ajaxForm(this.form, \"" . lang('Saving') . '...", this)'
-			: lang('Save and insert next')
-		) . "' title='Ctrl+Shift+Enter'>\n";
-	}
-}
-echo ($update ? "<input type='submit' name='delete' value='" . lang('Delete') . "'" . confirm() . ">\n"
-	: ($_POST || !$fields ? "" : "<script type='text/javascript'>focus(document.getElementById('form').getElementsByTagName('td')[1].firstChild);</script>\n")
-);
-if (isset($_GET["select"])) {
-	hidden_fields(array("check" => (array) $_POST["check"], "clone" => $_POST["clone"], "all" => $_POST["all"]));
-}
-?>
-<input type="hidden" name="referer" value="<?php echo h(isset($_POST["referer"]) ? $_POST["referer"] : $_SERVER["HTTP_REFERER"]); ?>">
-<input type="hidden" name="save" value="1">
-<input type="hidden" name="token" value="<?php echo $token; ?>">
-</form>
+edit_form($TABLE, $fields, $row, $update);

adminer/include/adminer.inc.php

@@ -27,6 +27,13 @@ class Adminer {
 		return password_file($create);
 	}
 
+	/** Return key used to group brute force attacks; behind a reverse proxy, you want to return the last part of X-Forwarded-For
+	* @return string
+	*/
+	function bruteForceKey() {
+		return $_SERVER["REMOTE_ADDR"];
+	}
+
 	/** Identifier of selected database
 	* @return string
 	*/
@@ -177,11 +184,12 @@ username.form['auth[driver]'].onchange();
 
 	/** Query printed in select before execution
 	* @param string query to be executed
+	* @param string elapsed time
 	* @return string
 	*/
-	function selectQuery($query) {
+	function selectQuery($query, $time) {
 		global $jush;
-		return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code>"
+		return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>($time)</span>"
 			. (support("sql") ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
 			. "</p>" // </p> - required for IE9 inline edit
 		;
@@ -224,7 +232,7 @@ username.form['auth[driver]'].onchange();
 		if (preg_match('~blob|bytea|raw|file~', $field["type"]) && !is_utf8($val)) {
 			$return = lang('%d byte(s)', strlen($original));
 		}
-		return ($link ? "<a href='" . h($link) . "'>$return</a>" : $return);
+		return ($link ? "<a href='" . h($link) . "'" . (is_url($link) ? " rel='noreferrer'" : "") . ">$return</a>" : $return);
 	}
 
 	/** Value conversion used in select and edit
@@ -404,7 +412,7 @@ username.form['auth[driver]'].onchange();
 	* @return array expressions to join by AND
 	*/
 	function selectSearchProcess($fields, $indexes) {
-		global $jush;
+		global $connection, $jush;
 		$return = array();
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT" && $_GET["fulltext"][$i] != "") {
@@ -421,6 +429,8 @@ username.form['auth[driver]'].onchange();
 					$cond = " $val[val]"; // SQL injection
 				} elseif ($val["op"] == "LIKE %%") {
 					$cond = " LIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
+				} elseif ($val["op"] == "ILIKE %%") {
+					$cond = " ILIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
 				} elseif (!preg_match('~NULL$~', $val["op"])) {
 					$cond .= " " . $this->processInput($fields[$val["col"]], $val["val"]);
 				}
@@ -435,7 +445,7 @@ username.form['auth[driver]'].onchange();
 							&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || $is_text)
 						) {
 							$name = idf_escape($name);
-							$cols[] = ($jush == "sql" && $is_text && !preg_match('~^utf8~', $field["collation"]) ? "CONVERT($name USING utf8)" : $name);
+							$cols[] = ($jush == "sql" && $is_text && !preg_match("~^utf8_~", $field["collation"]) ? "CONVERT($name USING " . charset($connection) . ")" : $name);
 						}
 					}
 					$return[] = ($cols ? "(" . implode("$cond OR ", $cols) . "$cond)" : "0");
@@ -500,9 +510,10 @@ username.form['auth[driver]'].onchange();
 
 	/** Query printed after execution in the message
 	* @param string executed query
+	* @param string elapsed time
 	* @return string
 	*/
-	function messageQuery($query) {
+	function messageQuery($query, $time) {
 		global $jush;
 		restart_session();
 		$history = &get_session("queries");
@@ -510,9 +521,10 @@ username.form['auth[driver]'].onchange();
 		if (strlen($query) > 1e6) {
 			$query = preg_replace('~[\x80-\xFF]+$~', '', substr($query, 0, 1e6)) . "\n..."; // [\x80-\xFF] - valid UTF-8, \n - can end by one-line comment
 		}
-		$history[$_GET["db"]][] = array($query, time()); // not DB - $_GET["db"] is changed in database.inc.php //! respect $_GET["ns"]
+		$history[$_GET["db"]][] = array($query, time(), $time); // not DB - $_GET["db"] is changed in database.inc.php //! respect $_GET["ns"]
 		return " <span class='time'>" . @date("H:i:s") . "</span> <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a>" // @ - time zone may be not set
 			. "<div id='$id' class='hidden'><pre><code class='jush-$jush'>" . shorten_utf8($query, 1000) . '</code></pre>'
+			. ($time ? " <span class='time'>($time)</span>" : '')
 			. (support("sql") ? '<p><a href="' . h(str_replace("db=" . urlencode(DB), "db=" . urlencode($_GET["db"]), ME) . 'sql=&history=' . (count($history[$_GET["db"]]) - 1)) . '">' . lang('Edit') . '</a>' : '')
 			. '</div>'
 		;
@@ -740,7 +752,7 @@ username.form['auth[driver]'].onchange();
 			($ext == "sql" || $output != "file" ? "text/plain" : "text/csv") . "; charset=utf-8"
 		)));
 		if ($output == "gz") {
-			ob_start('gzencode', 1e6);
+			ob_start('ob_gzencode', 1e6);
 		}
 		return $ext;
 	}
@@ -818,7 +830,7 @@ bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info,
 			if (DB == "" || !$missing) {
 				echo "<p class='links'>" . (support("sql") ? "<a href='" . h(ME) . "sql='" . bold(isset($_GET["sql"]) && !isset($_GET["import"])) . ">" . lang('SQL command') . "</a>\n<a href='" . h(ME) . "import='" . bold(isset($_GET["import"])) . ">" . lang('Import') . "</a>\n" : "") . "";
 				if (support("dump")) {
-					echo "<a href='" . h(ME) . "dump=" . urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]) . "' id='dump'" . bold(isset($_GET["dump"])) . ">" . lang('Dump') . "</a>\n";
+					echo "<a href='" . h(ME) . "dump=" . urlencode(isset($_GET["table"]) ? $_GET["table"] : $_GET["select"]) . "' id='dump'" . bold(isset($_GET["dump"])) . ">" . lang('Export') . "</a>\n";
 				}
 			}
 			if ($_GET["ns"] !== "" && !$missing && DB != "") {
@@ -852,7 +864,7 @@ bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info,
 		echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
 		if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
 			if (support("scheme")) {
-				echo "<br><select name='ns'$db_events>" . optionlist(array("" => "(" . lang('schema') . ")") + $adminer->schemas(), $_GET["ns"]) . "</select>";
+				echo "<br>" . lang('Schema') . ": <select name='ns'$db_events>" . optionlist(array("" => "") + $adminer->schemas(), $_GET["ns"]) . "</select>";
 				if ($_GET["ns"] != "") {
 					set_schema($_GET["ns"]);
 				}
@@ -873,10 +885,12 @@ bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info,
 	function tablesPrint($tables) {
 		echo "<p id='tables' onmouseover='menuOver(this, event);' onmouseout='menuOut(this);'>\n";
 		foreach ($tables as $table => $status) {
-			echo '<a href="' . h(ME) . 'select=' . urlencode($table) . '"' . bold($_GET["select"] == $table || $_GET["edit"] == $table) . ">" . lang('select') . "</a> ";
+			echo '<a href="' . h(ME) . 'select=' . urlencode($table) . '"' . bold($_GET["select"] == $table || $_GET["edit"] == $table, "select") . ">" . lang('select') . "</a> ";
 			$name = $this->tableName($status);
 			echo (support("table") || support("indexes")
-				? '<a href="' . h(ME) . 'table=' . urlencode($table) . '"' . bold(in_array($table, array($_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"])), (is_view($status) ? "view" : "")) . " title='" . lang('Show structure') . "'>$name</a>"
+				? '<a href="' . h(ME) . 'table=' . urlencode($table) . '"'
+					. bold(in_array($table, array($_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"])), (is_view($status) ? "view" : ""), "structure")
+					. " title='" . lang('Show structure') . "'>$name</a>"
 				: "<span>$name</span>"
 			) . "<br>\n";
 		}

adminer/include/auth.inc.php

@@ -15,29 +15,68 @@ if ($_COOKIE["adminer_permanent"]) {
 	}
 }
 
+function add_invalid_login() {
+	global $adminer;
+	$filename = get_temp_dir() . "/adminer.invalid";
+	$fp = @fopen($filename, "r+"); // @ - may not exist
+	if (!$fp) { // c+ is available since PHP 5.2.6
+		$fp = @fopen($filename, "w"); // @ - may not be writable
+		if (!$fp) {
+			return;
+		}
+	}
+	flock($fp, LOCK_EX);
+	$invalids = unserialize(stream_get_contents($fp));
+	$time = time();
+	if ($invalids) {
+		foreach ($invalids as $ip => $val) {
+			if ($val[0] < $time) {
+				unset($invalids[$ip]);
+			}
+		}
+	}
+	$invalid = &$invalids[$adminer->bruteForceKey()];
+	if (!$invalid) {
+		$invalid = array($time + 30*60, 0); // active for 30 minutes
+	}
+	$invalid[1]++;
+	$serialized = serialize($invalids);
+	rewind($fp);
+	fwrite($fp, $serialized);
+	ftruncate($fp, strlen($serialized));
+	flock($fp, LOCK_UN);
+	fclose($fp);
+}
+
 $auth = $_POST["auth"];
 if ($auth) {
+	$invalids = unserialize(@file_get_contents(get_temp_dir() . "/adminer.invalid")); // @ - may not exist
+	$invalid = $invalids[$adminer->bruteForceKey()];
+	$next_attempt = ($invalid[1] > 30 ? $invalid[0] - time() : 0); // allow 30 invalid attempts
+	if ($next_attempt > 0) { //! do the same with permanent login
+		auth_error(lang('Too many unsuccessful logins, try again in %d minute(s).', ceil($next_attempt / 60)));
+	}
 	session_regenerate_id(); // defense against session fixation
-	$driver = $auth["driver"];
+	$vendor = $auth["driver"];
 	$server = $auth["server"];
 	$username = $auth["username"];
-	$password = $auth["password"];
+	$password = (string) $auth["password"];
 	$db = $auth["db"];
-	set_password($driver, $server, $username, $password);
-	$_SESSION["db"][$driver][$server][$username][$db] = true;
+	set_password($vendor, $server, $username, $password);
+	$_SESSION["db"][$vendor][$server][$username][$db] = true;
 	if ($auth["permanent"]) {
-		$key = base64_encode($driver) . "-" . base64_encode($server) . "-" . base64_encode($username) . "-" . base64_encode($db);
+		$key = base64_encode($vendor) . "-" . base64_encode($server) . "-" . base64_encode($username) . "-" . base64_encode($db);
 		$private = $adminer->permanentLogin(true);
 		$permanent[$key] = "$key:" . base64_encode($private ? encrypt_string($password, $private) : "");
 		cookie("adminer_permanent", implode(" ", $permanent));
 	}
 	if (count($_POST) == 1 // 1 - auth
-		|| DRIVER != $driver
+		|| DRIVER != $vendor
 		|| SERVER != $server
 		|| $_GET["username"] !== $username // "0" == "00"
 		|| DB != $db
 	) {
-		redirect(auth_url($driver, $server, $username, $db));
+		redirect(auth_url($vendor, $server, $username, $db));
 	}
 	
 } elseif ($_POST["logout"]) {
@@ -75,19 +114,22 @@ function unset_permanent() {
 	cookie("adminer_permanent", implode(" ", $permanent));
 }
 
-function auth_error($exception = null) {
-	global $connection, $adminer, $has_token;
+/** Renders an error message and a login form
+* @param string plain text
+* @return null exits
+*/
+function auth_error($error) {
+	global $adminer, $has_token;
+	$error = h($error);
 	$session_name = session_name();
-	$error = "";
-	if (!$_COOKIE[$session_name] && $_GET[$session_name] && ini_bool("session.use_only_cookies")) {
-		$error = lang('Session support must be enabled.');
-	} elseif (isset($_GET["username"])) {
+	if (isset($_GET["username"])) {
+		header("HTTP/1.1 403 Forbidden"); // 401 requires sending WWW-Authenticate header
 		if (($_COOKIE[$session_name] || $_GET[$session_name]) && !$has_token) {
 			$error = lang('Session expired, please login again.');
 		} else {
+			add_invalid_login();
 			$password = get_password();
 			if ($password !== null) {
-				$error = h($exception ? $exception->getMessage() : (is_string($connection) ? $connection : lang('Invalid credentials.')));
 				if ($password === false) {
 					$error .= '<br>' . lang('Master password expired. <a href="http://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.', '<code>permanentLogin()</code>');
 				}
@@ -96,6 +138,9 @@ function auth_error($exception = null) {
 			unset_permanent();
 		}
 	}
+	if (!$_COOKIE[$session_name] && $_GET[$session_name] && ini_bool("session.use_only_cookies")) {
+		$error = lang('Session support must be enabled.');
+	}
 	$params = session_get_cookie_params();
 	cookie("adminer_key", ($_COOKIE["adminer_key"] ? $_COOKIE["adminer_key"] : rand_string()), $params["lifetime"]);
 	page_header(lang('Login'), $error, null);
@@ -106,24 +151,7 @@ function auth_error($exception = null) {
 	echo "</div>\n";
 	echo "</form>\n";
 	page_footer("auth");
-}
-
-function set_password($vendor, $server, $username, $password) {
-	$_SESSION["pwds"][$vendor][$server][$username] = ($_COOKIE["adminer_key"] && is_string($password)
-		? array(encrypt_string($password, $_COOKIE["adminer_key"]))
-		: $password
-	);
-}
-
-function get_password() {
-	$return = get_session("pwds");
-	if (is_array($return)) {
-		$return = ($_COOKIE["adminer_key"]
-			? decrypt_string($return[0], $_COOKIE["adminer_key"])
-			: false
-		);
-	}
-	return $return;
+	exit;
 }
 
 if (isset($_GET["username"])) {
@@ -137,13 +165,12 @@ if (isset($_GET["username"])) {
 	$connection = connect();
 }
 
-if (!is_object($connection) || !$adminer->login($_GET["username"], get_password())) {
-	auth_error();
-	exit;
-}
-
 $driver = new Min_Driver($connection);
 
+if (!is_object($connection) || !$adminer->login($_GET["username"], get_password())) {
+	auth_error((is_string($connection) ? $connection : lang('Invalid credentials.')));
+}
+
 if ($auth && $_POST["token"]) {
 	$_POST["token"] = $token; // reset token after explicit login
 }
@@ -164,7 +191,7 @@ if ($_POST) {
 		}
 		$error = (!$_POST["token"] && $max_vars
 			? lang('Maximum number of allowed fields exceeded. Please increase %s.', "'$ini'")
-			: lang('Invalid CSRF token. Send the form again.')
+			: lang('Invalid CSRF token. Send the form again.') . ' ' . lang('If you did not send this request from Adminer then close this page.')
 		);
 	}
 	

adminer/include/bootstrap.inc.php

@@ -64,6 +64,7 @@ include "../adminer/drivers/sqlite.inc.php";
 include "../adminer/drivers/pgsql.inc.php";
 include "../adminer/drivers/oracle.inc.php";
 include "../adminer/drivers/mssql.inc.php";
+include "../adminer/drivers/firebird.inc.php";
 include "../adminer/drivers/simpledb.inc.php";
 include "../adminer/drivers/mongo.inc.php";
 include "../adminer/drivers/elastic.inc.php";
@@ -88,7 +89,7 @@ if (!ini_bool("session.use_cookies") || @ini_set("session.use_cookies", false) !
 	session_write_close(); // improves concurrency if a user opens several pages at once, may be restarted later
 }
 
-include "./include/connect.inc.php";
 include "./include/editing.inc.php";
+include "./include/connect.inc.php";
 
 $on_actions = "RESTRICT|NO ACTION|CASCADE|SET NULL|SET DEFAULT"; ///< @var string used in foreign_keys()

adminer/include/connect.inc.php

@@ -1,7 +1,6 @@
 <?php
 function connect_error() {
 	global $adminer, $connection, $token, $error, $drivers;
-	$databases = array();
 	if (DB != "") {
 		header("HTTP/1.1 404 Not Found");
 		page_header(lang('Database') . ": " . h(DB), lang('Invalid database.'), true);
@@ -23,7 +22,7 @@ function connect_error() {
 				echo "<a href='" . h(ME) . "$key='>$val</a>\n";
 			}
 		}
-		echo "<p>" . lang('%s version: %s through PHP extension %s', $drivers[DRIVER], "<b>$connection->server_info</b>", "<b>$connection->extension</b>") . "\n";
+		echo "<p>" . lang('%s version: %s through PHP extension %s', $drivers[DRIVER], "<b>" . h($connection->server_info) . "</b>", "<b>$connection->extension</b>") . "\n";
 		echo "<p>" . lang('Logged as: %s', "<b>" . h(logged_user()) . "</b>") . "\n";
 		$databases = $adminer->databases();
 		if ($databases) {
@@ -31,15 +30,25 @@ function connect_error() {
 			$collations = collations();
 			echo "<form action='' method='post'>\n";
 			echo "<table cellspacing='0' class='checkable' onclick='tableClick(event);' ondblclick='tableClick(event, true);'>\n";
-			echo "<thead><tr>" . (support("database") ? "<td>&nbsp;" : "") . "<th>" . lang('Database') . "<td>" . lang('Collation') . "<td>" . lang('Tables') . "</thead>\n";
+			echo "<thead><tr>"
+				. (support("database") ? "<td>&nbsp;" : "")
+				. "<th>" . lang('Database') . " - <a href='" . h(ME) . "refresh=1'>" . lang('Refresh') . "</a>"
+				. "<td>" . lang('Collation')
+				. "<td>" . lang('Tables')
+				. "<td>" . lang('Size') . " - <a href='" . h(ME) . "dbsize=1' onclick=\"return !ajaxSetHtml('" . js_escape(ME) . "script=connect');\">" . lang('Compute') . "</a>"
+				. "</thead>\n"
+			;
 			
-			foreach ($databases as $db) {
+			$databases = ($_GET["dbsize"] ? count_tables($databases) : array_flip($databases));
+			
+			foreach ($databases as $db => $tables) {
 				$root = h(ME) . "db=" . urlencode($db);
 				echo "<tr" . odd() . ">" . (support("database") ? "<td>" . checkbox("db[]", $db, in_array($db, (array) $_POST["db"])) : "");
 				echo "<th><a href='$root'>" . h($db) . "</a>";
 				$collation = nbsp(db_collation($db, $collations));
 				echo "<td>" . (support("database") ? "<a href='$root" . ($scheme ? "&amp;ns=" : "") . "&amp;database=' title='" . lang('Alter database') . "'>$collation</a>" : $collation);
-				echo "<td align='right'><a href='$root&amp;schema=' id='tables-" . h($db) . "' title='" . lang('Database schema') . "'>?</a>";
+				echo "<td align='right'><a href='$root&amp;schema=' id='tables-" . h($db) . "' title='" . lang('Database schema') . "'>" . ($_GET["dbsize"] ? $tables : "?") . "</a>";
+				echo "<td align='right' id='size-" . h($db) . "'>" . ($_GET["dbsize"] ? db_size($db) : "?");
 				echo "\n";
 			}
 			
@@ -55,13 +64,9 @@ function connect_error() {
 			echo "<input type='hidden' name='token' value='$token'>\n";
 			echo "</form>\n";
 		}
-		echo "<p><a href='" . h(ME) . "refresh=1'>" . lang('Refresh') . "</a>\n";
 	}
 	
 	page_footer("db");
-	if ($databases) {
-		echo "<script type='text/javascript'>ajaxSetHtml('" . js_escape(ME) . "script=connect');</script>\n";
-	}
 }
 
 if (isset($_GET["status"])) {

adminer/include/design.inc.php

@@ -9,6 +9,10 @@
 function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 	global $LANG, $VERSION, $adminer, $drivers, $jush;
 	page_headers();
+	if (is_ajax() && $error) {
+		page_messages($error);
+		exit;
+	}
 	$title_all = $title . ($title2 != "" ? ": $title2" : "");
 	$title_page = strip_tags($title_all . (SERVER != "" && SERVER != "localhost" ? h(" - " . SERVER) : "") . " - " . $adminer->name());
 	?>
@@ -17,6 +21,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 <meta http-equiv="Content-Script-Type" content="text/javascript">
 <meta name="robots" content="noindex">
+<meta name="referrer" content="never">
 <title><?php echo $title_page; ?></title>
 <link rel="stylesheet" type="text/css" href="../adminer/static/default.css">
 <script type="text/javascript" src="../adminer/static/functions.js"></script>
@@ -32,6 +37,7 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <body class="<?php echo lang('ltr'); ?> nojs" onkeydown="bodyKeydown(event);" onclick="bodyClick(event);"<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " onload=\"verifyVersion('$VERSION');\""); ?>>
 <script type="text/javascript">
 document.body.className = document.body.className.replace(/ nojs/, ' js');
+var offlineMessage = '<?php echo js_escape(lang('You are offline.')); ?>';
 </script>
 
 <div id="help" class="jush-<?php echo $jush; ?> jsonly hidden" onmouseover="helpOpen = 1;" onmouseout="helpMouseout(this, event);"></div>
@@ -65,6 +71,7 @@ document.body.className = document.body.className.replace(/ nojs/, ' js');
 		}
 	}
 	echo "<h2>$title_all</h2>\n";
+	echo "<div id='ajaxstatus' class='jsonly hidden'></div>\n";
 	restart_session();
 	page_messages($error);
 	$databases = &get_session("dbs");

adminer/include/driver.inc.php

@@ -10,14 +10,6 @@
 		$this->_conn = $connection;
 	}
 	
-	/** Quote a SQL string or null value
-	* @param string
-	* @return string
-	*/
-	function quote($value) {
-		return ($value === null ? "NULL" : $this->_conn->quote($value));
-	}
-	
 	/** Select data from table
 	* @param string
 	* @param array result of $adminer->selectColumnsProcess()[0]
@@ -42,10 +34,12 @@
 				"\n"
 			);
 		}
+		$start = microtime(true);
+		$return = $this->_conn->query($query);
 		if ($print) {
-			echo $adminer->selectQuery($query);
+			echo $adminer->selectQuery($query, format_time($start));
 		}
-		return $this->_conn->query($query);
+		return $return;
 	}
 	
 	/** Delete data from table

adminer/include/editing.inc.php

@@ -3,9 +3,10 @@
 * @param Min_Result
 * @param Min_DB connection to examine indexes
 * @param array
+* @param int
 * @return array $orgtables
 */
-function select($result, $connection2 = null, $orgtables = array()) {
+function select($result, $connection2 = null, $orgtables = array(), $limit = 0) {
 	global $jush;
 	$links = array(); // colno => orgtable - create links from these columns
 	$indexes = array(); // orgtable => array(column => colno) - primary keys
@@ -14,7 +15,7 @@ function select($result, $connection2 = null, $orgtables = array()) {
 	$types = array(); // colno => type - display char in <code>
 	$return = array(); // table => orgtable - mapping to use in EXPLAIN
 	odd(''); // reset odd for each result
-	for ($i=0; $row = $result->fetch_row(); $i++) {
+	for ($i=0; (!$limit || $i < $limit) && ($row = $result->fetch_row()); $i++) {
 		if (!$i) {
 			echo "<table cellspacing='0' class='nowrap'>\n";
 			echo "<thead><tr>";
@@ -111,9 +112,9 @@ function referencable_primary($self) {
 
 /** Print SQL <textarea> tag
 * @param string
+* @param string or array in which case [0] of every element is used
 * @param int
 * @param int
-* @param string
 * @return null
 */
 function textarea($name, $value, $rows = 10, $cols = 80) {
@@ -121,7 +122,7 @@ function textarea($name, $value, $rows = 10, $cols = 80) {
 	echo "<textarea name='$name' rows='$rows' cols='$cols' class='sqlarea jush-$jush' spellcheck='false' wrap='off'>";
 	if (is_array($value)) {
 		foreach ($value as $val) { // not implode() to save memory
-			echo h($val[0]) . "\n\n\n"; // $val == array($query, $time)
+			echo h($val[0]) . "\n\n\n"; // $val == array($query, $time, $elapsed)
 		}
 	} else {
 		echo h($value);
@@ -152,7 +153,7 @@ echo optionlist($structured_types, $type);
 <td><input name="<?php echo $key; ?>[length]" value="<?php echo h($field["length"]); ?>" size="3" onfocus="editingLengthFocus(this);"<?php echo (!$field["length"] && preg_match('~var(char|binary)$~', $type) ? " class='required'" : ""); ?> onchange="editingLengthChange(this);" onkeyup="this.onchange();"><td class="options"><?php //! type="number" with enabled JavaScript
 	echo "<select name='$key" . "[collation]'" . (preg_match('~(char|text|enum|set)$~', $type) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
 	echo ($unsigned ? "<select name='$key" . "[unsigned]'" . (!$type || preg_match('~((^|[^o])int|float|double|decimal)$~', $type) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</select>' : '');
-	echo (isset($field['on_update']) ? "<select name='$key" . "[on_update]'" . ($type == "timestamp" ? "" : " class='hidden'") . '>' . optionlist(array("" => "(" . lang('ON UPDATE') . ")", "CURRENT_TIMESTAMP"), $field["on_update"]) . '</select>' : '');
+	echo (isset($field['on_update']) ? "<select name='$key" . "[on_update]'" . (preg_match('~timestamp|datetime~', $type) ? "" : " class='hidden'") . '>' . optionlist(array("" => "(" . lang('ON UPDATE') . ")", "CURRENT_TIMESTAMP"), $field["on_update"]) . '</select>' : '');
 	echo ($foreign_keys ? "<select name='$key" . "[on_delete]'" . (preg_match("~`~", $type) ? "" : " class='hidden'") . "><option value=''>(" . lang('ON DELETE') . ")" . optionlist(explode("|", $on_actions), $field["on_delete"]) . "</select> " : " "); // space for IE
 }
 
@@ -196,10 +197,11 @@ function process_field($field, $type_field) {
 		($field["null"] ? " NULL" : " NOT NULL"), // NULL for timestamp
 		(isset($default) ? " DEFAULT " . (
 			(preg_match('~time~', $field["type"]) && preg_match('~^CURRENT_TIMESTAMP$~i', $default))
+			|| ($jush == "sqlite" && preg_match('~^CURRENT_(TIME|TIMESTAMP|DATE)$~i', $default))
 			|| ($field["type"] == "bit" && preg_match("~^([0-9]+|b'[0-1]+')\$~", $default))
 			|| ($jush == "pgsql" && preg_match("~^[a-z]+\\(('[^']*')+\\)\$~", $default))
 			? $default : q($default)) : ""),
-		($field["type"] == "timestamp" && $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),
 	);
@@ -247,7 +249,7 @@ function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = arra
 	'pgsql' => "datatype.html#DATATYPE-SERIAL",
 	'mssql' => "ms186775.aspx",
 )); ?>
-<td><?php echo lang('Default values'); ?>
+<td><?php echo lang('Default value'); ?>
 <?php echo (support("comment") ? "<td" . ($comments ? "" : " class='hidden'") . ">" . lang('Comment') : ""); ?>
 <?php } ?>
 <td><?php echo "<input type='image' class='icon' name='add[" . (support("move_col") ? 0 : count($fields)) . "]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>"; ?><script type="text/javascript">row_count = <?php echo count($fields); ?>;</script>
@@ -394,7 +396,7 @@ function drop_create($drop, $create, $drop_created, $test, $drop_test, $location
 */
 function create_trigger($on, $row) {
 	global $jush;
-	$timing_event = " $row[Timing] $row[Event]";
+	$timing_event = " $row[Timing] $row[Event]" . ($row["Event"] == "UPDATE OF" ? " " . idf_escape($row["Of"]) : "");
 	return "CREATE TRIGGER "
 		. idf_escape($row["Trigger"])
 		. ($jush == "mssql" ? $on . $timing_event : $timing_event . $on)
@@ -496,3 +498,28 @@ function doc_link($paths) {
 	);
 	return ($paths[$jush] ? "<a href='$urls[$jush]$paths[$jush]' target='_blank' rel='noreferrer'><sup>?</sup></a>" : "");
 }
+
+/** Wrap gzencode() for usage in ob_start()
+* @param string
+* @return string
+*/
+function ob_gzencode($string) {
+	// ob_start() callback recieves an optional parameter $phase but gzencode() accepts optional parameter $level
+	return gzencode($string);
+}
+
+/** Compute size of database
+* @param string
+* @return string formatted
+*/
+function db_size($db) {
+	global $connection;
+	if (!$connection->select_db($db)) {
+		return "?";
+	}
+	$return = 0;
+	foreach (table_status() as $table_status) {
+		$return += $table_status["Data_length"] + $table_status["Index_length"];
+	}
+	return format_number($return);
+}

adminer/include/functions.inc.php

@@ -33,6 +33,14 @@ function escape_string($val) {
 	return substr(q($val), 1, -1);
 }
 
+/** Remove non-digits from a string
+* @param string
+* @return string
+*/
+function number($val) {
+  return preg_replace('~[^0-9]+~', '', $val);
+}
+
 /** Disable magic_quotes_gpc
 * @param array e.g. (&$_GET, &$_POST, &$_COOKIE)
 * @param bool whether to leave values as is
@@ -65,12 +73,20 @@ function bracket_escape($idf, $back = false) {
 	return strtr($idf, ($back ? array_flip($trans) : $trans));
 }
 
+/** Get connection charset
+* @param Min_DB
+* @return string
+*/
+function charset($connection) {
+	return (version_compare($connection->server_info, "5.5.3") >= 0 ? "utf8mb4" : "utf8"); // SHOW CHARSET would require an extra query
+}
+
 /** Escape for HTML
 * @param string
 * @return string
 */
 function h($string) {
-	return htmlspecialchars(str_replace("\0", "", $string), ENT_QUOTES);
+	return str_replace("\0", "�", htmlspecialchars($string, ENT_QUOTES, 'utf-8'));
 }
 
 /** Escape for TD
@@ -249,13 +265,41 @@ function sid() {
 	return $return;
 }
 
-/** Shortcut for $driver->quote($string)
+/** Set password to session
+* @param string
+* @param string
+* @param string
+* @param string
+* @return null
+*/
+function set_password($vendor, $server, $username, $password) {
+	$_SESSION["pwds"][$vendor][$server][$username] = ($_COOKIE["adminer_key"] && is_string($password)
+		? array(encrypt_string($password, $_COOKIE["adminer_key"]))
+		: $password
+	);
+}
+
+/** Get password from session
+* @return string
+*/
+function get_password() {
+	$return = get_session("pwds");
+	if (is_array($return)) {
+		$return = ($_COOKIE["adminer_key"]
+			? decrypt_string($return[0], $_COOKIE["adminer_key"])
+			: false
+		);
+	}
+	return $return;
+}
+
+/** Shortcut for $connection->quote($string)
 * @param string
 * @return string
 */
 function q($string) {
-	global $driver;
-	return $driver->quote($string);
+	global $connection;
+	return $connection->quote($string);
 }
 
 /** Get list of values from database
@@ -339,30 +383,40 @@ function unique_array($row, $indexes) {
 	}
 }
 
+/** Escape column key used in where()
+* @param string
+* @return string
+*/
+function escape_key($key) {
+	if (preg_match('(^([\w(]+)(' . str_replace("_", ".*", preg_quote(idf_escape("_"))) . ')([ \w)]+)$)', $key, $match)) { //! columns looking like functions
+		return $match[1] . idf_escape(idf_unescape($match[2])) . $match[3]; //! SQL injection
+	}
+	return idf_escape($key);
+}
+
 /** Create SQL condition from parsed query string
 * @param array parsed query string
 * @param array
 * @return string
 */
 function where($where, $fields = array()) {
-	global $jush;
+	global $connection, $jush;
 	$return = array();
-	$function_pattern = '(^[\w\(]+(' . str_replace("_", ".*", preg_quote(idf_escape("_"))) . ')?\)+$)'; //! columns looking like functions
 	foreach ((array) $where["where"] as $key => $val) {
 		$key = bracket_escape($key, 1); // 1 - back
-		$column = (preg_match($function_pattern, $key) ? $key : idf_escape($key)); //! SQL injection
+		$column = escape_key($key);
 		$return[] = $column
 			. (($jush == "sql" && preg_match('~^[0-9]*\\.[0-9]*$~', $val)) || $jush == "mssql"
 				? " LIKE " . q(addcslashes($val, "%_\\"))
 				: " = " . unconvert_field($fields[$key], q($val))
 			) // LIKE because of floats but slow with ints, in MS SQL because of text
 		; //! enum and set
-		if ($jush == "sql" && preg_match("~[^ -@]~", $val)) { // not just [a-z] to catch non-ASCII characters
-			$return[] = "$column = " . q($val) . " COLLATE utf8_bin";
+		if ($jush == "sql" && preg_match('~char|text~', $fields[$key]["type"]) && preg_match("~[^ -@]~", $val)) { // not just [a-z] to catch non-ASCII characters
+			$return[] = "$column = " . q($val) . " COLLATE " . charset($connection) . "_bin";
 		}
 	}
 	foreach ((array) $where["null"] as $key) {
-		$return[] = (preg_match($function_pattern, $key) ? $key : idf_escape($key)) . " IS NULL";
+		$return[] = escape_key($key) . " IS NULL";
 	}
 	return implode(" AND ", $return);
 }
@@ -518,19 +572,19 @@ function redirect($location, $message = null) {
 * @param bool
 * @param bool
 * @param bool
+* @param string
 * @return bool
 */
-function query_redirect($query, $location, $message, $redirect = true, $execute = true, $failed = false) {
+function query_redirect($query, $location, $message, $redirect = true, $execute = true, $failed = false, $time = "") {
 	global $connection, $error, $adminer;
-	$time = "";
 	if ($execute) {
 		$start = microtime(true);
 		$failed = !$connection->query($query);
-		$time = "; -- " . format_time($start, microtime(true));
+		$time = format_time($start);
 	}
 	$sql = "";
 	if ($query) {
-		$sql = $adminer->messageQuery($query . $time);
+		$sql = $adminer->messageQuery($query, $time);
 	}
 	if ($failed) {
 		$error = error() . $sql;
@@ -543,21 +597,22 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
 }
 
 /** Execute and remember query
-* @param string null to return remembered queries, end with ';' to use DELIMITER
-* @return Min_Result
+* @param string or null to return remembered queries, end with ';' to use DELIMITER
+* @return Min_Result or array($queries, $time) if $query = null
 */
-function queries($query = null) {
+function queries($query) {
 	global $connection;
 	static $queries = array();
-	if ($query === null) {
-		// return executed queries without parameter
-		return implode("\n", $queries);
+	static $start;
+	if (!$start) {
+		$start = microtime(true);
 	}
-	$start = microtime(true);
-	$return = $connection->query($query);
-	$queries[] = (preg_match('~;$~', $query) ? "DELIMITER ;;\n$query;\nDELIMITER " : $query)
-		. "; -- " . format_time($start, microtime(true));
-	return $return;
+	if ($query === null) {
+		// return executed queries
+		return array(implode("\n", $queries), format_time($start));
+	}
+	$queries[] = (preg_match('~;$~', $query) ? "DELIMITER ;;\n$query;\nDELIMITER " : $query) . ";";
+	return $connection->query($query);
 }
 
 /** Apply command to all array items
@@ -582,16 +637,16 @@ function apply_queries($query, $tables, $escape = 'table') {
 * @return bool
 */
 function queries_redirect($location, $message, $redirect) {
-	return query_redirect(queries(), $location, $message, $redirect, false, !$redirect);
+	list($queries, $time) = queries(null);
+	return query_redirect($queries, $location, $message, $redirect, false, !$redirect, $time);
 }
 
-/** Format time difference
-* @param string output of microtime(true)
-* @param string output of microtime(true)
+/** Format elapsed time
+* @param float output of microtime(true)
 * @return string HTML code
 */
-function format_time($start, $end) {
-	return lang('%.3f s', max(0, $end - $start));
+function format_time($start) {
+	return lang('%.3f s', max(0, microtime(true) - $start));
 }
 
 /** Remove parameter from query string
@@ -695,6 +750,14 @@ function shorten_utf8($string, $length = 80, $suffix = "") {
 	return h($match[1]) . $suffix . (isset($match[2]) ? "" : "<i>...</i>");
 }
 
+/** Format decimal number
+* @param int
+* @return string
+*/
+function format_number($val) {
+  return strtr(number_format($val, 0, ".", lang(',')), preg_split('~~u', lang('0123456789'), -1, PREG_SPLIT_NO_EMPTY));
+}
+
 /** Generate friendly URL
 * @param string
 * @return string
@@ -711,12 +774,14 @@ function friendly_url($val) {
 */
 function hidden_fields($process, $ignore = array()) {
 	while (list($key, $val) = each($process)) {
-		if (is_array($val)) {
-			foreach ($val as $k => $v) {
-				$process[$key . "[$k]"] = $v;
+		if (!in_array($key, $ignore)) {
+			if (is_array($val)) {
+				foreach ($val as $k => $v) {
+					$process[$key . "[$k]"] = $v;
+				}
+			} else {
+				echo '<input type="hidden" name="' . h($key) . '" value="' . h($val) . '">';
 			}
-		} elseif (!in_array($key, $ignore)) {
-			echo '<input type="hidden" name="' . h($key) . '" value="' . h($val) . '">';
 		}
 	}
 }
@@ -880,7 +945,7 @@ function process_input($field) {
 		return ($field["on_update"] == "CURRENT_TIMESTAMP" ? idf_escape($field["field"]) : false);
 	}
 	if ($function == "NULL") {
-		$value = null;
+		return "NULL";
 	}
 	if ($field["type"] == "set") {
 		return array_sum((array) $value);
@@ -996,31 +1061,39 @@ function apply_sql_function($function, $column) {
 	return ($function ? ($function == "unixepoch" ? "DATETIME($column, '$function')" : ($function == "count distinct" ? "COUNT(DISTINCT " : strtoupper("$function(")) . "$column)") : $column);
 }
 
-/** Read password from file adminer.key in temporary directory or create one
-* @param bool
-* @return string or false if the file can not be created
+/** Get path of the temporary directory
+* @return string
 */
-function password_file($create) {
-	$dir = ini_get("upload_tmp_dir"); // session_save_path() may contain other storage path
-	if (!$dir) {
+function get_temp_dir() {
+	$return = ini_get("upload_tmp_dir"); // session_save_path() may contain other storage path
+	if (!$return) {
 		if (function_exists('sys_get_temp_dir')) {
-			$dir = sys_get_temp_dir();
+			$return = sys_get_temp_dir();
 		} else {
 			$filename = @tempnam("", ""); // @ - temp directory can be disabled by open_basedir
 			if (!$filename) {
 				return false;
 			}
-			$dir = dirname($filename);
+			$return = dirname($filename);
 			unlink($filename);
 		}
 	}
-	$filename = "$dir/adminer.key";
-	$return = @file_get_contents($filename); // @ - can not exist
+	return $return;
+}
+
+/** Read password from file adminer.key in temporary directory or create one
+* @param bool
+* @return string or false if the file can not be created
+*/
+function password_file($create) {
+	$filename = get_temp_dir() . "/adminer.key";
+	$return = @file_get_contents($filename); // @ - may not exist
 	if ($return || !$create) {
 		return $return;
 	}
 	$fp = @fopen($filename, "w"); // @ - can have insufficient rights //! is not atomic
 	if ($fp) {
+		chmod($filename, 0660);
 		$return = rand_string();
 		fwrite($fp, $return);
 		fclose($fp);
@@ -1062,9 +1135,9 @@ function select_value($val, $link, $field, $text_length) {
 			$link = "mailto:$val";
 		}
 		if ($protocol = is_url($val)) {
-			$link = ($protocol == "http" && $HTTPS
+			$link = (($protocol == "http" && $HTTPS) || preg_match('~WebKit~i', $_SERVER["HTTP_USER_AGENT"]) // WebKit supports noreferrer since 2009
 				? $val // HTTP links from HTTPS pages don't receive Referer automatically
-				: "$protocol://www.adminer.org/redirect/?url=" . urlencode($val) // intermediate page to hide Referer, may be changed to rel="noreferrer" in HTML5
+				: "$protocol://www.adminer.org/redirect/?url=" . urlencode($val) // intermediate page to hide Referer
 			);
 		}
 	}
@@ -1072,7 +1145,9 @@ function select_value($val, $link, $field, $text_length) {
 	if ($return !== null) {
 		if ($return === "") { // === - may be int
 			$return = "&nbsp;";
-		} elseif ($text_length != "" && is_shortable($field) && is_utf8($return)) {
+		} elseif (!is_utf8($return)) {
+			$return = "\0"; // htmlspecialchars of binary data returns an empty string
+		} elseif ($text_length != "" && is_shortable($field)) {
 			$return = shorten_utf8($return, max(0, +$text_length)); // usage of LEFT() would reduce traffic but complicate query - expected average speedup: .001 s VS .01 s on local network
 		} else {
 			$return = h($return);
@@ -1219,3 +1294,100 @@ function lzw_decompress($binary) {
 function on_help($command, $side = 0) {
 	return " onmouseover='helpMouseover(this, event, " . h($command) . ", $side);' onmouseout='helpMouseout(this, event);'";
 }
+
+/** Print edit data form
+* @param string
+* @param array
+* @param mixed
+* @param bool
+* @return null
+*/
+function edit_form($TABLE, $fields, $row, $update) {
+	global $adminer, $jush, $token, $error;
+	$table_name = $adminer->tableName(table_status1($TABLE, true));
+	page_header(
+		($update ? lang('Edit') : lang('Insert')),
+		$error,
+		array("select" => array($TABLE, $table_name)),
+		$table_name
+	);
+	if ($row === false) {
+		echo "<p class='error'>" . lang('No rows.') . "\n";
+	}
+	?>
+<form action="" method="post" enctype="multipart/form-data" id="form">
+<?php
+	if (!$fields) {
+		echo "<p class='error'>" . lang('You have no privileges to update this table.') . "\n";
+	} else {
+		echo "<table cellspacing='0' onkeydown='return editingKeydown(event);'>\n";
+
+		foreach ($fields as $name => $field) {
+			echo "<tr><th>" . $adminer->fieldName($field);
+			$default = $_GET["set"][bracket_escape($name)];
+			if ($default === null) {
+				$default = $field["default"];
+				if ($field["type"] == "bit" && preg_match("~^b'([01]*)'\$~", $default, $regs)) {
+					$default = $regs[1];
+				}
+			}
+			$value = ($row !== null
+				? ($row[$name] != "" && $jush == "sql" && preg_match("~enum|set~", $field["type"])
+					? (is_array($row[$name]) ? array_sum($row[$name]) : +$row[$name])
+					: $row[$name]
+				)
+				: (!$update && $field["auto_increment"]
+					? ""
+					: (isset($_GET["select"]) ? false : $default)
+				)
+			);
+			if (!$_POST["save"] && is_string($value)) {
+				$value = $adminer->editVal($value, $field);
+			}
+			$function = ($_POST["save"]
+				? (string) $_POST["function"][$name]
+				: ($update && $field["on_update"] == "CURRENT_TIMESTAMP"
+					? "now"
+					: ($value === false ? null : ($value !== null ? '' : 'NULL'))
+				)
+			);
+			if (preg_match("~time~", $field["type"]) && $value == "CURRENT_TIMESTAMP") {
+				$value = "";
+				$function = "now";
+			}
+			input($field, $value, $function);
+			echo "\n";
+		}
+		if (!support("table")) {
+			echo "<tr>"
+				. "<th><input name='field_keys[]' onkeyup='keyupChange.call(this);' onchange='fieldChange(this);' value=''>" // needs empty value for keyupChange()
+				. "<td class='function'>" . html_select("field_funs[]", $adminer->editFunctions(array("null" => isset($_GET["select"]))))
+				. "<td><input name='field_vals[]'>"
+				. "\n"
+			;
+		}
+		echo "</table>\n";
+	}
+	echo "<p>\n";
+	if ($fields) {
+		echo "<input type='submit' value='" . lang('Save') . "'>\n";
+		if (!isset($_GET["select"])) {
+			echo "<input type='submit' name='insert' value='" . ($update
+				? lang('Save and continue edit') . "' onclick='return !ajaxForm(this.form, \"" . lang('Saving') . '...", this)'
+				: lang('Save and insert next')
+			) . "' title='Ctrl+Shift+Enter'>\n";
+		}
+	}
+	echo ($update ? "<input type='submit' name='delete' value='" . lang('Delete') . "'" . confirm() . ">\n"
+		: ($_POST || !$fields ? "" : "<script type='text/javascript'>focus(document.getElementById('form').getElementsByTagName('td')[1].firstChild);</script>\n")
+	);
+	if (isset($_GET["select"])) {
+		hidden_fields(array("check" => (array) $_POST["check"], "clone" => $_POST["clone"], "all" => $_POST["all"]));
+	}
+	?>
+<input type="hidden" name="referer" value="<?php echo h(isset($_POST["referer"]) ? $_POST["referer"] : $_SERVER["HTTP_REFERER"]); ?>">
+<input type="hidden" name="save" value="1">
+<input type="hidden" name="token" value="<?php echo $token; ?>">
+</form>
+<?php
+}

adminer/include/lang.inc.php

@@ -7,10 +7,11 @@ $langs = array(
 	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com
 	'ca' => 'Català', // Joan Llosas
 	'cs' => 'Čeština', // Jakub Vrána - http://www.vrana.cz
+	'da' => 'Dansk', // Jarne W. Beutnagel - jarne@beutnagel.dk
 	'de' => 'Deutsch', // Klemens Häckel - http://clickdimension.wordpress.com
 	'es' => 'Español', // Klemens Häckel - http://clickdimension.wordpress.com
 	'et' => 'Eesti', // Priit Kallas
-	'fa' => 'فارسی', // mojtaba barghbani - Iran - mbarghbani@gmail.com
+	'fa' => 'فارسی', // mojtaba barghbani - Iran - mbarghbani@gmail.com, Nima Amini - http://nimlog.com
 	'fr' => 'Français', // Francis Gagné, Aurélien Royer
 	'hu' => 'Magyar', // Borsos Szilárd (Borsosfi) - http://www.borsosfi.hu, info@borsosfi.hu
 	'id' => 'Bahasa Indonesia', // Ivan Lanin - http://ivan.lanin.org
@@ -19,9 +20,10 @@ $langs = array(
 	'ko' => '한국어', // dalli - skcha67@gmail.com
 	'lt' => 'Lietuvių', // Paulius Leščinskas - http://www.lescinskas.lt
 	'nl' => 'Nederlands', // Maarten Balliauw - http://blog.maartenballiauw.be
+	'no' => 'Norsk', // Iver Odin Kvello, mupublishing.com
 	'pl' => 'Polski', // Radosław Kowalewski - http://srsbiz.pl/
 	'pt' => 'Português', // André Dias
-	'pt-br' => 'Português (Brazil)', // Gian Live - gian@live.com, Davi Alexandre davi@davialexandre.com.br
+	'pt-br' => 'Português (Brazil)', // Gian Live - gian@live.com, Davi Alexandre davi@davialexandre.com.br, RobertoPC - http://www.robertopc.com.br
 	'ro' => 'Limba Română', // .nick .messing - dot.nick.dot.messing@gmail.com
 	'ru' => 'Русский язык', // Maksim Izmaylov
 	'sk' => 'Slovenčina', // Ivan Suchy - http://www.ivansuchy.com, Juraj Krivda - http://www.jstudio.cz
@@ -31,9 +33,9 @@ $langs = array(
 	'th' => 'ภาษาไทย', // Panya  Saraphi, elect.tu@gmail.com - http://www.opencart2u.com/
 	'tr' => 'Türkçe', // Bilgehan Korkmaz - turktron.com
 	'uk' => 'Українська', // Valerii Kryzhov
+	'vi' => 'Tiếng Việt', // Giang Manh @ manhgd google mail
 	'zh' => '简体中文', // Mr. Lodar, vea - urn2.net - vea.urn2@gmail.com
 	'zh-tw' => '繁體中文', // http://tzangms.com
-	'no' => 'Norsk', // Iver Odin Kvello, mupublishing.com
 );
 
 /** Get current language
@@ -68,7 +70,7 @@ function lang($idf, $number = null) {
 	array_shift($args);
 	$format = str_replace("%d", "%s", $translation);
 	if ($format != $translation) {
-		$args[0] = number_format($number, 0, ".", lang(','));
+		$args[0] = format_number($number);
 	}
 	return vsprintf($format, $args);
 }

adminer/include/pdo.inc.php

@@ -16,8 +16,7 @@ if (extension_loaded('pdo')) {
 			try {
 				parent::__construct($dsn, $username, $password);
 			} catch (Exception $ex) {
-				auth_error($ex);
-				exit;
+				auth_error($ex->getMessage());
 			}
 			$this->setAttribute(13, array('Min_PDOStatement')); // 13 - PDO::ATTR_STATEMENT_CLASS
 			$this->server_info = $this->getAttribute(4); // 4 - PDO::ATTR_SERVER_VERSION

adminer/include/version.inc.php

@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.0.3";
+$VERSION = "4.2.0";

adminer/index.php

@@ -10,7 +10,7 @@
 include "./include/bootstrap.inc.php";
 include "./include/tmpfile.inc.php";
 
-$enum_length = "'(?:''|[^'\\\\]|\\\\.)*+'";
+$enum_length = "'(?:''|[^'\\\\]|\\\\.)*'";
 $inout = "IN|OUT|INOUT";
 
 if (isset($_GET["select"]) && ($_POST["edit"] || $_POST["clone"]) && !$_POST["save"]) {

adminer/lang/ar.inc.php

@@ -30,7 +30,6 @@ $translations = array(
 	'Alter database' => 'تعديل قاعدة البيانات',
 	'Create database' => 'إنشاء قاعدة بيانات',
 	'SQL command' => 'إستعلام SQL',
-	'Dump' => 'تصدير',
 	'Logout' => 'تسجيل الخروج',
 	'database' => 'قاعدة بيانات',
 	'Use' => 'المستعمل',
@@ -177,6 +176,7 @@ $translations = array(
 	'Data Free' => 'المساحة الحرة',
 	'Rows' => 'الأسطر',
 	',' => ',',
+	'0123456789' => '٠١٢٣٤٥٦٧٨٩',
 	'Analyze' => 'تحليل',
 	'Optimize' => 'تحسين',
 	'Check' => 'فحص',
@@ -224,7 +224,6 @@ $translations = array(
 	'Databases have been dropped.' => 'تم حذف قواعد البيانات.',
 	'Database has been dropped.' => 'تم حذف قاعدة البيانات.',
 	'Search data in tables' => 'بحث في الجداول',
-	'schema' => 'المخطط',
 	'Schema' => 'المخطط',
 	'Alter schema' => 'تعديل المخطط',
 	'Create schema' => 'إنشاء مخطط',

adminer/lang/bn.inc.php

@@ -31,7 +31,6 @@ $translations = array(
 	'Alter database' => 'ডাটাবেজ সম্পাদনা',
 	'Create database' => 'ডাটাবেজ তৈরী',
 	'SQL command' => 'SQL-কোয়্যারী',
-	'Dump' => 'এক্সপোর্ট',
 	'Logout' => 'লগআউট',
 	'database' => 'ডাটাবেজ',
 	'Use' => 'ব্যবহার',
@@ -179,6 +178,7 @@ $translations = array(
 	'Tables have been truncated.' => 'টেবিল ছাঁটাই করা হয়েছে',
 	'Rows' => 'সারি',
 	',' => ',',
+	'0123456789' => '০১২৩৪৫৬৭৮৯',
 	'Tables have been moved.' => 'টেবিল স্থানান্তর করা হয়েছে।',
 	'Move to other database' => 'অন্য ডাটাবেজে স্থানান্তর করো',
 	'Move' => 'স্থানান্তর করো',
@@ -225,7 +225,6 @@ $translations = array(
 	'Permanent login' => 'স্থায়ী লগইন',
 	'Databases have been dropped.' => 'ডাটাবেজসমূহ মুছে ফেলা হয়েছে।',
 	'Search data in tables' => 'টেবিলে খোঁজ করো',
-	'schema' => 'স্কিমা',
 	'Schema' => 'স্কিমা',
 	'Alter schema' => 'স্কিমা পরিবর্তন করো',
 	'Create schema' => 'স্কিমা তৈরী করো',

adminer/lang/ca.inc.php

@@ -31,7 +31,6 @@ $translations = array(
 	'Alter database' => 'Modifica la base de dades',
 	'Create database' => 'Crea una base de dades',
 	'SQL command' => 'Ordre SQL',
-	'Dump' => 'Exporta',
 	'Logout' => 'Desconnecta',
 	'database' => 'base de dades',
 	'Use' => 'Utilitza',
@@ -179,6 +178,7 @@ $translations = array(
 	'Tables have been truncated.' => 'S\'han escapçat les taules.',
 	'Rows' => 'Files',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'S\'han desplaçat les taules.',
 	'Move to other database' => 'Desplaça a una altra base de dades',
 	'Move' => 'Desplaça',
@@ -239,7 +239,6 @@ $translations = array(
 	'Schema has been dropped.' => 'S\'ha suprimit l\'esquema.',
 	'Schema has been created.' => 'S\'ha creat l\'esquema.',
 	'Schema has been altered.' => 'S\'ha modificat l\'esquema.',
-	'schema' => 'esquema',
 	'Schema' => 'Esquema',
 	'Sequences' => 'Seqüències',
 	'Create sequence' => 'Crea una seqüència',

adminer/lang/cs.inc.php

@@ -11,9 +11,11 @@ $translations = array(
 	'Logged as: %s' => 'Přihlášen jako: %s',
 	'Logout successful.' => 'Odhlášení proběhlo v pořádku.',
 	'Invalid credentials.' => 'Neplatné přihlašovací údaje.',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Příliš mnoho pokusů o přihlášení, zkuste to znovu za %d minutu.', 'Příliš mnoho pokusů o přihlášení, zkuste to znovu za %d minuty.', 'Příliš mnoho pokusů o přihlášení, zkuste to znovu za %d minut.'),
 	'Master password expired. <a href="http://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Platnost hlavního hesla vypršela. <a href="http://www.adminer.org/cs/extension/" target="_blank">Implementujte</a> metodu %s, aby platilo stále.',
 	'Language' => 'Jazyk',
 	'Invalid CSRF token. Send the form again.' => 'Neplatný token CSRF. Odešlete formulář znovu.',
+	'If you did not send this request from Adminer then close this page.' => 'Pokud jste tento požadavek neposlali z Adminera, tak tuto stránku zavřete.',
 	'No extension' => 'Žádné rozšíření',
 	'None of the supported PHP extensions (%s) are available.' => 'Není dostupné žádné z podporovaných PHP rozšíření (%s).',
 	'Session support must be enabled.' => 'Session proměnné musí být povolené.',
@@ -66,9 +68,9 @@ $translations = array(
 	'Maximum allowed file size is %sB.' => 'Maximální povolená velikost souboru je %sB.',
 	'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',
-	'Dump' => 'Export',
 	'Output' => 'Výstup',
 	'open' => 'otevřít',
 	'save' => 'uložit',
@@ -95,6 +97,7 @@ $translations = array(
 	
 	// thousands separator - must contain single byte
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Engine' => 'Úložiště',
 	'Collation' => 'Porovnávání',
 	'Data Length' => 'Velikost dat',
@@ -162,9 +165,12 @@ $translations = array(
 	'Auto Increment' => 'Auto Increment',
 	'Options' => 'Volby',
 	'Comment' => 'Komentář',
+	'Default value' => 'Výchozí hodnota',
 	'Default values' => 'Výchozí hodnoty',
 	'Drop' => 'Odstranit',
 	'Are you sure?' => 'Opravdu?',
+	'Size' => 'Velikost',
+	'Compute' => 'Spočítat',
 	'Move up' => 'Přesunout nahoru',
 	'Move down' => 'Přesunout dolů',
 	'Remove' => 'Odebrat',
@@ -176,11 +182,13 @@ $translations = array(
 	'Values' => 'Hodnoty',
 	
 	'View' => 'Pohled',
+	'Materialized View' => 'Materializovaný pohled',
 	'View has been dropped.' => 'Pohled byl odstraněn.',
 	'View has been altered.' => 'Pohled byl změněn.',
 	'View has been created.' => 'Pohled byl vytvořen.',
 	'Alter view' => 'Pozměnit pohled',
 	'Create view' => 'Vytvořit pohled',
+	'Create materialized view' => 'Vytvořit materializovaný pohled',
 	
 	'Indexes' => 'Indexy',
 	'Indexes have been altered.' => 'Indexy byly změněny.',
@@ -227,11 +235,13 @@ $translations = array(
 	'Sort' => 'Seřadit',
 	'descending' => 'sestupně',
 	'Limit' => 'Limit',
+	'Limit rows' => 'Limit řádek',
 	'Text length' => 'Délka textů',
 	'Action' => 'Akce',
 	'Full table scan' => 'Průchod celé tabulky',
 	'Unable to select the table' => 'Nepodařilo se vypsat tabulku',
 	'No rows.' => 'Žádné řádky.',
+	'%d / ' => '%d / ',
 	'%d row(s)' => array('%d řádek', '%d řádky', '%d řádků'),
 	'Page' => 'Stránka',
 	'last' => 'poslední',
@@ -308,7 +318,6 @@ $translations = array(
 	'Schema has been dropped.' => 'Schéma bylo odstraněno.',
 	'Schema has been created.' => 'Schéma bylo vytvořeno.',
 	'Schema has been altered.' => 'Schéma bylo změněno.',
-	'schema' => 'schéma',
 	'Schema' => 'Schéma',
 	'Invalid schema.' => 'Nesprávné schéma.',
 	

adminer/lang/da.inc.php

@@ -0,0 +1,283 @@
+<?php
+$translations = array(
+	'System' => 'System',
+	'Server' => 'Server',
+	'Username' => 'Brugernavn',
+	'Password' => 'Kodeord',
+	'Permanent login' => 'Permanent login',
+	'Login' => 'Log ind',
+	'Logout' => 'Log ud',
+	'Logged as: %s' => 'Logget ind som: %s',
+	'Logout successful.' => 'Log af vellykket.',
+	'Invalid credentials.' => 'Ugyldige log ind oplysninger.',
+	'Master password expired. <a href="http://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Master-kodeordet er udløbet. <a href="http://www.adminer.org/en/extension/" target="_blank">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.',
+	'No extension' => 'Ingen udvidelse',
+	'None of the supported PHP extensions (%s) are available.' => 'Ingen af de understøttede PHP-udvidelser (%s) er tilgængelige.',
+	'Session support must be enabled.' => 'Session support skal være slået til.',
+	'Session expired, please login again.' => 'Sessionen er udløbet - Log venligst ind igen.',
+	'%s version: %s through PHP extension %s' => '%s version: %s via PHP-udvidelse %s',
+	'Refresh' => 'Genindlæs',
+	'ltr' => 'ltr',
+	'Privileges' => 'Privilegier',
+	'Create user' => 'Opret bruger',
+	'User has been dropped.' => 'Brugeren slettet.',
+	'User has been altered.' => 'Brugeren ændret.',
+	'User has been created.' => 'Brugeren oprettet.',
+	'Hashed' => 'Hashet',
+	'Column' => 'Kolonne',
+	'Routine' => 'Rutine',
+	'Grant' => 'Giv privilegier',
+	'Revoke' => 'Træk tilbage',
+	'Process list' => 'Procesliste',
+	'%d process(es) have been killed.' => array('%d proces afsluttet.', '%d processer afsluttet.'),
+	'Kill' => 'Afslut',
+	'Variables' => 'Variabler',
+	'Status' => 'Status',
+	'SQL command' => 'SQL-kommando',
+	'%d query(s) executed OK.' => array('%d kald udført OK.', '%d kald udført OK.'),
+	'Query executed OK, %d row(s) affected.' => array('Kald udført OK, %d række påvirket.', 'Kald udført OK, %d rækker påvirket.'),
+	'No commands to execute.' => 'Ingen kommandoer at udføre.',
+	'Error in query' => 'Fejl i forespørgelse',
+	'Execute' => 'Kør',
+	'Stop on error' => 'Stop ved fejl',
+	'Show only errors' => 'Vis kun fejl',
+	'%.3f s' => '%.3f s',
+	'History' => 'Historik',
+	'Clear' => 'Tøm',
+	'Edit all' => 'Rediger alle',
+	'File upload' => 'Fil upload',
+	'From server' => 'Fra server',
+	'Webserver file %s' => 'Webserver-fil %s',
+	'Run file' => 'Kør fil',
+	'File does not exist.' => 'Filen eksisterer ikke.',
+	'File uploads are disabled.' => 'Fil upload er slået fra.',
+	'Unable to upload a file.' => 'Kunne ikke uploade fil.',
+	'Maximum allowed file size is %sB.' => 'Maksimum tilladte filstørrelse er %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Maks POST data er overskredet. Reducer mængden af data eller øg størrelsen i %s-konfigurationen.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Du kan uploade en stor SQL-fil via FTP og importere den fra serveren.',
+	'Export' => 'Eksport',
+	'Output' => 'Resultat',
+	'open' => 'Åben',
+	'save' => 'Gem',
+	'Format' => 'Format',
+	'Data' => 'Data',
+	'Database' => 'Database',
+	'database' => 'database',
+	'Use' => 'Brug',
+	'Select database' => 'Vælg database',
+	'Invalid database.' => 'Ugyldig database.',
+	'Create new database' => 'Opret ny database',
+	'Database has been dropped.' => 'Databasen er blevet slettet.',
+	'Databases have been dropped.' => 'Databasene er blevet slettet.',
+	'Database has been created.' => 'Databasen er oprettet.',
+	'Database has been renamed.' => 'Databasen har fået nyt navn.',
+	'Database has been altered.' => 'Databasen er ændret.',
+	'Alter database' => 'Ændre database',
+	'Create database' => 'Opret database',
+	'Database schema' => 'Databaseskema',
+	'Permanent link' => 'Permanent link',
+	',' => ' ',
+	'0123456789' => '0123456789',
+	'Engine' => 'Motor',
+	'Collation' => 'Tekstsortering',
+	'Data Length' => 'Datalængde',
+	'Index Length' => 'Indekslængde',
+	'Data Free' => 'Fri data',
+	'Rows' => 'Rader',
+	'%d in total' => '%d total',
+	'Analyze' => 'Analyser',
+	'Optimize' => 'Optimaliser',
+	'Vacuum' => 'Støvsug',
+	'Check' => 'Tjek',
+	'Repair' => 'Reparer',
+	'Truncate' => 'Afkort',
+	'Tables have been truncated.' => 'Tabellerne er blevet afkortet.',
+	'Move to other database' => 'Flyt til anden database',
+	'Move' => 'Flyt',
+	'Tables have been moved.' => 'Tabellerne er blevet flyttet.',
+	'Copy' => 'Kopier',
+	'Tables have been copied.' => 'Tabellerne er blevet kopiert.',
+	'Routines' => 'Rutiner',
+	'Routine has been called, %d row(s) affected.' => array('Rutinen er udført, %d række påvirket.', 'Rutinen er udført, %d rækker påvirket.'),
+	'Call' => 'Kald',
+	'Parameter name' => 'Parameternavn',
+	'Create procedure' => 'Opret procedure',
+	'Create function' => 'Opret funktion',
+	'Routine has been dropped.' => 'Rutinen er slettet.',
+	'Routine has been altered.' => 'Rutinen er ændret.',
+	'Routine has been created.' => 'Rutinen er oprettet.',
+	'Alter function' => 'Ændre funktion',
+	'Alter procedure' => 'Ændre procedure',
+	'Return type' => 'Returtype',
+	'Events' => 'Hændelser',
+	'Event has been dropped.' => 'Hændelsen er slettet.',
+	'Event has been altered.' => 'Hændelsen er ændret.',
+	'Event has been created.' => 'Hændelsen er oprettet.',
+	'Alter event' => 'Ændre hændelse',
+	'Create event' => 'Opret hændelse',
+	'At given time' => 'På givne tid',
+	'Every' => 'Hver',
+	'Schedule' => 'Tidsplan',
+	'Start' => 'Start',
+	'End' => 'Slut',
+	'On completion preserve' => 'Ved fuldførelse bevar',
+	'Tables' => 'Tabeller',
+	'Tables and views' => 'Tabeller og views',
+	'Table' => 'Tabel',
+	'No tables.' => 'Ingen tabeller.',
+	'Alter table' => 'Ændre tabel',
+	'Create table' => 'Opret tabel',
+	'Table has been dropped.' => 'Tabellen er slettet.',
+	'Tables have been dropped.' => 'Tabellerne er slettet.',
+	'Tables have been optimized.' => 'Tabellerne er blevet optimaliseret.',
+	'Table has been altered.' => 'Tabellen er ændret.',
+	'Table has been created.' => 'Tabellen er oprettet.',
+	'Table name' => 'Tabelnavn',
+	'Show structure' => 'Vis struktur',
+	'engine' => 'motor',
+	'collation' => 'sortering',
+	'Column name' => 'Kolonnenavn',
+	'Type' => 'Type',
+	'Length' => 'Længde',
+	'Auto Increment' => 'Auto Increment',
+	'Options' => 'Valg',
+	'Comment' => 'Kommentarer',
+	'Default values' => 'Standardværdier',
+	'Drop' => 'Drop',
+	'Are you sure?' => 'Er du sikker?',
+	'Move up' => 'Flyt op',
+	'Move down' => 'Flyt ned',
+	'Remove' => 'Fjern',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maksimum antal feltnavne overskredet - øg venligst %s.',
+	'Partition by' => 'Partition ved',
+	'Partitions' => 'Partitioner',
+	'Partition name' => 'Partitionsnavn',
+	'Values' => 'Værdier',
+	'View' => 'View',
+	'View has been dropped.' => 'Viewet er slettet.',
+	'View has been altered.' => 'Viewet er ændret.',
+	'View has been created.' => 'Viewet er oprettet.',
+	'Alter view' => 'Ændre view',
+	'Create view' => 'Nyt view',
+	'Indexes' => 'Indekser',
+	'Indexes have been altered.' => 'Indekserne er ændret.',
+	'Alter indexes' => 'Ændre indekser',
+	'Add next' => 'Læg til næste',
+	'Index Type' => 'Indekstype',
+	'Column (length)' => 'Kolonne (længde)',
+	'Foreign keys' => 'Fremmednøgler',
+	'Foreign key' => 'Fremmednøgle',
+	'Foreign key has been dropped.' => 'Fremmednøglen er slettet.',
+	'Foreign key has been altered.' => 'Fremmednøglen er ændret.',
+	'Foreign key has been created.' => 'Fremmednøglen er oprettet.',
+	'Target table' => 'Måltabel',
+	'Change' => 'Ændre',
+	'Source' => 'Kilde',
+	'Target' => 'Mål',
+	'Add column' => 'Tilføj kolonne',
+	'Alter' => 'Ændre',
+	'Add foreign key' => 'Tilføj fremmednøgle',
+	'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.' => 'Kilde- og målkolonner skal have samme datatype, der skal være en indeks på mål-kolonnen, og data som refereres til skal eksistere.',
+	'Triggers' => 'Triggere',
+	'Add trigger' => 'Tilføj trigger',
+	'Trigger has been dropped.' => 'Triggeren er slettet.',
+	'Trigger has been altered.' => 'Triggeren er ændret.',
+	'Trigger has been created.' => 'Triggeren er oprettet.',
+	'Alter trigger' => 'Ændre trigger',
+	'Create trigger' => 'Opret trigger',
+	'Time' => 'Tid',
+	'Event' => 'Hændelse',
+	'Name' => 'Navn',
+	'select' => 'Vis',
+	'Select' => 'Vælg',
+	'Select data' => 'Vælg data',
+	'Functions' => 'Funktioner',
+	'Aggregation' => 'Sammenfatning',
+	'Search' => 'Søg',
+	'anywhere' => 'hvorsomhelst',
+	'Search data in tables' => 'Søg data i tabeller',
+	'Sort' => 'Sorter',
+	'descending' => 'faldende',
+	'Limit' => 'Limit',
+	'Text length' => 'Tekstlængde',
+	'Action' => 'Handling',
+	'Full table scan' => 'Fuld tabel-scan',
+	'Unable to select the table' => 'Kan ikke vælge tabellen',
+	'No rows.' => 'Ingen rækker.',
+	'%d row(s)' => array('%d række', '%d rækker'),
+	'Page' => 'Side',
+	'last' => 'sidste',
+	'Load more data' => 'Indlæs mere data',
+	'Loading' => 'Indlæser',
+	'whole result' => 'hele resultatet',
+	'%d byte(s)' => array('%d byte', '%d bytes'),
+	'Import' => 'Importer',
+	'%d row(s) have been imported.' => array('%d række er importeret.', '%d rækker er importeret.'),
+	'File must be in UTF-8 encoding.' => 'Filen skal være i UTF8-tegnkoding.',
+	'Modify' => 'Ændre',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+klik på en værdi for at ændre den.',
+	'Use edit link to modify this value.' => 'Brug rediger-link for at ændre dennne værdi.',
+	'Item%s has been inserted.' => 'Emne%s er sat ind.',
+	'Item has been deleted.' => 'Emnet er slettet.',
+	'Item has been updated.' => 'Emnet er opdateret.',
+	'%d item(s) have been affected.' => array('%d emne påvirket.', '%d emner påvirket.'),
+	'New item' => 'Nyt emne',
+	'original' => 'original',
+	'empty' => 'tom',
+	'edit' => 'rediger',
+	'Edit' => 'Rediger',
+	'Insert' => 'Indsæt',
+	'Save' => 'Gem',
+	'Save and continue edit' => 'Gem og fortsæt redigering',
+	'Save and insert next' => 'Gem og indsæt næste',
+	'Selected' => 'Valgt',
+	'Clone' => 'Klon',
+	'Delete' => 'Slet',
+	'You have no privileges to update this table.' => 'Du mangler rettigheder til at ændre denne tabellen.',
+	'E-mail' => 'E-mail',
+	'From' => 'Fra',
+	'Subject' => 'Titel',
+	'Attachments' => 'Vedhæft',
+	'Send' => 'Send',
+	'%d e-mail(s) have been sent.' => array('%d email sendt.', '%d emails sendt.'),
+	'Numbers' => 'Nummer',
+	'Date and time' => 'Dato og tid',
+	'Strings' => 'Strenge',
+	'Binary' => 'Binær',
+	'Lists' => 'Lister',
+	'Network' => 'Netværk',
+	'Geometry' => 'Geometri',
+	'Relations' => 'Relationer',
+	'Editor' => 'Redigering',
+	'$1-$3-$5' => '$6/$4 $1',
+	'[yyyy]-mm-dd' => 'd/m [åååå]',
+	'HH:MM:SS' => 'HH:MM:SS',
+	'now' => 'nu',
+	'yes' => 'ja',
+	'no' => 'nej',
+	'File exists.' => 'Filen findes.',
+	'Please use one of the extensions %s.' => 'Brug venligst en af filendelserne %s.',
+	'Alter schema' => 'Ændre skema',
+	'Create schema' => 'Opret skema',
+	'Schema has been dropped.' => 'Skemaet er slettet.',
+	'Schema has been created.' => 'Skemaet er oprettet.',
+	'Schema has been altered.' => 'Skemaet er ændret.',
+	'Schema' => 'Skema',
+	'Invalid schema.' => 'Ugyldigt skema.',
+	'Sequences' => 'Sekvenser',
+	'Create sequence' => 'Opret sekvens',
+	'Sequence has been dropped.' => 'Sekvensen er slettet.',
+	'Sequence has been created.' => 'Sekvensen er oprettet.',
+	'Sequence has been altered.' => 'Sekvensen er ændret.',
+	'Alter sequence' => 'Ændre sekvens',
+	'User types' => 'Brugertyper',
+	'Create type' => 'Opret type',
+	'Type has been dropped.' => 'Typen er slettet.',
+	'Type has been created.' => 'Typen er oprettet.',
+	'Alter type' => 'Ændre type',
+	'Saving' => 'Gemmer',
+);

adminer/lang/de.inc.php

@@ -31,7 +31,6 @@ $translations = array(
 	'Alter database' => 'Datenbank ändern',
 	'Create database' => 'Neue Datenbank',
 	'SQL command' => 'SQL-Query',
-	'Dump' => 'Export',
 	'Logout' => 'Abmelden',
 	'database' => 'Datenbank',
 	'Use' => 'Benutzung',
@@ -179,6 +178,7 @@ $translations = array(
 	'Tables have been truncated.' => 'Tabellen sind entleert worden (truncate).',
 	'Rows' => 'Datensätze',
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'Tabellen verschoben.',
 	'Move to other database' => 'In andere Datenbank verschieben',
 	'Move' => 'Verschieben',
@@ -225,7 +225,6 @@ $translations = array(
 	'Permanent login' => 'Passwort speichern',
 	'Databases have been dropped.' => 'Datenbanken entfernt.',
 	'Search data in tables' => 'Suche in Tabellen',
-	'schema' => 'Schema',
 	'Schema' => 'Schema',
 	'Alter schema' => 'Schema ändern',
 	'Create schema' => 'Neues Schema',

adminer/lang/en.inc.php

@@ -1,9 +1,11 @@
 <?php
 $translations = array(
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Too many unsuccessful logins, try again in %d minute.', 'Too many unsuccessful logins, try again in %d minutes.'),
 	'Query executed OK, %d row(s) affected.' => array('Query executed OK, %d row affected.', 'Query executed OK, %d rows affected.'),
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'Routine has been called, %d row(s) affected.' => array('Routine has been called, %d row affected.', 'Routine has been called, %d rows affected.'),
 	'%d process(es) have been killed.' => array('%d process has been killed.', '%d processes have been killed.'),
+	'%d / ' => '%d / ',
 	'%d row(s)' => array('%d row', '%d rows'),
 	'%d item(s) have been affected.' => array('%d item has been affected.', '%d items have been affected.'),
 	'%d row(s) have been imported.' => array('%d row has been imported.', '%d rows have been imported.'),

adminer/lang/es.inc.php

@@ -1,18 +1,18 @@
 <?php
 $translations = array(
 	'Login' => 'Login',
-	'Logout successful.' => 'Salida exitosa.',
-	'Invalid credentials.' => 'Identificacion inválida.',
+	'Logout successful.' => 'Sesión finalizada con éxito.',
+	'Invalid credentials.' => 'Usuario y/o clave de acceso incorrecta.',
 	'Server' => 'Servidor',
 	'Username' => 'Usuario',
 	'Password' => 'Contraseña',
 	'Select database' => 'Seleccionar Base de datos',
-	'Invalid database.' => 'Base de datos inválida.',
-	'Create new database' => 'Ingrese nueva base de datos',
+	'Invalid database.' => 'Base de datos incorrecta.',
+	'Create new database' => 'Crear nueva base de datos',
 	'Table has been dropped.' => 'Tabla eliminada.',
 	'Table has been altered.' => 'Tabla modificada.',
 	'Table has been created.' => 'Tabla creada.',
-	'Alter table' => 'Modifique estructura',
+	'Alter table' => 'Modificar tabla',
 	'Create table' => 'Crear tabla',
 	'Table name' => 'Nombre de la tabla',
 	'engine' => 'motor',
@@ -31,8 +31,7 @@ $translations = array(
 	'Alter database' => 'Modificar Base de datos',
 	'Create database' => 'Crear Base de datos',
 	'SQL command' => 'Comando SQL',
-	'Dump' => 'Export',
-	'Logout' => 'Logout',
+	'Logout' => 'Cerrar sesión',
 	'database' => 'base de datos',
 	'Use' => 'Usar',
 	'No tables.' => 'No existen tablas.',
@@ -42,11 +41,11 @@ $translations = array(
 	'Item%s has been inserted.' => 'Registro%s insertado.',
 	'Edit' => 'Modificar',
 	'Insert' => 'Agregar',
-	'Save and insert next' => 'Guardar e insertar otro',
+	'Save and insert next' => 'Guardar e insertar siguiente',
 	'Delete' => 'Eliminar',
 	'Database' => 'Base de datos',
 	'Routines' => 'Procedimientos',
-	'Indexes have been altered.' => 'Indices modificados.',
+	'Indexes have been altered.' => 'Indices actualizados.',
 	'Indexes' => 'Indices',
 	'Alter indexes' => 'Modificar indices',
 	'Add next' => 'Agregar',
@@ -56,33 +55,33 @@ $translations = array(
 	'Search' => 'Condición',
 	'Sort' => 'Ordenar',
 	'descending' => 'descendiente',
-	'Limit' => 'Limit',
+	'Limit' => 'Limite',
 	'No rows.' => 'No existen registros.',
 	'Action' => 'Acción',
 	'edit' => 'modificar',
 	'Page' => 'Página',
 	'Query executed OK, %d row(s) affected.' => array('Consulta ejecutada, %d registro afectado.', 'Consulta ejecutada, %d registros afectados.'),
-	'Error in query' => 'Error en consulta',
+	'Error in query' => 'Error al ejecutar consulta',
 	'Execute' => 'Ejecutar',
 	'Table' => 'Tabla',
-	'Foreign keys' => 'Claves foráneas',
-	'Triggers' => 'Triggers',
-	'View' => 'Vistas',
+	'Foreign keys' => 'Claves externas',
+	'Triggers' => 'Disparadores',
+	'View' => 'Vista',
 	'Unable to select the table' => 'No es posible seleccionar la tabla',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF inválido. Vuelva a enviar los datos del formulario.',
 	'Comment' => 'Comentario',
 	'Default values' => 'Valores predeterminados',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
-	'No commands to execute.' => 'No hay comando para ejecutar.',
-	'Unable to upload a file.' => 'No es posible importar archivo.',
+	'No commands to execute.' => 'No es posible ejecutar ningún comando.',
+	'Unable to upload a file.' => 'No es posible importar el archivo.',
 	'File upload' => 'Importar archivo',
-	'File uploads are disabled.' => 'Importación de archivos deshablilitado.',
+	'File uploads are disabled.' => 'Importación de archivos deshablilitada.',
 	'Routine has been called, %d row(s) affected.' => array('Consulta ejecutada, %d registro afectado.', 'Consulta ejecutada, %d registros afectados.'),
 	'Call' => 'Llamar',
 	'No extension' => 'No hay extension',
 	'None of the supported PHP extensions (%s) are available.' => 'Ninguna de las extensiones PHP soportadas (%s) está disponible.',
 	'Session support must be enabled.' => 'Deben estar habilitadas las sesiones.',
-	'Session expired, please login again.' => 'Sesión expirada, por favor ingrese su clave de nuevo.',
+	'Session expired, please login again.' => 'Sesión caducada, por favor escriba su clave de nuevo.',
 	'Text length' => 'Longitud de texto',
 	'Foreign key has been dropped.' => 'Clave externa eliminada.',
 	'Foreign key has been altered.' => 'Clave externa modificada.',
@@ -94,9 +93,9 @@ $translations = array(
 	'Target' => 'Destino',
 	'Add column' => 'Agregar columna',
 	'Alter' => 'Modificar',
-	'Add foreign key' => 'Agregar clave foránea',
-	'ON DELETE' => 'ON DELETE',
-	'ON UPDATE' => 'ON UPDATE',
+	'Add foreign key' => 'Agregar clave externa',
+	'ON DELETE' => 'AL BORRAR',
+	'ON UPDATE' => 'AL ACTUALIZAR',
 	'Index Type' => 'Tipo de índice',
 	'Column (length)' => 'Columna (longitud)',
 	'View has been dropped.' => 'Vista eliminada.',
@@ -117,16 +116,16 @@ $translations = array(
 	'Routine has been created.' => 'Procedimiento creado.',
 	'Alter function' => 'Modificar Función',
 	'Alter procedure' => 'Modificar procedimiento',
-	'Return type' => 'Tipo de valor de regreso',
-	'Add trigger' => 'Agregar trigger',
-	'Trigger has been dropped.' => 'Trigger eliminado.',
-	'Trigger has been altered.' => 'Trigger modificado.',
-	'Trigger has been created.' => 'Trigger creado.',
-	'Alter trigger' => 'Modificar Trigger',
-	'Create trigger' => 'Agregar Trigger',
+	'Return type' => 'Tipo de valor de vuelta',
+	'Add trigger' => 'Agregar disparador',
+	'Trigger has been dropped.' => 'Disparador eliminado.',
+	'Trigger has been altered.' => 'Disparador modificado.',
+	'Trigger has been created.' => 'Disparador creado.',
+	'Alter trigger' => 'Modificar Disparador',
+	'Create trigger' => 'Agregar Disparador',
 	'Time' => 'Tiempo',
 	'Event' => 'Evento',
-	'%s version: %s through PHP extension %s' => 'Versión %s: %s a través de extensión PHP %s',
+	'%s version: %s through PHP extension %s' => 'Versión %s: %s a través de la extensión de PHP %s',
 	'%d row(s)' => array('%d registro', '%d registros'),
 	'Remove' => 'Eliminar',
 	'Are you sure?' => 'Está seguro?',
@@ -145,7 +144,7 @@ $translations = array(
 	'Move up' => 'Mover arriba',
 	'Move down' => 'Mover abajo',
 	'Functions' => 'Funciones',
-	'Aggregation' => 'Agregaciones',
+	'Aggregation' => 'Agregados',
 	'Export' => 'Exportar',
 	'Output' => 'Salida',
 	'open' => 'mostrar',
@@ -158,14 +157,14 @@ $translations = array(
 	'Event has been created.' => 'Evento creado.',
 	'Alter event' => 'Modificar Evento',
 	'Create event' => 'Crear Evento',
-	'At given time' => 'A hora determinada',
+	'At given time' => 'En el momento indicado',
 	'Every' => 'Cada',
 	'Events' => 'Eventos',
 	'Schedule' => 'Agenda',
 	'Start' => 'Inicio',
 	'End' => 'Fin',
 	'Status' => 'Estado',
-	'On completion preserve' => 'Al completar preservar',
+	'On completion preserve' => 'Al completar mantener',
 	'Tables and views' => 'Tablas y vistas',
 	'Data Length' => 'Longitud de datos',
 	'Index Length' => 'Longitud de índice',
@@ -176,9 +175,10 @@ $translations = array(
 	'Check' => 'Comprobar',
 	'Repair' => 'Reparar',
 	'Truncate' => 'Vaciar',
-	'Tables have been truncated.' => 'Tablas vaciadas (truncate).',
+	'Tables have been truncated.' => 'Las tablas han sido vaciadas.',
 	'Rows' => 'Registros',
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'Se movieron las tablas.',
 	'Move to other database' => 'Mover a otra base de datos',
 	'Move' => 'Mover',
@@ -186,10 +186,10 @@ $translations = array(
 	'Save and continue edit' => 'Guardar y continuar editando',
 	'original' => 'original',
 	'Tables have been dropped.' => 'Tablas eliminadas.',
-	'%d item(s) have been affected.' => array('%d ítem afectado.', '%d itemes afectados.'),
+	'%d item(s) have been affected.' => array('%d elemento afectado.', '%d elementos afectados.'),
 	'whole result' => 'resultado completo',
 	'Clone' => 'Clonar',
-	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Cantida máxima de campos permitidos excedidos. Por favor aumente %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Excedida la cantidad máxima de campos permitidos. Por favor aumente %s.',
 	'Partition by' => 'Particionar por',
 	'Partitions' => 'Particiones',
 	'Partition name' => 'Nombre de Partición',
@@ -201,13 +201,13 @@ $translations = array(
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$5/$3/$1',
 	'[yyyy]-mm-dd' => 'dd/mm/[aaaa]',
-	'History' => 'History',
+	'History' => 'Histórico',
 	'Variables' => 'Variables',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Las columnas de origen y destino deben ser del mismo tipo, debe existir un índice entre las columnas del destino y el registro referenciado debe existir.',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Las columnas de origen y destino deben ser del mismo tipo, debe existir un índice entre las columnas del destino y el registro referenciado debe existir también.',
 	'Relations' => 'Relaciones',
 	'Run file' => 'Ejecutar Archivo',
 	'Clear' => 'Vaciar',
-	'Maximum allowed file size is %sB.' => 'Tamaño máximo de archivo es %sB.',
+	'Maximum allowed file size is %sB.' => 'El tamaño máximo de archivo es %sB.',
 	'Numbers' => 'Números',
 	'Date and time' => 'Fecha y hora',
 	'Strings' => 'Cadena',
@@ -220,12 +220,11 @@ $translations = array(
 	'Send' => 'Enviar',
 	'%d e-mail(s) have been sent.' => array('%d email enviado.', '%d emails enviados.'),
 	'Webserver file %s' => 'Archivo de servidor web %s',
-	'File does not exist.' => 'Archivo no existe.',
+	'File does not exist.' => 'Ese archivo no existe.',
 	'%d in total' => '%d en total',
 	'Permanent login' => 'Guardar contraseña',
 	'Databases have been dropped.' => 'Bases de datos eliminadas.',
 	'Search data in tables' => 'Buscar datos en tablas',
-	'schema' => 'esquema',
 	'Schema' => 'Esquema',
 	'Alter schema' => 'Modificar esquema',
 	'Create schema' => 'Crear esquema',
@@ -238,13 +237,13 @@ $translations = array(
 	'Sequence has been dropped.' => 'Secuencia eliminada.',
 	'Sequence has been created.' => 'Secuencia creada.',
 	'Sequence has been altered.' => 'Secuencia modificada.',
-	'User types' => 'Tipos definido por el usuario',
+	'User types' => 'Tipos definidos por el usuario',
 	'Create type' => 'Crear tipo',
 	'Alter type' => 'Modificar tipo',
 	'Type has been dropped.' => 'Tipo eliminado.',
 	'Type has been created.' => 'Tipo creado.',
 	'Ctrl+click on a value to modify it.' => 'Ctrl+clic sobre el valor para editarlo.',
-	'Use edit link to modify this value.' => 'Utilice el enlace de modificar para realizar los cambios.',
+	'Use edit link to modify this value.' => 'Utilice el enlace de edición para realizar cambios.',
 	'last' => 'último',
 	'From server' => 'Desde servidor',
 	'System' => 'Motor de base de datos',
@@ -253,7 +252,7 @@ $translations = array(
 	'empty' => 'ningúno',
 	'Network' => 'Red',
 	'Geometry' => 'Geometría',
-	'File exists.' => 'Archivo ya existe.',
+	'File exists.' => 'Ese archivo ya existe.',
 	'Attachments' => 'Adjuntos',
 	'%d query(s) executed OK.' => array('%d sentencia sql ejecutada correctamente.', '%d sentencias sql ejecutadas correctamente.'),
 	'Show only errors' => 'Mostrar solamente errores',

adminer/lang/et.inc.php

@@ -31,7 +31,6 @@ $translations = array(
 	'Alter database' => 'Muuda andmebaasi',
 	'Create database' => 'Loo uus andmebaas',
 	'SQL command' => 'SQL-Päring',
-	'Dump' => 'Ekspordi',
 	'Logout' => 'Logi välja',
 	'database' => 'andmebaas',
 	'Use' => 'Kasuta',
@@ -179,6 +178,7 @@ $translations = array(
 	'Data Free' => 'Vaba ruumi',
 	'Rows' => 'Ridu',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Analyze' => 'Analüüsi',
 	'Optimize' => 'Optimeeri',
 	'Check' => 'Kontrolli',
@@ -225,7 +225,6 @@ $translations = array(
 	'Permanent login' => 'Jäta mind meelde',
 	'Databases have been dropped.' => 'Andmebaasid on edukalt kustutatud.',
 	'Search data in tables' => 'Otsi kogu andmebaasist',
-	'schema' => 'struktuur',
 	'Schema' => 'Struktuur',
 	'Alter schema' => 'Muuda struktuuri',
 	'Create schema' => 'Loo struktuur',

adminer/lang/fa.inc.php

@@ -1,98 +1,102 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'System' => 'سيستم',
+	'System' => 'سیستم',
 	'Server' => 'سرور',
-	'Username' => 'نام كاربري',
-	'Password' => 'كلمه عبور',
-	'Permanent login' => '',
+	'Username' => 'نام کاربری',
+	'Password' => 'کلمه عبور',
+	'Permanent login' => 'ورود دائم',
 	'Login' => 'ورود',
 	'Logout' => 'خروج',
 	'Logged as: %s' => 'ورود به عنوان: %s',
-	'Logout successful.' => 'با موفقيت خارج شديد',
-	'Invalid credentials.' => 'اعتبار سنجي نامعتبر',
+	'Logout successful.' => 'با موفقیت خارج شدید.',
+	'Invalid credentials.' => 'اعتبار سنجی نامعتبر.',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('ورودهای ناموفق بیش از حد، %d دقیقه دیگر تلاش نمایید.', 'ورودهای ناموفق بیش از حد، %d دقیقه دیگر تلاش نمایید.'),
+	'Master password expired. <a href="http://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'رمز اصلی باطل شده است. روش %s را <a href="http://www.adminer.org/en/extension/" target="_blank">پیاده سازی</a> کرده تا آن را دائمی سازید.',
 	'Language' => 'زبان',
-	'Invalid CSRF token. Send the form again.' => 'نامعتبر است. دوباره سعی کنید Token CSRF',
+	'Invalid CSRF token. Send the form again.' => 'CSRF token نامعتبر است. دوباره سعی کنید.',
 	'No extension' => 'پسوند نامعتبر',
-	'None of the supported PHP extensions (%s) are available.' => ' پسوند پی اچ پی در دسترس نیست (%s) تعداد',
-	'Session support must be enabled.' => 'پشتيباني از نشست بايستي فعال گردد',
-	'Session expired, please login again.' => 'نشست پايان يافته، لطفا دوباره وارد شويد',
+	'None of the supported PHP extensions (%s) are available.' => 'هیچ کدام از افزونه های PHP پشتیبانی شده (%s) موجود نمی باشند.',
+	'Session support must be enabled.' => 'پشتیبانی از نشست بایستی فعال گردد.',
+	'Session expired, please login again.' => 'نشست پایان یافته، لطفا دوباره وارد شوید.',
 	'%s version: %s through PHP extension %s' => 'نسخه %s : %s توسعه پی اچ پی %s',
-	'Refresh' => 'بازيابي',
+	'Refresh' => 'بازیابی',
 	
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'rtl',
 	
-	'Privileges' => 'امتيازات',
-	'Create user' => 'ایجاد كاربر',
-	'User has been dropped.' => 'كاربر حذف شد',
-	'User has been altered.' => 'كاربر ويرايش گرديد',
-	'User has been created.' => 'كاربر ايجاد شد',
-	'Hashed' => 'به هم ريخته',
+	'Privileges' => 'امتیازات',
+	'Create user' => 'ایجاد کاربر',
+	'User has been dropped.' => 'کاربر حذف شد.',
+	'User has been altered.' => 'کاربر ویرایش گردید.',
+	'User has been created.' => 'کاربر ایجاد شد.',
+	'Hashed' => 'به هم ریخته',
 	'Column' => 'ستون',
-	'Routine' => 'روتين',
+	'Routine' => 'روتین',
 	'Grant' => 'اعطا',
-	'Revoke' => 'لغو كردن',
+	'Revoke' => 'لغو کردن',
 	
-	'Process list' => 'ليست فرآيند',
-	'%d process(es) have been killed.' => '%d فرآيند متوقف شد',
-	'Kill' => 'حذف فرآيند',
+	'Process list' => 'لیست فرآیند',
+	'%d process(es) have been killed.' => '%d فرآیند متوقف شد.',
+	'Kill' => 'حذف فرآیند',
 	
-	'Variables' => 'متغيرها',
-	'Status' => 'وضعيت',
+	'Variables' => 'متغیرها',
+	'Status' => 'وضعیت',
 	
-	'SQL command' => 'دستور اس كيو ال',
-	'%d query(s) executed OK.' => '%d كوئري اجرا شد',
-	'Query executed OK, %d row(s) affected.' => 'كوئري اجرا شد. %d سطر تغيير كرد.',
-	'No commands to execute.' => 'دستوري براي اجرا وجود ندارد',
-	'Error in query' => 'خطا در كوئري',
+	'SQL command' => 'دستور SQL',
+	'%d query(s) executed OK.' => '%d کوئری اجرا شد.',
+	'Query executed OK, %d row(s) affected.' => 'کوئری اجرا شد. %d سطر تغیر کرد.',
+	'No commands to execute.' => 'دستوری برای اجرا وجود ندارد.',
+	'Error in query' => 'خطا در کوئری',
 	'Execute' => 'اجرا',
-	'Stop on error' => 'توقف در خطا',
-	'Show only errors' => 'فقط نمايش خطاها',
+	'Stop on error' => 'توقف بر روی خطا',
+	'Show only errors' => 'فقط نمایش خطاها',
 	// sprintf() format for time of the command
 	'%.3f s' => '%.3f s',
-	'History' => 'تاريخ',
-	'Clear' => 'پاك كردن',
-	'Edit all' => 'ويرايش همه',
+	'History' => 'تاریخ',
+	'Clear' => 'پاک کردن',
+	'Edit all' => 'ویرایش همه',
 	
-	'File upload' => 'بارگذاري فايل',
+	'File upload' => 'بارگذاری فایل',
 	'From server' => 'از سرور',
-	'Webserver file %s' => '%s فايل وب سرور',
-	'Run file' => 'نمايش فايل',
-	'File does not exist.' => 'فايل وجود ندارد',
-	'File uploads are disabled.' => 'بارگذاري غير فعال است',
-	'Unable to upload a file.' => 'قادر به بارگذاري فايل نيستيد',
-	'Maximum allowed file size is %sB.' => ' %sB حداكثر اندازه فايل',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'حجم داده ارسالي برزگ است. حجم داده كاهش دهيد و يا مقدار %s را در پيكربندي افزايش دهيد.',
-	
+	'Webserver file %s' => '%s فایل وب سرور',
+	'Run file' => 'اجرای فایل',
+	'File does not exist.' => 'فایل وجود ندارد.',
+	'File uploads are disabled.' => 'بارگذاری غیر فعال است.',
+	'Unable to upload a file.' => 'قادر به بارگذاری فایل نیستید.',
+	'Maximum allowed file size is %sB.' => ' %sB حداکثر اندازه فایل.',
+	'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' => 'استخراج',
-	'Dump' => 'خالي كردن',
-	'Output' => 'خروجي',
-	'open' => 'بازكردن',
-	'save' => 'ذخيره',
+	'Output' => 'خروجی',
+	'open' => 'بازکردن',
+	'save' => 'ذخیره',
 	'Format' => 'حذف',
 	'Data' => 'داده',
 	
-	'Database' => 'پايگاه داده',
-	'database' => 'پايگاه داده',
+	'Database' => 'پایگاه داده',
+	'database' => 'پایگاه داده',
 	'Use' => 'استفاده',
-	'Select database' => 'انتخاب پايگاه داده',
-	'Invalid database.' => 'پايگاه داده نامعتبر',
-	'Create new database' => 'ایجاد پايگاه داده جديد',
-	'Database has been dropped.' => 'پايگاه داده حذف شد',
-	'Databases have been dropped.' => 'پايگاه دادها حذف شدند',
-	'Database has been created.' => 'پايگاه داده ايجاد شد',
-	'Database has been renamed.' => 'نام پايگاه داده تغيير كرد',
-	'Database has been altered.' => 'پايگاه داده ويرايش شد',
-	'Alter database' => 'ويرايش پايگاه داده',
-	'Create database' => 'ایجاد پايگاه داده',
-	'Database schema' => 'ساختار پايگاه داده',
+	'Select database' => 'انتخاب پایگاه داده',
+	'Invalid database.' => 'پایگاه داده نامعتبر.',
+	'Create new database' => 'ایجاد پایگاه داده جدید',
+	'Database has been dropped.' => 'پایگاه داده حذف شد.',
+	'Databases have been dropped.' => 'پایگاه های داده حذف شدند.',
+	'Database has been created.' => 'پایگاه داده ایجاد شد.',
+	'Database has been renamed.' => 'نام پایگاه داده تغیر کرد.',
+	'Database has been altered.' => 'پایگاه داده ویرایش شد.',
+	'Alter database' => 'ویرایش پایگاه داده',
+	'Create database' => 'ایجاد پایگاه داده',
+	'Database schema' => 'ساختار پایگاه داده',
 	
 	// link to current database schema layout
 	'Permanent link' => 'ارتباط دائم',
 	
 	// thousands separator - must contain single byte
 	',' => ' ',
+	'0123456789' => '۰۱۲۳۴۵۶۷۸۹',
 	'Engine' => 'موتور',
 	'Collation' => 'تطبیق',
 	'Data Length' => 'طول داده',
@@ -102,33 +106,34 @@ $translations = array(
 	'%d in total' => ' به طور کل %d ',
 	'Analyze' => 'تحلیل',
 	'Optimize' => 'بهینه سازی',
+	'Vacuum' => 'پاک سازی',
 	'Check' => 'بررسی',
 	'Repair' => 'تعمیر',
 	'Truncate' => 'کوتاه کردن',
-	'Tables have been truncated.' => 'جدولها بریده شدند',
+	'Tables have been truncated.' => 'جدولها بریده شدند.',
 	'Move to other database' => 'انتقال به یک پایگاه داده دیگر',
 	'Move' => 'انتقال',
-	'Tables have been moved.' => 'جدولها انتقال داده شدند',
+	'Tables have been moved.' => 'جدولها انتقال داده شدند.',
 	'Copy' => 'کپی کردن',
-	'Tables have been copied.' => 'جدولها کپی شدند',
+	'Tables have been copied.' => 'جدولها کپی شدند.',
 	
 	'Routines' => 'روالها',
-	'Routine has been called, %d row(s) affected.' => array('روال فراخوانی شد %d سطر متاثر شد', 'روال فراخوانی شد %d سطر متاثر شد'),
+	'Routine has been called, %d row(s) affected.' => array('روال فراخوانی شد %d سطر متاثر شد.', 'روال فراخوانی شد %d سطر متاثر شد.'),
 	'Call' => 'صدا زدن',
 	'Parameter name' => 'نام پارامتر',
 	'Create procedure' => 'ایجاد زیربرنامه',
 	'Create function' => 'ایجاد تابع',
-	'Routine has been dropped.' => 'روال حذف شد',
-	'Routine has been altered.' => 'روال ویرایش شد',
-	'Routine has been created.' => 'روال ایجاد شد',
+	'Routine has been dropped.' => 'روال حذف شد.',
+	'Routine has been altered.' => 'روال ویرایش شد.',
+	'Routine has been created.' => 'روال ایجاد شد.',
 	'Alter function' => 'ویرایش تابع',
 	'Alter procedure' => 'ویرایش زیربرنامه',
 	'Return type' => 'برگرداندن نوع',
 	
 	'Events' => 'رویدادها',
-	'Event has been dropped.' => 'رویداد حذف شد',
-	'Event has been altered.' => 'رویداد ویرایش شد',
-	'Event has been created.' => 'رویداد ایجاد شد',
+	'Event has been dropped.' => 'رویداد حذف شد.',
+	'Event has been altered.' => 'رویداد ویرایش شد.',
+	'Event has been created.' => 'رویداد ایجاد شد.',
 	'Alter event' => 'ویرایش رویداد',
 	'Create event' => 'ایجاد رویداد',
 	'At given time' => 'زمان معین',
@@ -144,10 +149,11 @@ $translations = array(
 	'No tables.' => 'جدولی وجود ندارد',
 	'Alter table' => 'ویرایش جدول',
 	'Create table' => 'ایجاد جدول',
-	'Table has been dropped.' => 'جدول حذف شد',
-	'Tables have been dropped.' => 'جدولها حذف شدند',
-	'Table has been altered.' => 'جدول ویرایش شد',
-	'Table has been created.' => 'جدول ایجاد شد',
+	'Table has been dropped.' => 'جدول حذف شد.',
+	'Tables have been dropped.' => 'جدولها حذف شدند.',
+	'Tables have been optimized.' => 'جدولها بهینه شدند.',
+	'Table has been altered.' => 'جدول ویرایش شد.',
+	'Table has been created.' => 'جدول ایجاد شد.',
 	'Table name' => 'نام جدول',
 	'Show structure' => 'نمایش ساختار',
 	'engine' => 'موتور',
@@ -158,13 +164,16 @@ $translations = array(
 	'Auto Increment' => 'افزایش خودکار',
 	'Options' => 'اختیارات',
 	'Comment' => 'توضیح',
+	'Default value' => 'مقدار پیش فرض',
 	'Default values' => 'مقادیر پیش فرض',
 	'Drop' => 'حذف',
 	'Are you sure?' => 'مطمئن هستید؟',
+	'Size' => 'حجم',
+	'Compute' => 'محاسبه',
 	'Move up' => 'انتقال به بالا',
 	'Move down' => 'انتقال به پایین',
 	'Remove' => 'حذف',
-	'Maximum number of allowed fields exceeded. Please increase %s.' => 'حداکثر مجاز فیلدهای مجاز اشباع شد. لطفا %s را کاهش دهید',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'حداکثر تعداد فیلدهای مجاز اشباع شد. لطفا %s را افزایش دهید.',
 	
 	'Partition by' => 'بخشبندی توسط',
 	'Partitions' => 'بخشبندیها',
@@ -172,14 +181,16 @@ $translations = array(
 	'Values' => 'مقادیر',
 	
 	'View' => 'نمایش',
-	'View has been dropped.' => 'نمایش حذف شد',
-	'View has been altered.' => 'نمایش ویرایش شد',
-	'View has been created.' => 'نمایش ایجاد شد',
+	'Materialized View' => 'نمایه مادی',
+	'View has been dropped.' => 'نمایش حذف شد.',
+	'View has been altered.' => 'نمایش ویرایش شد.',
+	'View has been created.' => 'نمایش ایجاد شد.',
 	'Alter view' => 'حذف نمایش',
 	'Create view' => 'ایجاد نمایش',
+	'Create materialized view' => 'ایجاد نمایه مادی',
 	
 	'Indexes' => 'ایندکسها',
-	'Indexes have been altered.' => 'ایندکسها ویرایش شد',
+	'Indexes have been altered.' => 'ایندکسها ویرایش شدند.',
 	'Alter indexes' => 'ویرایش ایندکسها',
 	'Add next' => 'افرودن بعدی',
 	'Index Type' => 'نوع ایندکس',
@@ -187,9 +198,9 @@ $translations = array(
 	
 	'Foreign keys' => 'کلیدهای خارجی',
 	'Foreign key' => 'کلید خارجی',
-	'Foreign key has been dropped.' => 'کلید خارجی حذف شد',
-	'Foreign key has been altered.' => 'کلید خارجی ویرایش شد',
-	'Foreign key has been created.' => 'کلید خارجی ایجاد شد',
+	'Foreign key has been dropped.' => 'کلید خارجی حذف شد.',
+	'Foreign key has been altered.' => 'کلید خارجی ویرایش شد.',
+	'Foreign key has been created.' => 'کلید خارجی ایجاد شد.',
 	'Target table' => 'جدول هدف',
 	'Change' => 'تغییر',
 	'Source' => 'منبع',
@@ -199,13 +210,13 @@ $translations = array(
 	'Add foreign key' => 'افزودن کلید خارجی',
 	'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.' => 'داده مبدا و مقصد ستونها بایستی شبیه هم باشند',
+	'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.' => 'تریگر حذف شد',
-	'Trigger has been altered.' => 'تریگر ویرایش شد',
-	'Trigger has been created.' => 'تریگر ایجاد شد',
+	'Trigger has been dropped.' => 'تریگر حذف شد.',
+	'Trigger has been altered.' => 'تریگر ویرایش شد.',
+	'Trigger has been created.' => 'تریگر ایجاد شد.',
 	'Alter trigger' => 'ویرایش تریگر',
 	'Create trigger' => 'ایجاد تریگر',
 	'Time' => 'زمان',
@@ -223,27 +234,35 @@ $translations = array(
 	'Sort' => 'مرتب کردن',
 	'descending' => 'نزولی',
 	'Limit' => 'محدودیت',
+	'Limit rows' => 'محدودیت سطرها',
 	'Text length' => 'طول متن',
 	'Action' => 'عملیات',
+	'Full table scan' => 'اسکن کامل جدول',
 	'Unable to select the table' => 'قادر به انتخاب جدول نیستید',
 	'No rows.' => 'سطری وجود ندارد',
+	'%d / ' => '%d / ',
 	'%d row(s)' => array('%d سطر', '%d سطر'),
 	'Page' => 'صفحه',
 	'last' => 'آخری',
+	'Load more data' => 'بارگزاری اطلاعات بیشتر',
+	'Loading' => 'در حال بارگزاری',
 	'whole result' => 'همه نتایج',
 	'%d byte(s)' => array('%d بایت', '%d بایت'),
 	
 	'Import' => 'وارد کردن',
-	'%d row(s) have been imported.' => array('%d سطر وارد شد', '%d سطر وارد شد'),
+	'%d row(s) have been imported.' => array('%d سطر وارد شد.', '%d سطر وارد شد.'),
+	'File must be in UTF-8 encoding.' => 'فرمت فایل باید UTF-8 باشید.',
 	
 	// in-place editing in select
-	'Use edit link to modify this value.' => 'از لینک ویرایش برای ویرایش این مقدار استفاده کنید',
+	'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.' => 'آیتم حذف شد',
-	'Item has been updated.' => 'آیتم بروز رسانی شد',
-	'%d item(s) have been affected.' => array('%d آیتم متاثر شد', '%d آیتم متاثر شد'),
+	'Item%s has been inserted.' => '%s آیتم درج شد.',
+	'Item has been deleted.' => 'آیتم حذف شد.',
+	'Item has been updated.' => 'آیتم بروز رسانی شد.',
+	'%d item(s) have been affected.' => array('%d آیتم متاثر شد.', '%d آیتم متاثر شد.'),
 	'New item' => 'آیتم جدید',
 	'original' => 'اصلی',
 	// label for value '' in enum data type
@@ -254,15 +273,17 @@ $translations = array(
 	'Save' => 'ذخیره',
 	'Save and continue edit' => 'ذخیره و ادامه ویرایش',
 	'Save and insert next' => 'ذخیره و درج بعدی',
+	'Selected' => 'انتخاب شده',
 	'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 ایمیل ارسال شد'),
+	'%d e-mail(s) have been sent.' => array('%d ایمیل ارسال شد.', '%d ایمیل ارسال شد.'),
 	
 	// data type descriptions
 	'Numbers' => 'اعداد',
@@ -282,33 +303,34 @@ $translations = array(
 	// hint for time format - use language equivalents for hour, minute and second shortcuts
 	'HH:MM:SS' => 'HH:MM:SS',
 	'now' => 'اکنون',
-	
+	'yes' => 'بله',
+	'no' => 'خیر',
+
 	// general SQLite error in create, drop or rename database
-	'File exists.' => 'فایل موجود است',
-	'Please use one of the extensions %s.' => 'لطفا یکی از پسوندهای زیر را انتخاب نمائید %s ',
+	'File exists.' => 'فایل موجود است.',
+	'Please use one of the extensions %s.' => 'لطفا یکی از پسوندها را انتخاب نمائید %s.',
 	
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'ویرایش ساختار',
 	'Create schema' => 'ایجاد ساختار',
-	'Schema has been dropped.' => 'ساختار حذف شد',
-	'Schema has been created.' => 'ساختار ایجاد شد',
-	'Schema has been altered.' => 'ساختار ویرایش شد',
-	'schema' => 'ساختار',
+	'Schema has been dropped.' => 'ساختار حذف شد.',
+	'Schema has been created.' => 'ساختار ایجاد شد.',
+	'Schema has been altered.' => 'ساختار ویرایش شد.',
 	'Schema' => 'ساختار',
-	'Invalid schema.' => 'ساختار نامعتبر',
+	'Invalid schema.' => 'ساختار نامعتبر.',
 	
 	// PostgreSQL sequences support
 	'Sequences' => 'صف ها',
 	'Create sequence' => 'ایجاد صف',
-	'Sequence has been dropped.' => 'صف حذف شد',
-	'Sequence has been created.' => 'صف ایجاد شد',
-	'Sequence has been altered.' => 'صف ویرایش شد',
+	'Sequence has been dropped.' => 'صف حذف شد.',
+	'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.' => 'نوع ایجاد شد',
+	'Type has been dropped.' => 'نوع حذف شد.',
+	'Type has been created.' => 'نوع ایجاد شد.',
 	'Alter type' => 'ویرایش نوع',
 );

adminer/lang/fr.inc.php

@@ -20,7 +20,7 @@ $translations = array(
 	'Column name' => 'Nom de la colonne',
 	'Type' => 'Type',
 	'Length' => 'Longueur',
-	'Auto Increment' => 'Auto increment',
+	'Auto Increment' => 'Incrément automatique',
 	'Options' => 'Options',
 	'Save' => 'Enregistrer',
 	'Drop' => 'Supprimer',
@@ -30,7 +30,6 @@ $translations = array(
 	'Alter database' => 'Modifier la base de données',
 	'Create database' => 'Créer une base de données',
 	'SQL command' => 'Requête SQL',
-	'Dump' => 'Exporter',
 	'Logout' => 'Déconnexion',
 	'database' => 'base de données',
 	'Use' => 'Utiliser',
@@ -49,7 +48,7 @@ $translations = array(
 	'Alter indexes' => 'Modifier les index',
 	'Add next' => 'Ajouter le prochain',
 	'Language' => 'Langue',
-	'Select' => 'Select',
+	'Select' => 'Sélectionner',
 	'New item' => 'Nouvel élément',
 	'Search' => 'Rechercher',
 	'Sort' => 'Trier',
@@ -64,10 +63,10 @@ $translations = array(
 	'Execute' => 'Exécuter',
 	'Table' => 'Table',
 	'Foreign keys' => 'Clés étrangères',
-	'Triggers' => 'Triggers',
+	'Triggers' => 'Déclencheurs',
 	'View' => 'Vue',
 	'Unable to select the table' => 'Impossible de sélectionner la table',
-	'Invalid CSRF token. Send the form again.' => 'Token CSRF invalide. Veuillez réenvoyer le formulaire.',
+	'Invalid CSRF token. Send the form again.' => 'Token CSRF invalide. Veuillez renvoyer le formulaire.',
 	'Comment' => 'Commentaire',
 	'Default values' => 'Valeurs par défaut',
 	'%d byte(s)' => array('%d octet', '%d octets'),
@@ -116,17 +115,17 @@ $translations = array(
 	'Alter function' => 'Modifier la fonction',
 	'Alter procedure' => 'Modifier la procédure',
 	'Return type' => 'Type de retour',
-	'Add trigger' => 'Ajouter un trigger',
-	'Trigger has been dropped.' => 'Le trigger a été supprimé.',
-	'Trigger has been altered.' => 'Le trigger a été modifié.',
-	'Trigger has been created.' => 'Le trigger a été créé.',
-	'Alter trigger' => 'Modifier un trigger',
-	'Create trigger' => 'Ajouter un trigger',
+	'Add trigger' => 'Ajouter un déclencheur',
+	'Trigger has been dropped.' => 'Le déclencheur a été supprimé.',
+	'Trigger has been altered.' => 'Le déclencheur a été modifié.',
+	'Trigger has been created.' => 'Le déclencheur a été créé.',
+	'Alter trigger' => 'Modifier un déclencheur',
+	'Create trigger' => 'Ajouter un déclencheur',
 	'Time' => 'Temps',
 	'Event' => 'Évènement',
 	'%d row(s)' => array('%d ligne', '%d lignes'),
 	'Remove' => 'Effacer',
-	'Are you sure?' => 'Êtes-vous certain ?',
+	'Are you sure?' => 'Êtes-vous certain(e) ?',
 	'Privileges' => 'Privilèges',
 	'Create user' => 'Créer un utilisateur',
 	'User has been dropped.' => 'L\'utilisateur a été effacé.',
@@ -177,6 +176,7 @@ $translations = array(
 	'Data Free' => 'Espace inutilisé',
 	'Rows' => 'Lignes',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Analyze' => 'Analyser',
 	'Optimize' => 'Optimiser',
 	'Check' => 'Vérifier',
@@ -192,7 +192,7 @@ $translations = array(
 	'Partitions' => 'Partitions',
 	'Partition name' => 'Nom de la partition',
 	'Values' => 'Valeurs',
-	'%d row(s) have been imported.' => array('%d ligne a été importée.','%d lignes ont été importées.'),
+	'%d row(s) have been imported.' => array('%d ligne a été importée.', '%d lignes ont été importées.'),
 	'anywhere' => 'n\'importe où',
 	'Import' => 'Importer',
 	'Stop on error' => 'Arrêter en cas d\'erreur',
@@ -224,7 +224,6 @@ $translations = array(
 	'Databases have been dropped.' => 'Les bases de données ont été supprimées.',
 	'Database has been dropped.' => 'La base de données a été supprimée.',
 	'Search data in tables' => 'Rechercher dans les tables',
-	'schema' => 'schéma',
 	'Schema' => 'Schéma',
 	'Alter schema' => 'Modifier le schéma',
 	'Create schema' => 'Créer un schéma',
@@ -267,4 +266,21 @@ $translations = array(
 	'Permanent link' => 'Lien permanent',
 	'Edit all' => 'Tout modifier',
 	'HH:MM:SS' => 'HH:MM:SS',
+	'Selected' => 'Sélectionnée(s)',
+	'Modify' => 'Modification',
+	'Load more data' => 'Charger plus de données',
+	'Loading' => 'Chargement',
+	'Tables have been optimized.' => 'Les tables ont bien été optimisées.',
+	'Vacuum' => 'Vide',
+	'File must be in UTF-8 encoding.' => 'Les fichiers doivent être encodées en UTF-8.',
+	'Full table scan' => 'Scan de toute la table',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Trop de connexions infructueuses, essayez de nouveau dans %d minute.', 'Trop de connexions infructueuses, essayez de nouveau dans %d minutes.'),
+	'Master password expired. <a href="http://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Le mot de passe a expiré. <a href="http://www.adminer.org/en/extension/" target="_blank">Mettre en oeuvre</a> de la méthode %s afin de la rendre permanente.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Vous pouvez uploader de gros fichiers SQL par FTP et ensuite l\'importer depuis le serveur.',
+	'Size' => 'Taille',
+	'Compute' => 'Calcul',
+	'You have no privileges to update this table.' => 'Vous n\'avez pas les droits pour mettre à jour cette table.',
+	'Saving' => 'Enregistrement',
+	'yes' => 'oui',
+	'no' => 'non',
 );

adminer/lang/hu.inc.php

@@ -31,7 +31,6 @@ $translations = array(
 	'Alter database' => 'Adatbázis módosítása',
 	'Create database' => 'Adatbázis létrehozása',
 	'SQL command' => 'SQL parancs',
-	'Dump' => 'Exportálás',
 	'Logout' => 'Kilépés',
 	'database' => 'adatbázis',
 	'Use' => 'Használ',
@@ -179,6 +178,7 @@ $translations = array(
 	'Tables have been truncated.' => 'A tábla felszabadítva.',
 	'Rows' => 'Oszlop',
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'Táblák áthelyezve.',
 	'Move to other database' => 'Áthelyezés másik adatbázisba',
 	'Move' => 'Áthelyez',
@@ -238,7 +238,6 @@ $translations = array(
 	'Schema has been dropped.' => 'Séma eldobva.',
 	'Schema has been created.' => 'Séma létrejött.',
 	'Schema has been altered.' => 'Séma módosult.',
-	'schema' => 'séma',
 	'Schema' => 'Séma',
 	'Sequences' => 'Sorozatok',
 	'Create sequence' => 'Sorozat létrehozása',

adminer/lang/id.inc.php

@@ -66,7 +66,6 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Data POST terlalu besar. Kurangi data atau perbesar pengarah konfigurasi %s.',
 
 	'Export' => 'Ekspor',
-	'Dump' => 'Ekspor',
 	'Output' => 'Hasil',
 	'open' => 'buka',
 	'save' => 'simpan',
@@ -93,6 +92,7 @@ $translations = array(
 
 	// thousands separator - must contain single byte
 	',' => '.',
+	'0123456789' => '0123456789',
 	'Engine' => 'Mesin',
 	'Collation' => 'Kolasi',
 	'Data Length' => 'Panjang Data',
@@ -297,7 +297,6 @@ $translations = array(
 	'Schema has been dropped.' => 'Skema berhasil dihapus.',
 	'Schema has been created.' => 'Skema berhasil dibuat.',
 	'Schema has been altered.' => 'Skema berhasil diubah.',
-	'schema' => 'skema',
 	'Schema' => 'Skema',
 	'Invalid schema.' => 'Skema invalid.',
 

adminer/lang/it.inc.php

@@ -31,7 +31,6 @@ $translations = array(
 	'Alter database' => 'Modifica database',
 	'Create database' => 'Crea database',
 	'SQL command' => 'Comando SQL',
-	'Dump' => 'Dump',
 	'Logout' => 'Esci',
 	'database' => 'database',
 	'Use' => 'Usa',
@@ -179,6 +178,7 @@ $translations = array(
 	'Data Free' => 'Dati liberi',
 	'Rows' => 'Righe',
 	',' => '.',
+	'0123456789' => '0123456789',
 	'Analyze' => 'Analizza',
 	'Optimize' => 'Ottimizza',
 	'Check' => 'Controlla',
@@ -225,7 +225,6 @@ $translations = array(
 	'Permanent login' => 'Login permanente',
 	'Databases have been dropped.' => 'Database eliminati.',
 	'Search data in tables' => 'Cerca nelle tabelle',
-	'schema' => 'schema',
 	'Schema' => 'Schema',
 	'Alter schema' => 'Modifica schema',
 	'Create schema' => 'Crea schema',

adminer/lang/ja.inc.php

@@ -31,7 +31,6 @@ $translations = array(
 	'Alter database' => 'データベースを変更',
 	'Create database' => 'データベースを作成',
 	'SQL command' => 'SQLコマンド',
-	'Dump' => 'ダンプ',
 	'Logout' => 'ログアウト',
 	'database' => 'データベース',
 	'Use' => '使用',
@@ -175,6 +174,7 @@ $translations = array(
 	'Data Free' => '空き',
 	'Rows' => '行数',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Analyze' => '分析',
 	'Optimize' => '最適化',
 	'Check' => 'チェック',
@@ -226,7 +226,6 @@ $translations = array(
 	'Permanent login' => '永続的にログイン',
 	'Databases have been dropped.' => 'データベースを削除しました',
 	'Search data in tables' => 'データを検索する',
-	'schema' => 'スキーマ',
 	'Schema' => 'スキーマ',
 	'Alter schema' => 'スキーマ変更',
 	'Create schema' => 'スキーマ追加',

adminer/lang/ko.inc.php

@@ -31,7 +31,6 @@ $translations = array(
 	'Alter database' => '데이터베이스 변경',
 	'Create database' => '데이터베이스 만들기',
 	'SQL command' => 'SQL 명령',
-	'Dump' => '덤프',
 	'Logout' => '로그아웃',
 	'database' => '데이터베이스',
 	'Use' => '사용',
@@ -175,6 +174,7 @@ $translations = array(
 	'Data Free' => '여유',
 	'Rows' => '행',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Analyze' => '분석',
 	'Optimize' => '최적화',
 	'Check' => '확인',
@@ -226,7 +226,6 @@ $translations = array(
 	'Permanent login' => '영구적으로 로그인',
 	'Databases have been dropped.' => '데이터베이스를 삭제했습니다.',
 	'Search data in tables' => '데이터 검색',
-	'schema' => '스키마',
 	'Schema' => '스키마',
 	'Alter schema' => '스키마 변경',
 	'Create schema' => '스키마 추가',

adminer/lang/lt.inc.php

@@ -66,7 +66,6 @@ $translations = array(
 	'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',
-	'Dump' => 'Eksportuoti',
 	'Output' => 'Išvestis',
 	'open' => 'atidaryti',
 	'save' => 'išsaugoti',
@@ -93,6 +92,7 @@ $translations = array(
 	
 	// thousands separator - must contain single byte
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Engine' => 'Variklis',
 	'Collation' => 'Lyginimas',
 	'Data Length' => 'Duomenų ilgis',
@@ -293,7 +293,6 @@ $translations = array(
 	'Schema has been dropped.' => 'Schema pašalinta.',
 	'Schema has been created.' => 'Schema sukurta.',
 	'Schema has been altered.' => 'Schema pakeista.',
-	'schema' => 'schema',
 	'Schema' => 'Schema',
 	'Invalid schema.' => 'Neteisinga schema.',
 	

adminer/lang/nl.inc.php

@@ -32,7 +32,6 @@ $translations = array(
 	'Alter database' => 'Database aanpassen',
 	'Create database' => 'Database aanmaken',
 	'SQL command' => 'SQL opdracht',
-	'Dump' => 'Exporteer',
 	'Logout' => 'Uitloggen',
 	'database' => 'database',
 	'Use' => 'Gebruik',
@@ -180,6 +179,7 @@ $translations = array(
 	'Data Free' => 'Data Vrij',
 	'Rows' => 'Rijen',
 	',' => '.',
+	'0123456789' => '0123456789',
 	'Analyze' => 'Analyseer',
 	'Optimize' => 'Optimaliseer',
 	'Check' => 'Controleer',
@@ -225,7 +225,6 @@ $translations = array(
 	'%d in total' => '%d in totaal',
 	'Permanent login' => 'Blijf aangemeld',
 	'Search data in tables' => 'Zoeken in database',
-	'schema' => 'schema',
 	'Schema' => 'Schema',
 	'Alter schema' => 'Schema wijzigen',
 	'Create schema' => 'Schema maken',

adminer/lang/no.inc.php

@@ -58,7 +58,6 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'For stor datamengde i skjemaet. Reduser datamengden, eller øk størrelsen på %s-konfigurasjonsdirektivet.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Du kan laste opp en stor SQL-fil via FTP og importere den fra serveren.',
 	'Export' => 'Eksport',
-	'Dump' => 'Dump',
 	'Output' => 'Resultat',
 	'open' => 'åpne',
 	'save' => 'lagre',
@@ -80,6 +79,7 @@ $translations = array(
 	'Database schema' => 'Databaseskjema',
 	'Permanent link' => 'Permanent lenke',
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Engine' => 'Motor',
 	'Collation' => 'Tekstsortering',
 	'Data Length' => 'Datalengde',
@@ -266,7 +266,6 @@ $translations = array(
 	'Schema has been dropped.' => 'Skjemaet er slettet.',
 	'Schema has been created.' => 'Skjemaet er opprettet.',
 	'Schema has been altered.' => 'Skjemaet er endret.',
-	'schema' => 'skjema',
 	'Schema' => 'Skjema',
 	'Invalid schema.' => 'Ugylding skjema.',
 	'Sequences' => 'Sekvenser',

adminer/lang/pl.inc.php

@@ -11,9 +11,11 @@ $translations = array(
 	'Logged as: %s' => 'Zalogowany jako: %s',
 	'Logout successful.' => 'Wylogowano pomyślnie.',
 	'Invalid credentials.' => 'Nieprawidłowe 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="http://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Ważność hasła głównego wygasła. <a href="http://www.adminer.org/pl/extension/" target="_blank">Zaimplementuj</a> własną metodę %s, aby ustawić je na stałe.',
 	'Language' => 'Język',
 	'Invalid CSRF token. Send the form again.' => 'Nieprawidłowy token CSRF. Spróbuj wysłać formularz ponownie.',
+	'If you did not send this request from Adminer then close this page.' => 'Jeżeli nie wywołałeś tej strony z Adminera, zamknij to okno.',
 	'No extension' => 'Brak rozszerzenia',
 	'None of the supported PHP extensions (%s) are available.' => 'Żadne z rozszerzeń PHP umożliwiających połączenie się z bazą danych (%s) nie jest dostępne.',
 	'Session support must be enabled.' => 'Wymagana jest obsługa sesji w PHP.',
@@ -66,9 +68,9 @@ $translations = array(
 	'Maximum allowed file size is %sB.' => 'Maksymalna wielkość pliku to %sB.',
 	'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',
-	'Dump' => 'Eksport',
 	'Output' => 'Rezultat',
 	'open' => 'otwórz',
 	'save' => 'zapisz',
@@ -95,6 +97,7 @@ $translations = array(
 	
 	// thousands separator - must contain single byte
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Engine' => 'Składowanie',
 	'Collation' => 'Porównywanie znaków',
 	'Data Length' => 'Rozmiar danych',
@@ -104,6 +107,7 @@ $translations = array(
 	'%d in total' => '%d w sumie',
 	'Analyze' => 'Analizuj',
 	'Optimize' => 'Optymalizuj',
+	'Vacuum' => 'Wyczyść',
 	'Check' => 'Sprawdź',
 	'Repair' => 'Napraw',
 	'Truncate' => 'Opróżnij',
@@ -161,9 +165,12 @@ $translations = array(
 	'Auto Increment' => 'Auto Increment',
 	'Options' => 'Opcje',
 	'Comment' => 'Komentarz',
+	'Default value' => 'Wartość domyślna',
 	'Default values' => 'Wartości domyślne',
 	'Drop' => 'Usuń',
 	'Are you sure?' => 'Czy jesteś pewien?',
+	'Size' => 'Wielkość',
+	'Compute' => 'Oblicz',
 	'Move up' => 'Przesuń w górę',
 	'Move down' => 'Przesuń w dół',
 	'Remove' => 'Usuń',
@@ -175,11 +182,13 @@ $translations = array(
 	'Values' => 'Wartości',
 	
 	'View' => 'Perspektywa',
+	'Materialized View' => 'Zmaterializowana perspektywa',
 	'View has been dropped.' => 'Perspektywa została usunięta.',
 	'View has been altered.' => 'Perspektywa została zmieniona.',
 	'View has been created.' => 'Perspektywa została utworzona.',
 	'Alter view' => 'Zmień perspektywę',
 	'Create view' => 'Utwórz perspektywę',
+	'Create materialized view' => 'Utwórz zmaterializowaną perspektywę',
 	
 	'Indexes' => 'Indeksy',
 	'Indexes have been altered.' => 'Indeksy zostały zmienione.',
@@ -244,6 +253,7 @@ $translations = array(
 	'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ść.',
 	
@@ -260,8 +270,10 @@ $translations = array(
 	'Edit' => 'Edytuj',
 	'Insert' => 'Dodaj',
 	'Save' => 'Zapisz zmiany',
+	'Saving' => 'Zapisywanie',
 	'Save and continue edit' => 'Zapisz i kontynuuj edycję',
 	'Save and insert next' => 'Zapisz i dodaj następny',
+	'Selected' => 'Zaznaczone',
 	'Clone' => 'Duplikuj',
 	'Delete' => 'Usuń',
 	'You have no privileges to update this table.' => 'Brak uprawnień do edycji tej tabeli',
@@ -304,7 +316,6 @@ $translations = array(
 	'Schema has been dropped.' => 'Schemat został usunięty.',
 	'Schema has been created.' => 'Schemat został utworzony.',
 	'Schema has been altered.' => 'Schemat został zmieniony.',
-	'schema' => 'schemat',
 	'Schema' => 'Schemat',
 	'Invalid schema.' => 'Nieprawidłowy schemat.',
 	

adminer/lang/pt-br.inc.php

@@ -1,7 +1,7 @@
 <?php
 $translations = array(
 	'Login' => 'Entrar',
-	'Logout successful.' => 'Saida bem sucedida.',
+	'Logout successful.' => 'Saída bem sucedida.',
 	'Invalid credentials.' => 'Identificação inválida.',
 	'Server' => 'Servidor',
 	'Username' => 'Usuário',
@@ -9,10 +9,10 @@ $translations = array(
 	'Select database' => 'Selecionar Base de dados',
 	'Invalid database.' => 'Base de dados inválida.',
 	'Create new database' => 'Criar nova base de dados',
-	'Table has been dropped.' => 'Tabela eliminada.',
-	'Table has been altered.' => 'Tabela modificada.',
-	'Table has been created.' => 'Tabela criada.',
-	'Alter table' => 'Modificar estrutura',
+	'Table has been dropped.' => 'A Tabela foi eliminada.',
+	'Table has been altered.' => 'A Tabela foi alterada.',
+	'Table has been created.' => 'A Tabela foi criada.',
+	'Alter table' => 'Alterar estrutura',
 	'Create table' => 'Criar tabela',
 	'Table name' => 'Nome da tabela',
 	'engine' => 'motor',
@@ -23,32 +23,31 @@ $translations = array(
 	'Auto Increment' => 'Incremento Automático',
 	'Options' => 'Opções',
 	'Save' => 'Salvar',
-	'Drop' => 'Remover',
-	'Database has been dropped.' => 'Base de dados eliminada.',
-	'Database has been created.' => 'Base de dados criada.',
-	'Database has been renamed.' => 'Base de dados renomeada.',
-	'Database has been altered.' => 'Base de dados modificada.',
-	'Alter database' => 'Modificar Base de dados',
+	'Drop' => 'Apagar',
+	'Database has been dropped.' => 'A Base de dados foi apagada.',
+	'Database has been created.' => 'A Base de dados foi criada.',
+	'Database has been renamed.' => 'A Base de dados foi renomeada.',
+	'Database has been altered.' => 'A Base de dados foi alterada.',
+	'Alter database' => 'Alterar Base de dados',
 	'Create database' => 'Criar Base de dados',
 	'SQL command' => 'Comando SQL',
-	'Dump' => 'Exportar',
 	'Logout' => 'Sair',
 	'database' => 'base de dados',
 	'Use' => 'Usar',
 	'No tables.' => 'Não existem tabelas.',
-	'select' => 'registros',
-	'Item has been deleted.' => 'Registro eliminado.',
-	'Item has been updated.' => 'Registro modificado.',
-	'Item%s has been inserted.' => 'Registro%s inserido.',
-	'Edit' => 'Modificar',
+	'select' => 'selecionar',
+	'Item has been deleted.' => 'O Registro foi deletado.',
+	'Item has been updated.' => 'O Registro foi atualizado.',
+	'Item%s has been inserted.' => 'O Registro%s foi inserido.',
+	'Edit' => 'Editar',
 	'Insert' => 'Inserir',
 	'Save and insert next' => 'Salvar e inserir outro',
-	'Delete' => 'Apagar',
+	'Delete' => 'Deletar',
 	'Database' => 'Base de dados',
-	'Routines' => 'Procedimentos',
-	'Indexes have been altered.' => 'Índices modificados.',
+	'Routines' => 'Rotinas',
+	'Indexes have been altered.' => 'Os Índices foram alterados.',
 	'Indexes' => 'Índices',
-	'Alter indexes' => 'Modificar índices',
+	'Alter indexes' => 'Alterar índices',
 	'Add next' => 'Adicionar proximo',
 	'Language' => 'Idioma',
 	'Select' => 'Selecionar',
@@ -59,82 +58,82 @@ $translations = array(
 	'Limit' => 'Limite',
 	'No rows.' => 'Não existem registros.',
 	'Action' => 'Ação',
-	'edit' => 'modificar',
+	'edit' => 'editar',
 	'Page' => 'Página',
 	'Query executed OK, %d row(s) affected.' => array('Consulta executada, %d registro afetado.', 'Consulta executada, %d registros afetados.'),
 	'Error in query' => 'Erro na consulta',
 	'Execute' => 'Executar',
 	'Table' => 'Tabela',
-	'Foreign keys' => 'Chaves foráneas',
+	'Foreign keys' => 'Chaves estrangeiras',
 	'Triggers' => 'Triggers',
-	'View' => 'Visualizar',
+	'View' => 'Visão',
 	'Unable to select the table' => 'Não é possivel selecionar a Tabela',
 	'Invalid CSRF token. Send the form again.' => 'Token CSRF inválido. Enviar o formulario novamente.',
 	'Comment' => 'Comentário',
-	'Default values' => 'Valores predeterminados',
+	'Default values' => 'Valores padrões',
 	'%d byte(s)' => array('%d byte', '%d bytes'),
 	'No commands to execute.' => 'Nenhum comando para executar.',
 	'Unable to upload a file.' => 'Não é possível enviar o arquivo.',
 	'File upload' => 'Importar arquivo',
 	'File uploads are disabled.' => 'Importação de arquivos desablilitada.',
-	'Routine has been called, %d row(s) affected.' => array('Consulta executada, %d registro afetado.', 'Consulta executada, %d registros afetados.'),
+	'Routine has been called, %d row(s) affected.' => array('Rotina executada, %d registro afetado.', 'Rotina executada, %d registros afetados.'),
 	'Call' => 'Chamar',
 	'No extension' => 'Não há extension',
 	'None of the supported PHP extensions (%s) are available.' => 'Nenhuma das extensões PHP suportadas (%s) está disponivel.',
-	'Session support must be enabled.' => 'Devem estar habilitadas as sessões.',
-	'Session expired, please login again.' => 'Sessão expirada, por favor entre sua Chave de novo.',
+	'Session support must be enabled.' => 'Suporte a sessões deve estar habilitado.',
+	'Session expired, please login again.' => 'Sessão expirada, por favor logue-se novamente.',
 	'Text length' => 'Tamanho de texto',
-	'Foreign key has been dropped.' => 'Chave externa eliminada.',
-	'Foreign key has been altered.' => 'Chave externa modificada.',
-	'Foreign key has been created.' => 'Chave externa criada.',
-	'Foreign key' => 'Chave externa',
+	'Foreign key has been dropped.' => 'A Chave Estrangeira foi apagada.',
+	'Foreign key has been altered.' => 'A Chave Estrangeira foi alterada.',
+	'Foreign key has been created.' => 'A Chave Estrangeira foi criada.',
+	'Foreign key' => 'Chave Estrangeira',
 	'Target table' => 'Tabela de destino',
 	'Change' => 'Modificar',
 	'Source' => 'Origem',
 	'Target' => 'Destino',
 	'Add column' => 'Adicionar coluna',
-	'Alter' => 'Modificar',
-	'Add foreign key' => 'Adicionar Chave foránea',
+	'Alter' => 'Alterar',
+	'Add foreign key' => 'Adicionar Chave Estrangeira',
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipo de índice',
-	'Column (length)' => 'coluna (tamanho)',
-	'View has been dropped.' => 'Vista eliminada.',
-	'View has been altered.' => 'Vista modificada.',
-	'View has been created.' => 'Vista criada.',
-	'Alter view' => 'Modificar vista',
-	'Create view' => 'Criar vista',
+	'Column (length)' => 'Coluna (tamanho)',
+	'View has been dropped.' => 'A Visão foi apagada.',
+	'View has been altered.' => 'A Visão foi alterada.',
+	'View has been created.' => 'A Visão foi criada.',
+	'Alter view' => 'Alterar visão',
+	'Create view' => 'Criar visão',
 	'Name' => 'Nome',
 	'Process list' => 'Lista de processos',
-	'%d process(es) have been killed.' => array('%d processo terminado.', '%d processos terminados.'),
+	'%d process(es) have been killed.' => array('%d processo foi terminado.', '%d processos foram terminados.'),
 	'Kill' => 'Parar',
 	'Parameter name' => 'Nome de Parâmetro',
 	'Database schema' => 'Esquema de Base de dados',
 	'Create procedure' => 'Criar procedimento',
 	'Create function' => 'Criar função',
-	'Routine has been dropped.' => 'Procedimento eliminado.',
-	'Routine has been altered.' => 'Procedimento modificado.',
-	'Routine has been created.' => 'Procedimento criado.',
-	'Alter function' => 'Modificar Função',
-	'Alter procedure' => 'Modificar procedimento',
-	'Return type' => 'Tipo de valor de regreso',
+	'Routine has been dropped.' => 'A Rotina foi apagada.',
+	'Routine has been altered.' => 'A Rotina foi alterada.',
+	'Routine has been created.' => 'A Rotina foi criada.',
+	'Alter function' => 'Alterar função',
+	'Alter procedure' => 'Alterar procedimento',
+	'Return type' => 'Tipo de valor de retorno',
 	'Add trigger' => 'Adicionar trigger',
-	'Trigger has been dropped.' => 'Trigger eliminado.',
-	'Trigger has been altered.' => 'Trigger modificado.',
-	'Trigger has been created.' => 'Trigger criado.',
-	'Alter trigger' => 'Modificar Trigger',
+	'Trigger has been dropped.' => 'O Trigger foi apagado.',
+	'Trigger has been altered.' => 'O Trigger foi alterado.',
+	'Trigger has been created.' => 'O Trigger foi criado.',
+	'Alter trigger' => 'Alterar Trigger',
 	'Create trigger' => 'Adicionar Trigger',
 	'Time' => 'Tempo',
 	'Event' => 'Evento',
 	'%s version: %s through PHP extension %s' => 'Versão %s: %s através da extensão PHP %s',
 	'%d row(s)' => array('%d registro', '%d registros'),
 	'Remove' => 'Remover',
-	'Are you sure?' => 'Está seguro?',
+	'Are you sure?' => 'Você tem certeza?',
 	'Privileges' => 'Privilégios',
 	'Create user' => 'Criar Usuário',
-	'User has been dropped.' => 'Usuário eliminado.',
-	'User has been altered.' => 'Usuário modificado.',
-	'User has been created.' => 'Usuário criado.',
+	'User has been dropped.' => 'O Usuário foi apagado.',
+	'User has been altered.' => 'O Usuário foi alterado.',
+	'User has been created.' => 'O Usuário foi criado.',
 	'Hashed' => 'Hash',
 	'Column' => 'Coluna',
 	'Routine' => 'Rotina',
@@ -148,14 +147,14 @@ $translations = array(
 	'Aggregation' => 'Adições',
 	'Export' => 'Exportar',
 	'Output' => 'Saída',
-	'open' => 'mostrar',
-	'save' => 'salvas',
+	'open' => 'abrir',
+	'save' => 'salvar',
 	'Format' => 'Formato',
 	'Tables' => 'Tabelas',
 	'Data' => 'Dados',
-	'Event has been dropped.' => 'Evento eliminado.',
-	'Event has been altered.' => 'Evento modificado.',
-	'Event has been created.' => 'Evento criado.',
+	'Event has been dropped.' => 'O Evento foi apagado.',
+	'Event has been altered.' => 'O Evento foi alterado.',
+	'Event has been created.' => 'O Evento foi criado.',
 	'Alter event' => 'Modificar Evento',
 	'Create event' => 'Criar Evento',
 	'At given time' => 'A hora determinada',
@@ -166,7 +165,7 @@ $translations = array(
 	'End' => 'Fim',
 	'Status' => 'Estado',
 	'On completion preserve' => 'Ao completar preservar',
-	'Tables and views' => 'Tabelas e vistas',
+	'Tables and views' => 'Tabelas e Visões',
 	'Data Length' => 'Tamanho de dados',
 	'Index Length' => 'Tamanho de índice',
 	'Data Free' => 'Espaço Livre',
@@ -176,17 +175,18 @@ $translations = array(
 	'Check' => 'Verificar',
 	'Repair' => 'Reparar',
 	'Truncate' => 'Truncar',
-	'Tables have been truncated.' => 'Tabelas truncadas (truncate).',
+	'Tables have been truncated.' => 'As Tabelas foram truncadas.',
 	'Rows' => 'Registros',
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'As Tabelas foram movidas.',
-	'Move to other database' => 'Mover outra Base de dados',
+	'Move to other database' => 'Mover para outra Base de dados',
 	'Move' => 'Mover',
 	'Engine' => 'Motor',
 	'Save and continue edit' => 'Salvar e continuar editando',
 	'original' => 'original',
-	'Tables have been dropped.' => 'Tabelas eliminadas.',
-	'%d item(s) have been affected.' => array('%d item afetado.', '%d itens afetados.'),
+	'Tables have been dropped.' => 'As Tabelas foram eliminadas.',
+	'%d item(s) have been affected.' => array('%d item foi afetado.', '%d itens foram afetados.'),
 	'whole result' => 'resultado completo',
 	'Clone' => 'Clonar',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Quantidade máxima de campos permitidos excedidos. Por favor aumente %s.',
@@ -194,7 +194,7 @@ $translations = array(
 	'Partitions' => 'Partições',
 	'Partition name' => 'Nome da Partição',
 	'Values' => 'Valores',
-	'%d row(s) have been imported.' => array('%d registro importado.', '%d registros importados.'),
+	'%d row(s) have been imported.' => array('%d registro foi importado.', '%d registros foram importados.'),
 	'anywhere' => 'qualquer local',
 	'Import' => 'Importar',
 	'Stop on error' => 'Parar em caso de erro',
@@ -207,7 +207,7 @@ $translations = array(
 	'Relations' => 'Relações',
 	'Run file' => 'Executar Arquivo',
 	'Clear' => 'Limpar',
-	'Maximum allowed file size is %sB.' => 'Tamanho máximo do arquivo é %sB.',
+	'Maximum allowed file size is %sB.' => 'Tamanho máximo do arquivo permitido é %sB.',
 	'Numbers' => 'Números',
 	'Date and time' => 'Data e hora',
 	'Strings' => 'Cadena',
@@ -218,36 +218,35 @@ $translations = array(
 	'From' => 'De',
 	'Subject' => 'Assunto',
 	'Send' => 'Enviar',
-	'%d e-mail(s) have been sent.' => array('%d email enviado.', '%d emails enviados.'),
+	'%d e-mail(s) have been sent.' => array('%d email foi enviado.', '%d emails foram enviados.'),
 	'Webserver file %s' => 'Arquivo do servidor web %s',
 	'File does not exist.' => 'Arquivo não existe.',
 	'%d in total' => '%d no total',
-	'Permanent login' => 'Salvar Senha',
-	'Databases have been dropped.' => 'Bases de dados eliminadas.',
+	'Permanent login' => 'Login permanente',
+	'Databases have been dropped.' => 'A Base de dados foi apagada.',
 	'Search data in tables' => 'Buscar dados nas Tabelas',
-	'schema' => 'esquema',
 	'Schema' => 'Esquema',
-	'Alter schema' => 'Modificar esquema',
+	'Alter schema' => 'Alterar esquema',
 	'Create schema' => 'Criar esquema',
-	'Schema has been dropped.' => 'Esquema eliminado.',
-	'Schema has been created.' => 'Esquema criado.',
-	'Schema has been altered.' => 'Esquema modificado.',
+	'Schema has been dropped.' => 'O Esquema foi apagado.',
+	'Schema has been created.' => 'O Esquema foi criado.',
+	'Schema has been altered.' => 'O Esquema foi alterado.',
 	'Sequences' => 'Sequências',
-	'Create sequence' => 'Criar sequências',
-	'Alter sequence' => 'Modificar sequência',
-	'Sequence has been dropped.' => 'Sequência eliminada.',
-	'Sequence has been created.' => 'Sequência criada.',
-	'Sequence has been altered.' => 'Sequência modificada.',
-	'User types' => 'Tipos definido pelo usuário',
+	'Create sequence' => 'Criar sequência',
+	'Alter sequence' => 'Alterar sequência',
+	'Sequence has been dropped.' => 'A Sequência foi apagada.',
+	'Sequence has been created.' => 'A Sequência foi criada.',
+	'Sequence has been altered.' => 'A Sequência foi alterada.',
+	'User types' => 'Tipos definidos pelo usuário',
 	'Create type' => 'Criar tipo',
-	'Alter type' => 'Modificar tipo',
-	'Type has been dropped.' => 'Tipo eliminado.',
-	'Type has been created.' => 'Tipo criado.',
-	'Ctrl+click on a value to modify it.' => 'Ctrl+clique vezes sobre o valor para edita-lo.',
-	'Use edit link to modify this value.' => 'Utilize o link modificar para alterar.',
+	'Alter type' => 'Alterar tipo',
+	'Type has been dropped.' => 'O Tipo foi apagado.',
+	'Type has been created.' => 'O Tipo foi criado.',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+clique sobre o valor para edita-lo.',
+	'Use edit link to modify this value.' => 'Utilize o link editar para modificar este valor.',
 	'last' => 'último',
-	'From server' => 'Desde servidor',
-	'System' => 'Motor de Base de dados',
+	'From server' => 'A partir do servidor',
+	'System' => 'Sistema',
 	'Select data' => 'Selecionar dados',
 	'Show structure' => 'Mostrar estrutura',
 	'empty' => 'vazio',

adminer/lang/pt.inc.php

@@ -31,7 +31,6 @@ $translations = array(
 	'Alter database' => 'Modificar Base de dados',
 	'Create database' => 'Criar Base de dados',
 	'SQL command' => 'Comando SQL',
-	'Dump' => 'Exportar',
 	'Logout' => 'Terminar sessão',
 	'database' => 'base de dados',
 	'Use' => 'Usar',
@@ -179,6 +178,7 @@ $translations = array(
 	'Tables have been truncated.' => 'Tabelas truncadas (truncate).',
 	'Rows' => 'Registos',
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'As Tabelas foram movidas.',
 	'Move to other database' => 'Mover outra Base de dados',
 	'Move' => 'Mover',
@@ -225,7 +225,6 @@ $translations = array(
 	'Permanent login' => 'Memorizar a senha',
 	'Databases have been dropped.' => 'Bases de dados eliminadas.',
 	'Search data in tables' => 'Pesquisar dados nas Tabelas',
-	'schema' => 'esquema',
 	'Schema' => 'Esquema',
 	'Alter schema' => 'Modificar esquema',
 	'Create schema' => 'Criar esquema',

adminer/lang/ro.inc.php

@@ -1,7 +1,7 @@
 <?php
 $translations = array(
 	'Login' => 'Intră',
-	'Logout successful.' => 'Ați eșit cu succes.',
+	'Logout successful.' => 'Ați ieșit cu succes.',
 	'Invalid credentials.' => 'Numele de utilizator sau parola este greșită.',
 	'Server' => 'Server',
 	'Username' => 'Nume de utilizator',
@@ -31,8 +31,7 @@ $translations = array(
 	'Alter database' => 'Modifică baza de date',
 	'Create database' => 'Crează baza de date',
 	'SQL command' => 'SQL query',
-	'Dump' => 'Dump',
-	'Logout' => 'Eșire',
+	'Logout' => 'Ieșire',
 	'database' => 'baza de date',
 	'Use' => 'Alege',
 	'No tables.' => 'În baza de date nu sunt tabele.',
@@ -46,9 +45,9 @@ $translations = array(
 	'Delete' => 'Șterge',
 	'Database' => 'Baza de date',
 	'Routines' => 'Proceduri și funcții salvate',
-	'Indexes have been altered.' => 'Indexele au fost modificate.',
-	'Indexes' => 'Indexe',
-	'Alter indexes' => 'Modifică indexe',
+	'Indexes have been altered.' => 'Indexurile au fost modificate.',
+	'Indexes' => 'Indexuri',
+	'Alter indexes' => 'Modifică indexuri',
 	'Add next' => 'Adaugă încă',
 	'Language' => 'Limba',
 	'Select' => 'Selectează',
@@ -62,11 +61,11 @@ $translations = array(
 	'edit' => 'editare',
 	'Page' => 'Pagina',
 	'Query executed OK, %d row(s) affected.' => array('Query executat, %d înscriere modificată.', 'Query executat, %d înscrieri modificate.'),
-	'Error in query' => 'Eroare în query',
+	'Error in query' => 'Greșeală în query',
 	'Execute' => 'Execută',
 	'Table' => 'Tabel',
-	'Foreign keys' => 'Cheiuri externe',
-	'Triggers' => 'Triggere',
+	'Foreign keys' => 'Chei externe',
+	'Triggers' => 'Declanșatoare',
 	'View' => 'Reprezentare',
 	'Unable to select the table' => 'Nu am putut selecta date din tabel',
 	'Invalid CSRF token. Send the form again.' => 'CSRF token imposibil. Retrimite forma.',
@@ -77,24 +76,24 @@ $translations = array(
 	'Unable to upload a file.' => 'Nu am putut încărca fișierul pe server.',
 	'File upload' => 'Încarcă fișierul',
 	'File uploads are disabled.' => 'Încărcarea fișierelor este interzisă.',
-	'Routine has been called, %d row(s) affected.' => array('A fost executată procedură, %d înscriere a fost modificată.', 'A fost executată procedură, %d înscrieri au fost modificate.'),
+	'Routine has been called, %d row(s) affected.' => array('A fost executată procedura, %d înscriere a fost modificată.', 'A fost executată procedura, %d înscrieri au fost modificate.'),
 	'Call' => 'Apelează',
 	'No extension' => 'Nu este extensie',
 	'None of the supported PHP extensions (%s) are available.' => 'Nu este aviabilă nici o extensie suportată (%s).',
 	'Session support must be enabled.' => 'Sesiunile trebuie să fie pornite.',
-	'Session expired, please login again.' => 'Timpul sesiunii a expirat, rog să te loghezi din nou.',
+	'Session expired, please login again.' => 'Timpul sesiunii a expirat, rog să vă conectați din nou.',
 	'Text length' => 'Lungimea textului',
-	'Foreign key has been dropped.' => 'Chei extern a fost șters.',
-	'Foreign key has been altered.' => 'Chei extern a fost modificat.',
-	'Foreign key has been created.' => 'Chei extern a fost creat.',
-	'Foreign key' => 'Chei extern',
+	'Foreign key has been dropped.' => 'Cheia externă a fost ștearsă.',
+	'Foreign key has been altered.' => 'Cheia externă a fost modificată.',
+	'Foreign key has been created.' => 'Cheia externă a fost creată.',
+	'Foreign key' => 'Cheie externă',
 	'Target table' => 'Tabela scop',
 	'Change' => 'Modifică',
 	'Source' => 'Sursă',
 	'Target' => 'Scop',
 	'Add column' => 'Adaugă coloană',
 	'Alter' => 'Modifică',
-	'Add foreign key' => 'Adaugă chei extern',
+	'Add foreign key' => 'Adaugă cheie externă',
 	'ON DELETE' => 'La ștergere',
 	'ON UPDATE' => 'La modificare',
 	'Index Type' => 'Tipul indexului',
@@ -102,11 +101,11 @@ $translations = array(
 	'View has been dropped.' => 'Reprezentarea a fost ștearsă.',
 	'View has been altered.' => 'Reprezentarea a fost modificată.',
 	'View has been created.' => 'Reprezentarea a fost creată.',
-	'Alter view' => 'Modifică reprezentare',
+	'Alter view' => 'Modifică reprezentarea',
 	'Create view' => 'Crează reprezentare',
 	'Name' => 'Titlu',
 	'Process list' => 'Lista proceselor',
-	'%d process(es) have been killed.' => array('A fost finisat %d proces.', 'Au fost finisate %d procese.'),
+	'%d process(es) have been killed.' => array('A fost terminat %d proces.', 'Au fost terminate %d procese.'),
 	'Kill' => 'Termină',
 	'Parameter name' => 'Numele parametrului',
 	'Database schema' => 'Schema bazei de date',
@@ -118,7 +117,7 @@ $translations = array(
 	'Alter function' => 'Modifică funcția',
 	'Alter procedure' => 'Modifică procedura',
 	'Return type' => 'Tipul returnării',
-	'Add trigger' => 'Adaugă trigger',
+	'Add trigger' => 'Adaugă trigger (declanșator)',
 	'Trigger has been dropped.' => 'Triggerul a fost șters.',
 	'Trigger has been altered.' => 'Triggerul a fost modificat.',
 	'Trigger has been created.' => 'Triggerul a fost creat.',
@@ -129,8 +128,8 @@ $translations = array(
 	'%s version: %s through PHP extension %s' => 'Versiunea %s: %s cu extensia PHP %s',
 	'%d row(s)' => array('%d înscriere', '%d înscrieri'),
 	'Remove' => 'Șterge',
-	'Are you sure?' => 'Ești precis?',
-	'Privileges' => 'Privelegii',
+	'Are you sure?' => 'Sunteți sigur(ă)?',
+	'Privileges' => 'Privilegii',
 	'Create user' => 'Crează utilizator',
 	'User has been dropped.' => 'Utilizatorul a fost șters.',
 	'User has been altered.' => 'Utilizatorul a fost modificat.',
@@ -147,7 +146,7 @@ $translations = array(
 	'Functions' => 'Funcții',
 	'Aggregation' => 'Agregare',
 	'Export' => 'Export',
-	'Output' => 'Date de eșire',
+	'Output' => 'Date de ieșire',
 	'open' => 'deschide',
 	'save' => 'salvează',
 	'Format' => 'Format',
@@ -163,12 +162,12 @@ $translations = array(
 	'Events' => 'Evenimente',
 	'Schedule' => 'Program',
 	'Start' => 'Început',
-	'End' => 'Svârșit',
+	'End' => 'Sfârșit',
 	'Status' => 'Stare',
 	'On completion preserve' => 'Salvează după finisare',
 	'Tables and views' => 'Tabele și reprezentări',
 	'Data Length' => 'Cantitatea de date',
-	'Index Length' => 'Cantitatea de indexe',
+	'Index Length' => 'Cantitatea de indecși',
 	'Data Free' => 'Spațiu liber',
 	'Collation' => 'Colaționare',
 	'Analyze' => 'Analizează',
@@ -179,6 +178,7 @@ $translations = array(
 	'Tables have been truncated.' => 'Tabelele au fost curățate.',
 	'Rows' => 'Înscrieri',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'Tabelele au fost mutate.',
 	'Move to other database' => 'Mută în altă bază de date',
 	'Move' => 'Mută',
@@ -195,7 +195,7 @@ $translations = array(
 	'Values' => 'Parametru',
 	'%d row(s) have been imported.' => array('%d rînd importat.', '%d rînduri importate.'),
 	'Import' => 'Importă',
-	'Stop on error' => 'Opreștete la eroare',
+	'Stop on error' => 'Se oprește la greșeală',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Numărul maxim de înscrieri disponibile a fost atins. Majorați %s.',
 	'anywhere' => 'oriunde',
 	'%.3f s' => '%.3f s',
@@ -206,11 +206,11 @@ $translations = array(
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Coloanele ar trebui să aibă aceleaşi tipuri de date, trebuie să existe date de referinţă și un index pe coloanela-ţintă.',
 	'Relations' => 'Relații',
 	'Run file' => 'Execută fișier',
-	'Clear' => 'Curățp',
+	'Clear' => 'Curăță',
 	'Maximum allowed file size is %sB.' => 'Fișierul maxim admis - %sO.',
 	'Numbers' => 'Număr',
 	'Date and time' => 'Data și timpul',
-	'Strings' => 'Șire de caractere',
+	'Strings' => 'Șiruri de caractere',
 	'Binary' => 'Tip binar',
 	'Lists' => 'Liste',
 	'Editor' => 'Editor',
@@ -218,14 +218,13 @@ $translations = array(
 	'From' => 'De la',
 	'Subject' => 'Pentru',
 	'Send' => 'Trimite',
-	'%d e-mail(s) have been sent.' => array('A fost trimisă %d scrisoare.', 'Au fost trimise %d scrisori.'),
+	'%d e-mail(s) have been sent.' => array('A fost trimis %d mail.', 'Au fost trimise %d mail-uri.'),
 	'Webserver file %s' => 'Fișierul %s pe server',
-	'File does not exist.' => 'Așa fișier nu există.',
+	'File does not exist.' => 'Acest fișier nu există.',
 	'%d in total' => 'În total %d',
 	'Permanent login' => 'Logare permanentă',
-	'Databases have been dropped.' => 'Baze de date au fost șterse.',
+	'Databases have been dropped.' => 'Bazele de date au fost șterse.',
 	'Search data in tables' => 'Caută în tabele',
-	'schema' => 'schema',
 	'Schema' => 'Schema',
 	'Alter schema' => 'Modifică schema',
 	'Create schema' => 'Crează o schemă',
@@ -247,13 +246,13 @@ $translations = array(
 	'Use edit link to modify this value.' => 'Valoare poate fi modificată cu ajutorul butonului «modifică».',
 	'last' => 'ultima',
 	'From server' => 'De pe server',
-	'System' => 'Sistema',
+	'System' => 'Sistem',
 	'Select data' => 'Selectează',
 	'Show structure' => 'Arată structura',
 	'empty' => 'gol',
 	'Network' => 'Rețea',
 	'Geometry' => 'Geometrie',
-	'File exists.' => 'Fișierul deja există.',
+	'File exists.' => 'Fișierul există deja.',
 	'Attachments' => 'Fișiere atașate',
 	'%d query(s) executed OK.' => array('%d query executat.', '%d query-uri executate cu succes.'),
 	'Show only errors' => 'Arată doar greșeli',

adminer/lang/ru.inc.php

@@ -31,7 +31,6 @@ $translations = array(
 	'Alter database' => 'Изменить базу данных',
 	'Create database' => 'Создать базу данных',
 	'SQL command' => 'SQL запрос',
-	'Dump' => 'Дамп',
 	'Logout' => 'Выйти',
 	'database' => 'база данных',
 	'Use' => 'Выбрать',
@@ -42,14 +41,14 @@ $translations = array(
 	'Item%s has been inserted.' => 'Запись%s была вставлена.',
 	'Edit' => 'Редактировать',
 	'Insert' => 'Вставить',
-	'Save and insert next' => 'Сохранить и вставить еще',
+	'Save and insert next' => 'Сохранить и вставить ещё',
 	'Delete' => 'Стереть',
 	'Database' => 'База данных',
 	'Routines' => 'Хранимые процедуры и функции',
 	'Indexes have been altered.' => 'Индексы изменены.',
 	'Indexes' => 'Индексы',
 	'Alter indexes' => 'Изменить индексы',
-	'Add next' => 'Добавить еще',
+	'Add next' => 'Добавить ещё',
 	'Language' => 'Язык',
 	'Select' => 'Выбрать',
 	'New item' => 'Новая запись',
@@ -61,7 +60,7 @@ $translations = array(
 	'Action' => 'Действие',
 	'edit' => 'редактировать',
 	'Page' => 'Страница',
-	'Query executed OK, %d row(s) affected.' => array('Запрос завершен, изменена %d запись.', 'Запрос завершен, изменены %d записи.', 'Запрос завершен, изменено %d записей.'),
+	'Query executed OK, %d row(s) affected.' => array('Запрос завершён, изменена %d запись.', 'Запрос завершён, изменены %d записи.', 'Запрос завершён, изменено %d записей.'),
 	'Error in query' => 'Ошибка в запросe',
 	'Execute' => 'Выполнить',
 	'Table' => 'Таблица',
@@ -80,12 +79,12 @@ $translations = array(
 	'Routine has been called, %d row(s) affected.' => array('Была вызвана процедура, %d запись была изменена.', 'Была вызвана процедура, %d записи было изменено.', 'Была вызвана процедура, %d записей было изменено.'),
 	'Call' => 'Вызвать',
 	'No extension' => 'Нет расширений',
-	'None of the supported PHP extensions (%s) are available.' => 'Не доступно ни одного расширения из поддерживаемых (%s).',
+	'None of the supported PHP extensions (%s) are available.' => 'Недоступно ни одного расширения из поддерживаемых (%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 dropped.' => 'Внешний ключ был удалён.',
+	'Foreign key has been altered.' => 'Внешний ключ был изменён.',
 	'Foreign key has been created.' => 'Внешний ключ был создан.',
 	'Foreign key' => 'Внешний ключ',
 	'Target table' => 'Результирующая таблица',
@@ -106,7 +105,7 @@ $translations = array(
 	'Create view' => 'Создать представление',
 	'Name' => 'Название',
 	'Process list' => 'Список процессов',
-	'%d process(es) have been killed.' => array('Был завершен %d процесс.', 'Было завершено %d процесса.', 'Было завершёно %d процессов.'),
+	'%d process(es) have been killed.' => array('Был завершён %d процесс.', 'Было завершено %d процесса.', 'Было завершено %d процессов.'),
 	'Kill' => 'Завершить',
 	'Parameter name' => 'Название параметра',
 	'Database schema' => 'Схема базы данных',
@@ -119,8 +118,8 @@ $translations = array(
 	'Alter procedure' => 'Изменить процедуру',
 	'Return type' => 'Возвращаемый тип',
 	'Add trigger' => 'Добавить триггер',
-	'Trigger has been dropped.' => 'Триггер был удален.',
-	'Trigger has been altered.' => 'Триггер был изменен.',
+	'Trigger has been dropped.' => 'Триггер был удалён.',
+	'Trigger has been altered.' => 'Триггер был изменён.',
 	'Trigger has been created.' => 'Триггер был создан.',
 	'Alter trigger' => 'Изменить триггер',
 	'Create trigger' => 'Создать триггер',
@@ -132,8 +131,8 @@ $translations = array(
 	'Are you sure?' => 'Вы уверены?',
 	'Privileges' => 'Полномочия',
 	'Create user' => 'Создать пользователя',
-	'User has been dropped.' => 'Пользователь был удален.',
-	'User has been altered.' => 'Пользователь был изменен.',
+	'User has been dropped.' => 'Пользователь был удалён.',
+	'User has been altered.' => 'Пользователь был изменён.',
 	'User has been created.' => 'Пользователь был создан.',
 	'Hashed' => 'Хешировано',
 	'Column' => 'Колонка',
@@ -179,6 +178,7 @@ $translations = array(
 	'Tables have been truncated.' => 'Таблицы были очищены.',
 	'Rows' => 'Строк',
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'Таблицы были перемещены.',
 	'Move to other database' => 'Переместить в другую базу данных',
 	'Move' => 'Переместить',
@@ -207,7 +207,7 @@ $translations = array(
 	'Relations' => 'Реляции',
 	'Run file' => 'Запустить файл',
 	'Clear' => 'Очистить',
-	'Maximum allowed file size is %sB.' => 'Максимальный разрешенный размер файла - %sB.',
+	'Maximum allowed file size is %sB.' => 'Максимальный разрешённый размер файла - %sB.',
 	'Numbers' => 'Число',
 	'Date and time' => 'Дата и время',
 	'Strings' => 'Строки',
@@ -225,7 +225,6 @@ $translations = array(
 	'Permanent login' => 'Оставаться в системе',
 	'Databases have been dropped.' => 'Базы данных удалены.',
 	'Search data in tables' => 'Поиск в таблицах',
-	'schema' => 'схема',
 	'Schema' => 'Схема',
 	'Alter schema' => 'Изменить схему',
 	'Create schema' => 'Новая схема',
@@ -254,7 +253,7 @@ $translations = array(
 	'Network' => 'Сеть',
 	'Geometry' => 'Геометрия',
 	'File exists.' => 'Файл уже существует.',
-	'Attachments' => 'Прикрепленные файлы',
+	'Attachments' => 'Прикреплённые файлы',
 	'%d query(s) executed OK.' => array('%d запрос выполнен успешно.', '%d запроса выполнено успешно.', '%d запросов выполнено успешно.'),
 	'Show only errors' => 'Только ошибки',
 	'Refresh' => 'Обновить',

adminer/lang/sk.inc.php

@@ -32,7 +32,6 @@ $translations = array(
 	'Alter database' => 'Zmeniť databázu',
 	'Create database' => 'Vytvoriť databázu',
 	'SQL command' => 'SQL príkaz',
-	'Dump' => 'Export',
 	'Logout' => 'Odhlásiť',
 	'database' => 'databáza',
 	'Use' => 'Vybrať',
@@ -180,6 +179,7 @@ $translations = array(
 	'Data Free' => 'Voľné miesto',
 	'Rows' => 'Riadky',
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Analyze' => 'Analyzovať',
 	'Optimize' => 'Optimalizovať',
 	'Check' => 'Skontrolovať',
@@ -230,7 +230,6 @@ $translations = array(
 	'Schema has been dropped.' => 'Schéma bola odstránená.',
 	'Schema has been created.' => 'Schéma bola vytvorená.',
 	'Schema has been altered.' => 'Schéma bola zmenená.',
-	'schema' => 'schéma',
 	'Schema' => 'Schéma',
 	'Sequences' => 'Sekvencia',
 	'Create sequence' => 'Vytvoriť sekvenciu',

adminer/lang/sl.inc.php

@@ -65,7 +65,6 @@ $translations = array(
 	'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',
-	'Dump' => 'Izvozi',
 	'Output' => 'Izhod rezultata',
 	'open' => 'odpri',
 	'save' => 'shrani',
@@ -89,6 +88,7 @@ $translations = array(
 	
 	// thousands separator - must contain single byte
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Engine' => 'Pogon',
 	'Collation' => 'Zbiranje',
 	'Data Length' => 'Velikost podatkov',
@@ -288,7 +288,6 @@ $translations = array(
 	'Schema has been dropped.' => 'Shema je zavržena.',
 	'Schema has been created.' => 'Shema je ustvarjena.',
 	'Schema has been altered.' => 'Shema je spremenjena.',
-	'schema' => 'shema',
 	'Schema' => 'Shema',
 	'Invalid schema.' => 'Neveljavna shema.',
 	

adminer/lang/sr.inc.php

@@ -66,7 +66,6 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Превелики POST податак. Морате да смањите податак или повећајте вредност конфигурационе директиве %s.',
 
 	'Export' => 'Извоз',
-	'Dump' => 'Истовар',
 	'Output' => 'Испис',
 	'open' => 'отвори',
 	'save' => 'сачувај',
@@ -93,6 +92,7 @@ $translations = array(
 
 	// thousands separator - must contain single byte
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Engine' => 'Механизам',
 	'Collation' => 'Сравњивање',
 	'Data Length' => 'Дужина података',
@@ -300,7 +300,6 @@ $translations = array(
 	'Schema has been dropped.' => 'Шема је избрисана.',
 	'Schema has been created.' => 'Шема је креирана.',
 	'Schema has been altered.' => 'Шема је измењена.',
-	'schema' => 'шема',
 	'Schema' => 'Шема',
 	'Invalid schema.' => 'Шема није исправна.',
 

adminer/lang/ta.inc.php

@@ -31,7 +31,6 @@ $translations = array(
 	'Alter database' => 'த‌க‌வ‌ல்த‌ள‌த்தை மாற்று',
 	'Create database' => 'த‌க‌வ‌ல்த‌ள‌த்தை உருவாக்கு',
 	'SQL command' => 'SQL க‌ட்ட‌ளை',
-	'Dump' => 'Dump',
 	'Logout' => 'வெளியேறு',
 	'database' => 'த‌க‌வ‌ல்த‌ள‌ம்',
 	'Use' => 'உப‌யோகி',
@@ -176,6 +175,7 @@ $translations = array(
 	'Tables have been truncated.' => 'அட்ட‌வ‌ணை குறைக்க‌ப்ப‌ட்ட‌து (truncated).',
 	'Rows' => 'வ‌ரிசைக‌ள்',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'அட்ட‌வ‌ணை ந‌க‌ர்த்த‌ப்ப‌ட்ட‌து.',
 	'Move to other database' => 'ம‌ற்ற‌ த‌க‌வ‌ல் தள‌த்திற்க்கு ந‌க‌ர்த்து',
 	'Move' => 'ந‌க‌ர்த்து',
@@ -246,7 +246,6 @@ $translations = array(
 	'System' => 'சிஸ்ட‌ம் (System)',
 	'anywhere' => 'எங்காயினும்',
 	'empty' => 'வெறுமை (empty)',
-	'schema' => 'அமைப்புமுறை',
 	'No extension' => 'விரிவு (extensஇஒன்) இல்லை ',
 	'Databases have been dropped.' => 'த‌க‌வ‌ல் த‌ள‌ங்க‌ள் நீக்க‌ப்ப‌ட்டன‌.',
 	'%s version: %s through PHP extension %s' => '%s ப‌திப்பு: %s through PHP extension %s',

adminer/lang/th.inc.php

@@ -31,7 +31,6 @@ $translations = array(
 	'Alter database' => 'เปลี่ยนแปลงฐานข้อมูล',
 	'Create database' => 'สร้างฐานข้อมูล',
 	'SQL command' => 'คำสั่ง SQL',
-	'Dump' => 'ส่งออก',
 	'Logout' => 'ออกจากระบบ',
 	'database' => 'ฐานข้อมูล',
 	'Use' => 'ใช้งาน',
@@ -179,6 +178,7 @@ $translations = array(
 	'Tables have been truncated.' => 'เคลียร์ตารางแล้ว (truncate).',
 	'Rows' => 'แถว',
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'ตารางถูกย้ายแล้ว.',
 	'Move to other database' => 'ย้ายไปยังฐานข้อมูลอื่น',
 	'Move' => 'ย้าย',
@@ -225,7 +225,6 @@ $translations = array(
 	'Permanent login' => 'จดจำการเข้าสู่ระบบตลอดไป',
 	'Databases have been dropped.' => 'ฐานข้อมูลถูกลบแล้ว.',
 	'Search data in tables' => 'ค้นหาในตาราง',
-	'schema' => 'schema',
 	'Schema' => 'Schema',
 	'Alter schema' => 'เปลี่ยนแปลง schema',
 	'Create schema' => 'สร้าง schema',

adminer/lang/tr.inc.php

@@ -66,7 +66,6 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Çok büyük POST verisi, veriyi azaltın ya da %s ayar yönergesini uygun olarak yapılandırın.',
 
 	'Export' => 'Dışarı Aktar',
-	'Dump' => 'Döküm',
 	'Output' => 'Çıktı',
 	'open' => 'aç',
 	'save' => 'kaydet',
@@ -93,6 +92,7 @@ $translations = array(
 
 	// thousands separator - must contain single byte
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Engine' => 'Motor',
 	'Collation' => 'Karşılaştırma',
 	'Data Length' => 'Veri Uzunluğu',
@@ -300,7 +300,6 @@ $translations = array(
 	'Schema has been dropped.' => 'Şema silindi.',
 	'Schema has been created.' => 'Şema oluşturuldu.',
 	'Schema has been altered.' => 'Şema değiştirildi.',
-	'schema' => 'şema',
 	'Schema' => 'Şema',
 	'Invalid schema.' => 'Geçersiz şema.',
 

adminer/lang/uk.inc.php

@@ -66,7 +66,6 @@ $translations = array(
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Занадто великий об\'єм POST-даних. Зменшіть об\'єм або збільшіть параметр директиви %s конфигурації.',
 	
 	'Export' => 'Експорт',
-	'Dump' => 'Дамп',
 	'Output' => 'Вихідні дані',
 	'open' => 'відкрити',
 	'save' => 'зберегти',
@@ -93,6 +92,7 @@ $translations = array(
 	
 	// thousands separator - must contain single byte
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Engine' => 'Рушій',
 	'Collation' => 'Співставлення',
 	'Data Length' => 'Об\'єм даних',
@@ -297,7 +297,6 @@ $translations = array(
 	'Schema has been dropped.' => 'Схему було видалено.',
 	'Schema has been created.' => 'Схему було створено.',
 	'Schema has been altered.' => 'Схему було змінено.',
-	'schema' => 'схема',
 	'Schema' => 'Схема',
 	'Invalid schema.' => 'Невірна схема.',
 	

adminer/lang/vi.inc.php

@@ -0,0 +1,329 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'Hệ thống',
+	'Server' => 'Máy chủ',
+	'Username' => 'Tên người dùng',
+	'Password' => 'Mật khẩu',
+	'Permanent login' => 'Giữ đăng nhập một thời gian',
+	'Login' => 'Đăng nhập',
+	'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.',
+	'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="http://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Mật khẩu đã hết hạn. <a href="http://www.adminer.org/en/extension/" target="_blank">Thử cách làm</a> để giữ cố định.',
+	'Language' => 'Ngôn ngữ',
+	'Invalid CSRF token. Send the form again.' => 'Mã kiểm tra CSRF sai, hãy nhập lại biểu mẫu.',
+	'No extension' => 'Không có phần mở rộng',
+	'None of the supported PHP extensions (%s) are available.' => 'Bản cài đặt PHP thiếu hỗ trợ cho %s.',
+	'Session support must be enabled.' => 'Cần phải bật session.',
+	'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.',
+	'User has been altered.' => 'Đã sửa người dùng.',
+	'User has been created.' => 'Đã tạo người dùng.',
+	'Hashed' => 'Mã hoá',
+	'Column' => 'Cột',
+	'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.',
+	'No commands to execute.' => 'Chẳng có gì để thực hiện!.',
+	'Error in query' => 'Có lỗi trong câu lệnh',
+	'Execute' => 'Thực hiện',
+	'Stop on error' => 'Dừng khi có lỗi',
+	'Show only errors' => 'Chỉ hiện lỗi',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'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ủ',
+	'Run file' => 'Chạy tệp',
+	'File does not exist.' => 'Tệp không tồn tại.',
+	'File uploads are disabled.' => 'Chức năng tải tệp lên đã bị cấm.',
+	'Unable to upload a file.' => 'Không thể tải tệp lên.',
+	'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',
+	'Select database' => 'Chọn CSDL',
+	'Invalid database.' => 'CSDL sai.',
+	'Create new database' => 'Tạo CSDL',
+	'Database has been dropped.' => 'CSDL đã bị xoá.',
+	'Databases have been dropped.' => 'Các CSDL đã bị xoá.',
+	'Database has been created.' => 'Đã tạo CSDL.',
+	'Database has been renamed.' => 'Đã đổi tên CSDL.',
+	'Database has been altered.' => 'Đã thay đổi CSDL.',
+	'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',
+	'Engine' => 'Cơ chế lưu trữ',
+	'Collation' => 'Bộ mã',
+	'Data Length' => 'Kích thước dữ liệu',
+	'Index Length' => 'Kích thước chỉ mục',
+	'Data Free' => 'Dữ liệu trống',
+	'Rows' => 'Số dòng',
+	'%d in total' => '%s',
+	'Analyze' => 'Phân tích',
+	'Optimize' => 'Tối ưu',
+	'Vacuum' => 'Dọn dẹp',
+	'Check' => 'Kiểm tra',
+	'Repair' => 'Sửa chữa',
+	'Truncate' => 'Làm rỗng',
+	'Tables have been truncated.' => 'Bảng đã bị làm rỗng.',
+	'Move to other database' => 'Chuyển tới cơ sở dữ liệu khác',
+	'Move' => 'Chuyển đi',
+	'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',
+	'Parameter name' => 'Tham số',
+	'Create procedure' => 'Tạo lệnh',
+	'Create function' => 'Tạo hàm',
+	'Routine has been dropped.' => 'Đã xoá routine.',
+	'Routine has been altered.' => 'Đã thay đổi routine.',
+	'Routine has been created.' => 'Đã tạo routine.',
+	'Alter function' => 'Thay đổi hàm',
+	'Alter procedure' => 'Thay đổi thủ tục',
+	'Return type' => 'Giá trị trả về',
+	'Events' => 'Sự kiện',
+	'Event has been dropped.' => 'Đã xoá sự kiện.',
+	'Event has been altered.' => 'Đã thay đổi sự kiện.',
+	'Event has been created.' => 'Đã tạo sự kiện.',
+	'Alter event' => 'Sửa sự kiện',
+	'Create event' => 'Tạo sự kiện',
+	'At given time' => 'Vào thời gian xác định',
+	'Every' => 'Mỗi',
+	'Schedule' => 'Đặt lịch',
+	'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',
+	'No tables.' => 'Không có bảng nào.',
+	'Alter table' => 'Sửa bảng',
+	'Create table' => 'Tạo bảng',
+	'Table has been dropped.' => 'Bảng đã bị xoá.',
+	'Tables have been dropped.' => 'Các bảng đã bị xoá.',
+	'Tables have been optimized.' => 'Bảng đã được tối ưu.',
+	'Table has been altered.' => 'Bảng đã thay đổi.',
+	'Table has been created.' => 'Bảng đã được tạo.',
+	'Table name' => 'Tên bảng',
+	'Show structure' => 'Hiện cấu trúc',
+	'engine' => 'cơ chế lưu trữ',
+	'collation' => 'bảng mã',
+	'Column name' => 'Tên cột',
+	'Type' => 'Loại',
+	'Length' => 'Độ dài',
+	'Auto Increment' => 'Tăng tự động',
+	'Options' => 'Tuỳ chọn',
+	'Comment' => 'Chú thích',
+	'Default values' => 'Giá trị mặc định',
+	'Drop' => 'Xoá',
+	'Are you sure?' => 'Bạn có chắc',
+	'Size' => 'Kích thước',
+	'Compute' => 'Tính',
+	'Move up' => 'Chuyển lên trên',
+	'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á.',
+	'Foreign key has been altered.' => 'Khoá ngoại đã được sửa.',
+	'Foreign key has been created.' => 'Khoá ngoại đã được tạo.',
+	'Target table' => 'Bảng đích',
+	'Change' => 'Thay đổi',
+	'Source' => 'Nguồn',
+	'Target' => 'Đích',
+	'Add column' => 'Thêm cột',
+	'Alter' => 'Sửa',
+	'Add foreign key' => 'Thêm khoá ngoại',
+	'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' => 'xx',
+	'Add trigger' => 'xx',
+	'Trigger has been dropped.' => 'Đã xoá phản xạ.',
+	'Trigger has been altered.' => 'Đã sửa phản xạ.',
+	'Trigger has been created.' => 'Đã tạo phản xạ.',
+	'Alter trigger' => 'Sửa phản xạ',
+	'Create trigger' => 'Tạo phản xạ',
+	'Time' => 'Thời gian',
+	'Event' => 'Sự kiện',
+	'Name' => 'Tên',
+	
+	'select' => 'xem',
+	'Select' => 'Xem',
+	'Select data' => 'Xem dữ liệu',
+	'Functions' => 'Các chức năng',
+	'Aggregation' => 'Tổng hợp',
+	'Search' => 'Tìm kiếm',
+	'anywhere' => 'bất cứ đâu',
+	'Search data in tables' => 'Tìm kiếm dữ liệu trong các bảng',
+	'Sort' => 'Sắp xếp',
+	'descending' => 'giảm dần',
+	'Limit' => 'Giới hạn',
+	'Text length' => 'Chiều dài văn bản',
+	'Action' => 'Hành động',
+	'Full table scan' => 'Quét toàn bộ bảng',
+	'Unable to select the table' => 'Không thể xem dữ liệu',
+	'No rows.' => 'Không có dòng dữ liệu nào.',
+	'%d row(s)' => '%s dòng',
+	'Page' => 'trang',
+	'last' => 'cuối',
+	'Load more data' => 'Xem thêm dữ liệu',
+	'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á.',
+	'Item has been updated.' => 'Đã cập nhật.',
+	'%d item(s) have been affected.' => '%d phần đã thay đổi.',
+	'New item' => 'Thêm',
+	'original' => 'bản gốc',
+	// label for value '' in enum data type
+	'empty' => 'trống',
+	'edit' => 'sửa',
+	'Edit' => 'Sửa',
+	'Insert' => 'Thêm',
+	'Save' => 'Lưu',
+	'Save and continue edit' => 'Lưu và tiếp tục sửa',
+	'Save and insert next' => 'Lưu và thêm tiếp',
+	'Selected' => 'Chọn',
+	'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ờ',
+	'Strings' => 'Chuỗi',
+	'Binary' => 'Mã máy',
+	'Lists' => 'Danh sách',
+	'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',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => '[yyyy]-mm-dd',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'HH:MM:SS',
+	'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',
+	'Schema has been dropped.' => 'Đã xoá schema.',
+	'Schema has been created.' => 'Đã tạo schema.',
+	'Schema has been altered.' => 'Đã thay đổi schema.',
+	'Schema' => 'schema',
+	'Invalid schema.' => 'Schema khong hợp lệ.',
+	
+	// PostgreSQL sequences support
+	'Sequences' => 'Dãy số',
+	'Create sequence' => 'Tạo đãy số',
+	'Sequence has been dropped.' => 'Dãy số đã bị xoá.',
+	'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',
+);

adminer/lang/xx.inc.php

@@ -11,6 +11,7 @@ $translations = array(
 	'Logged as: %s' => 'xx',
 	'Logout successful.' => 'xx',
 	'Invalid credentials.' => 'xx',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('xx', 'xx'),
 	'Master password expired. <a href="http://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'xx',
 	'Language' => 'xx',
 	'Invalid CSRF token. Send the form again.' => 'xx',
@@ -66,9 +67,9 @@ $translations = array(
 	'Maximum allowed file size is %sB.' => 'xx',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'xx',
 	'You can upload a big SQL file via FTP and import it from server.' => 'xx',
+	'You are offline.' => 'xx',
 	
 	'Export' => 'xx',
-	'Dump' => 'xx',
 	'Output' => 'xx',
 	'open' => 'xx',
 	'save' => 'xx',
@@ -94,7 +95,8 @@ $translations = array(
 	'Permanent link' => 'xx',
 	
 	// thousands separator - must contain single byte
-	',' => 'xx',
+	',' => 'x',
+	'0123456789' => 'xxxxxxxxxx',
 	'Engine' => 'xx',
 	'Collation' => 'xx',
 	'Data Length' => 'xx',
@@ -162,9 +164,12 @@ $translations = array(
 	'Auto Increment' => 'xx',
 	'Options' => 'xx',
 	'Comment' => 'xx',
+	'Default value' => 'xx',
 	'Default values' => 'xx',
 	'Drop' => 'xx',
 	'Are you sure?' => 'xx',
+	'Size' => 'xx',
+	'Compute' => 'xx',
 	'Move up' => 'xx',
 	'Move down' => 'xx',
 	'Remove' => 'xx',
@@ -176,11 +181,13 @@ $translations = array(
 	'Values' => 'xx',
 	
 	'View' => 'xx',
+	'Materialized View' => 'xx',
 	'View has been dropped.' => 'xx',
 	'View has been altered.' => 'xx',
 	'View has been created.' => 'xx',
 	'Alter view' => 'xx',
 	'Create view' => 'xx',
+	'Create materialized view' => 'xx',
 	
 	'Indexes' => 'xx',
 	'Indexes have been altered.' => 'xx',
@@ -227,11 +234,13 @@ $translations = array(
 	'Sort' => 'xx',
 	'descending' => 'xx',
 	'Limit' => 'xx',
+	'Limit rows' => 'xx',
 	'Text length' => 'xx',
 	'Action' => 'xx',
 	'Full table scan' => 'xx',
 	'Unable to select the table' => 'xx',
 	'No rows.' => 'xx',
+	'%d / ' => 'xx',
 	'%d row(s)' => array('xx', 'xx'),
 	'Page' => 'xx',
 	'last' => 'xx',
@@ -307,7 +316,6 @@ $translations = array(
 	'Schema has been dropped.' => 'xx',
 	'Schema has been created.' => 'xx',
 	'Schema has been altered.' => 'xx',
-	'schema' => 'xx',
 	'Schema' => 'xx',
 	'Invalid schema.' => 'xx',
 	

adminer/lang/zh-tw.inc.php

@@ -30,7 +30,6 @@ $translations = array(
 	'Alter database' => '修改資料庫',
 	'Create database' => '建立資料庫',
 	'SQL command' => 'SQL命令',
-	'Dump' => '匯出',
 	'Logout' => '登出',
 	'database' => '資料庫',
 	'Use' => '使用',
@@ -174,6 +173,7 @@ $translations = array(
 	'Data Free' => '資料空閒',
 	'Rows' => '行數',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Analyze' => '分析',
 	'Optimize' => '最佳化',
 	'Check' => '檢查',
@@ -225,7 +225,6 @@ $translations = array(
 	'Table has been dropped.' => '已經刪除資料表。',
 	'Databases have been dropped.' => '資料庫已刪除。',
 	'Search data in tables' => '在資料庫搜尋',
-	'schema' => '資料表結構',
 	'Schema' => '資料表結構',
 	'Alter schema' => '修改資料表結構',
 	'Create schema' => '建立資料表結構',

adminer/lang/zh.inc.php

@@ -31,7 +31,6 @@ $translations = array(
 	'Alter database' => '修改数据库',
 	'Create database' => '创建数据库',
 	'SQL command' => 'SQL命令',
-	'Dump' => '导出',
 	'Logout' => '注销',
 	'database' => '数据库',
 	'Use' => '使用',
@@ -176,6 +175,7 @@ $translations = array(
 	'Data Free' => '数据空闲',
 	'Rows' => '行数',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Analyze' => '分析',
 	'Optimize' => '优化',
 	'Check' => '检查',
@@ -225,7 +225,6 @@ $translations = array(
 	'Permanent login' => '保持登录',
 	'Databases have been dropped.' => '已删除数据库。',
 	'Search data in tables' => '在表中搜索数据',
-	'schema' => '模式',
 	'Schema' => '模式',
 	'Alter schema' => '修改模式',
 	'Create schema' => '创建模式',

adminer/processlist.inc.php

@@ -2,7 +2,7 @@
 if (support("kill") && $_POST && !$error) {
 	$killed = 0;
 	foreach ((array) $_POST["kill"] as $val) {
-		if (queries("KILL " . (+$val))) {
+		if (queries("KILL " . number($val))) {
 			$killed++;
 		}
 	}

adminer/schema.inc.php

@@ -3,8 +3,7 @@ page_header(lang('Database schema'), "", array(), h(DB . ($_GET["ns"] ? ".$_GET[
 
 $table_pos = array();
 $table_pos_js = array();
-$name = "adminer_schema";
-$SCHEMA = ($_GET["schema"] ? $_GET["schema"] : $_COOKIE[($_COOKIE["$name-" . DB] ? "$name-" . DB : $name)]); // $_COOKIE["adminer_schema"] was used before 3.2.0 //! ':' in table name
+$SCHEMA = ($_GET["schema"] ? $_GET["schema"] : $_COOKIE["adminer_schema-" . str_replace(".", "_", DB)]); // $_COOKIE["adminer_schema"] was used before 3.2.0 //! ':' in table name
 preg_match_all('~([^:]+):([-0-9.]+)x([-0-9.]+)(_|$)~', $SCHEMA, $matches, PREG_SET_ORDER);
 foreach ($matches as $i => $match) {
 	$table_pos[$match[1]] = array($match[2], $match[3]);

adminer/script.inc.php

@@ -4,16 +4,15 @@ header("Content-Type: text/javascript; charset=utf-8");
 if ($_GET["script"] == "db") {
 	$sums = array("Data_length" => 0, "Index_length" => 0, "Data_free" => 0);
 	foreach (table_status() as $name => $table_status) {
-		$id = js_escape($name);
-		json_row("Comment-$id", nbsp($table_status["Comment"]));
+		json_row("Comment-$name", nbsp($table_status["Comment"]));
 		if (!is_view($table_status)) {
 			foreach (array("Engine", "Collation") as $key) {
-				json_row("$key-$id", nbsp($table_status[$key]));
+				json_row("$key-$name", nbsp($table_status[$key]));
 			}
 			foreach ($sums + array("Auto_increment" => 0, "Rows" => 0) as $key => $val) {
 				if ($table_status[$key] != "") {
-					$val = number_format($table_status[$key], 0, '.', lang(','));
-					json_row("$key-$id", ($key == "Rows" && $val && $table_status["Engine"] == ($sql == "pgsql" ? "table" : "InnoDB")
+					$val = format_number($table_status[$key]);
+					json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == ($sql == "pgsql" ? "table" : "InnoDB")
 						? "~ $val"
 						: $val
 					));
@@ -22,22 +21,23 @@ if ($_GET["script"] == "db") {
 						$sums[$key] += ($table_status["Engine"] != "InnoDB" || $key != "Data_free" ? $table_status[$key] : 0);
 					}
 				} elseif (array_key_exists($key, $table_status)) {
-					json_row("$key-$id");
+					json_row("$key-$name");
 				}
 			}
 		}
 	}
 	foreach ($sums as $key => $val) {
-		json_row("sum-$key", number_format($val, 0, '.', lang(',')));
+		json_row("sum-$key", format_number($val));
 	}
 	json_row("");
 
 } elseif ($_GET["script"] == "kill") {
-	$connection->query("KILL " . (+$_POST["kill"]));
+	$connection->query("KILL " . number($_POST["kill"]));
 
 } else { // connect
 	foreach (count_tables($adminer->databases()) as $db => $val) {
-		json_row("tables-" . js_escape($db), $val);
+		json_row("tables-$db", $val);
+		json_row("size-$db", db_size($db));
 	}
 	json_row("");
 }

adminer/select.inc.php

@@ -52,7 +52,11 @@ if ($_GET["val"] && is_ajax()) {
 if ($_POST && !$error) {
 	$where_check = $where;
 	if (!$_POST["all"] && is_array($_POST["check"])) {
-		$where_check[] = "((" . implode(") OR (", array_map('where_check', $_POST["check"])) . "))";
+		$checks = array();
+		foreach ($_POST["check"] as $check) {
+			$checks[] = where_check($check, $fields);
+		}
+		$where_check[] = "((" . implode(") OR (", $checks) . "))";
 	}
 	$where_check = ($where_check ? "\nWHERE " . implode(" AND ", $where_check) : "");
 	$primary = $unselected = null;
@@ -139,7 +143,11 @@ if ($_POST && !$error) {
 				}
 			}
 			queries_redirect(remove_from_uri($_POST["all"] && $_POST["delete"] ? "page" : ""), $message, $result);
-			//! display edit page in case of an error
+			if (!$_POST["delete"]) {
+				edit_form($TABLE, $fields, (array) $_POST["fields"], !$_POST["clone"]);
+				page_footer();
+				exit;
+			}
 
 		} elseif (!$_POST["import"]) { // modify
 			if (!$_POST["val"]) {
@@ -352,7 +360,8 @@ if (!$columns && support("table")) {
 				$unique_idf = "";
 				foreach ($unique_array as $key => $val) {
 					if (($jush == "sql" || $jush == "pgsql") && strlen($val) > 64) {
-						$key = "MD5(" . (strpos($key, '(') ? $key : idf_escape($key)) . ")"; //! columns looking like functions
+						$key = (strpos($key, '(') ? $key : idf_escape($key)); //! columns looking like functions
+						$key = "MD5(" . ($jush == 'sql' && preg_match("~^utf8_~", $fields[$key]["collation"]) ? $key : "CONVERT($key USING " . charset($connection) . ")") . ")";
 						$val = md5($val);
 					}
 					$unique_idf .= "&" . ($val !== null ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val) : "null%5B%5D=" . urlencode($key));
@@ -462,7 +471,7 @@ if (!$columns && support("table")) {
 						);
 					}
 					echo (($found_rows === false ? count($rows) + 1 : $found_rows - $page * $limit) > $limit
-						? ' <a href="' . h(remove_from_uri("page") . "&page=" . ($page + 1)) . '" onclick="return !selectLoadMore(this, ' . (+$limit) . ', \'' . lang('Loading') . '...\');">' . lang('Load more data') . '</a>'
+						? ' <a href="' . h(remove_from_uri("page") . "&page=" . ($page + 1)) . '" onclick="return !selectLoadMore(this, ' . (+$limit) . ', \'' . lang('Loading') . '...\');" class="loadmore">' . lang('Load more data') . '</a>'
 						: ''
 					);
 				} else {

adminer/sql.inc.php

@@ -39,7 +39,7 @@ if (!$error && $_POST) {
 			$q = $query . (preg_match("~;[ \t\r\n]*\$~", $query) ? "" : ";"); //! doesn't work with DELIMITER |
 			if (!$history || reset(end($history)) != $q) { // no repeated queries
 				restart_session();
-				$history[] = array($q, time());
+				$history[] = array($q, time()); //! add elapsed time
 				set_session("queries", $history_all); // required because reference is unlinked by stop_session()
 				stop_session();
 			}
@@ -108,8 +108,7 @@ if (!$error && $_POST) {
 
 						do {
 							$result = $connection->store_result();
-							$end = microtime(true);
-							$time = " <span class='time'>(" . format_time($start, $end) . ")</span>"
+							$time = " <span class='time'>(" . format_time($start) . ")</span>"
 								. (strlen($q) < 1000 ? " <a href='" . h(ME) . "sql=" . urlencode(trim($q)) . "'>" . lang('Edit') . "</a>" : "") // 1000 - maximum length of encoded URL in IE is 2083 characters
 							;
 
@@ -122,10 +121,13 @@ if (!$error && $_POST) {
 								}
 
 							} elseif (is_object($result)) {
-								$orgtables = select($result, $connection2);
+								$limit = $_POST["limit"];
+								$orgtables = select($result, $connection2, array(), $limit);
 								if (!$_POST["only_errors"]) {
 									echo "<form action='' method='post'>\n";
-									echo "<p>" . ($result->num_rows ? lang('%d row(s)', $result->num_rows) : "") . $time;
+									$num_rows = $result->num_rows;
+									echo "<p>" . ($num_rows ? ($limit && $num_rows > $limit ? lang('%d / ', $limit) : "") . lang('%d row(s)', $num_rows) : "");
+									echo $time;
 									$id = "export-$commands";
 									$export = ", <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('Export') . "</a><span id='$id' class='hidden'>: "
 										. html_select("output", $adminer->dumpOutput(), $adminer_export["output"]) . " "
@@ -156,7 +158,7 @@ if (!$error && $_POST) {
 								}
 							}
 
-							$start = $end;
+							$start = microtime(true);
 						} while ($connection->next_result());
 
 						$line += substr_count($q.$found, "\n");
@@ -172,7 +174,7 @@ if (!$error && $_POST) {
 			echo "<p class='message'>" . lang('No commands to execute.') . "\n";
 		} elseif ($_POST["only_errors"]) {
 			echo "<p class='message'>" . lang('%d query(s) executed OK.', $commands - count($errors));
-			echo " <span class='time'>(" . format_time($total_start, microtime(true)) . ")</span>\n";
+			echo " <span class='time'>(" . format_time($total_start) . ")</span>\n";
 		} elseif ($errors && $commands > 1) {
 			echo "<p class='error'>" . lang('Error in query') . ": " . implode("", $errors) . "\n";
 		}
@@ -200,14 +202,14 @@ if (!isset($_GET["import"])) {
 	textarea("query", $q, 20);
 	echo ($_POST ? "" : "<script type='text/javascript'>focus(document.getElementsByTagName('textarea')[0]);</script>\n");
 	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>";
 	echo (ini_bool("file_uploads")
-		? '<input type="file" name="sql_file[]" multiple> (&lt; ' . ini_get("upload_max_filesize") . 'B)' // ignore post_max_size because it is for all form fields together and bytes computing would be necessary
+		? "SQL (&lt; " . ini_get("upload_max_filesize") . "B): <input type='file' name='sql_file[]' multiple>\n$execute" // ignore post_max_size because it is for all form fields together and bytes computing would be necessary
 		: lang('File uploads are disabled.')
 	);
-	echo "\n$execute";
 	echo "</div></fieldset>\n";
 	echo "<fieldset><legend>" . lang('From server') . "</legend><div>";
 	echo lang('Webserver file %s', "<code>adminer.sql" . (extension_loaded("zlib") ? "[.gz]" : "") . "</code>");
@@ -224,8 +226,13 @@ if (!isset($_GET["import"]) && $history) {
 	print_fieldset("history", lang('History'), $_GET["history"] != "");
 	for ($val = end($history); $val; $val = prev($history)) { // not array_reverse() to save memory
 		$key = key($history);
-		list($q, $time) = $val;
-		echo '<a href="' . h(ME . "sql=&history=$key") . '">' . lang('Edit') . "</a> <span class='time' title='" . @date('Y-m-d', $time) . "'>" . @date("H:i:s", $time) . "</span> <code class='jush-$jush'>" . shorten_utf8(ltrim(str_replace("\n", " ", str_replace("\r", "", preg_replace('~^(#|-- ).*~m', '', $q)))), 80, "</code>") . "<br>\n"; // @ - time zone may be not set
+		list($q, $time, $elapsed) = $val;
+		echo '<a href="' . h(ME . "sql=&history=$key") . '">' . lang('Edit') . "</a>"
+			. " <span class='time' title='" . @date('Y-m-d', $time) . "'>" . @date("H:i:s", $time) . "</span>" // @ - time zone may be not set
+			. " <code class='jush-$jush'>" . shorten_utf8(ltrim(str_replace("\n", " ", str_replace("\r", "", preg_replace('~^(#|-- ).*~m', '', $q)))), 80, "</code>")
+			. ($elapsed ? " <span class='time'>($elapsed)</span>" : "")
+			. "<br>\n"
+		;
 	}
 	echo "<input type='submit' name='clear' value='" . lang('Clear') . "'>\n";
 	echo "<a href='" . h(ME . "sql=&history=all") . "'>" . lang('Edit all') . "</a>\n";

adminer/static/default.css

@@ -58,6 +58,7 @@ input.required { box-shadow: 1px 1px 1px red; }
 .pages { position: fixed; bottom: 0; left: 21em; padding: 5px; background: #ddf; border: 1px solid #999; }
 .links a { white-space: nowrap; margin-right: 20px; }
 .logout { margin-top: .5em; position: absolute; top: 0; right: 0; }
+.loadmore { margin-left: 1ex; }
 #menu { position: absolute; margin: 10px 0 0; padding: 0 0 30px 0; top: 2em; left: 0; width: 19em; }
 #menu p { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
 #dbs { overflow: hidden; }

adminer/static/editing.js

@@ -66,7 +66,9 @@ function typePassword(el, disable) {
 function loginDriver(driver) {
 	var trs = parentTag(driver, 'table').rows;
 	for (var i=1; i < trs.length - 1; i++) {
-		alterClass(trs[i], 'hidden', /sqlite/.test(driver.value));
+		var disabled = /sqlite/.test(driver.value);
+		alterClass(trs[i], 'hidden', disabled);
+		trs[i].getElementsByTagName('input')[0].disabled = disabled;
 	}
 }
 
@@ -310,7 +312,7 @@ function editingTypeChange(type) {
 			alterClass(el, 'hidden', !/((^|[^o])int|float|double|decimal)$/.test(text));
 		}
 		if (el.name == name + '[on_update]') {
-			alterClass(el, 'hidden', text != 'timestamp');
+			alterClass(el, 'hidden', !/timestamp|datetime/.test(text)); // MySQL supports datetime since 5.6.5
 		}
 		if (el.name == name + '[on_delete]') {
 			alterClass(el, 'hidden', !/`/.test(text));
@@ -486,6 +488,21 @@ function indexesAddColumn(field, prefix) {
 
 
 
+/** Handle changing trigger time or event
+* @param RegExp
+* @param string
+* @param HTMLFormElement
+*/
+function triggerChange(tableRe, table, form) {
+	var formEvent = selectValue(form['Event']);
+	if (tableRe.test(form['Trigger'].value)) {
+		form['Trigger'].value = table + '_' + (selectValue(form['Timing']).charAt(0) + formEvent.charAt(0)).toLowerCase();
+	}
+	alterClass(form['Of'], 'hidden', formEvent != 'UPDATE OF');
+}
+
+
+
 var that, x, y; // em and tablePos defined in schema.inc.php
 
 /** Get mouse position
@@ -563,6 +580,8 @@ function schemaMouseup(ev, db) {
 	}
 }
 
+
+
 var helpOpen, helpIgnore; // when mouse outs <option> then it mouse overs border of <select> - ignore it
 
 /** Display help
@@ -582,8 +601,9 @@ function helpMouseover(el, event, text, side) {
 		jush.highlight_tag([ help ]);
 		alterClass(help, 'hidden');
 		var rect = target.getBoundingClientRect();
-		help.style.top = (rect.top - (side ? (help.offsetHeight - target.offsetHeight) / 2 : help.offsetHeight)) + 'px';
-		help.style.left = (rect.left - (side ? help.offsetWidth : (help.offsetWidth - target.offsetWidth) / 2)) + 'px';
+		var body = document.documentElement;
+		help.style.top = (body.scrollTop + rect.top - (side ? (help.offsetHeight - target.offsetHeight) / 2 : help.offsetHeight)) + 'px';
+		help.style.left = (body.scrollLeft + rect.left - (side ? help.offsetWidth : (help.offsetWidth - target.offsetWidth) / 2)) + 'px';
 	}
 }
 

adminer/static/functions.js

@@ -5,7 +5,9 @@
 * @param [bool]
 */
 function alterClass(el, className, enable) {
-	el.className = el.className.replace(RegExp('(^|\\s)' + className + '(\\s|$)'), '$2') + (enable ? ' ' + className : '');
+	if (el) {
+		el.className = el.className.replace(RegExp('(^|\\s)' + className + '(\\s|$)'), '$2') + (enable ? ' ' + className : '');
+	}
 }
 
 /** Toggle visibility
@@ -95,7 +97,7 @@ function parentTag(el, tag) {
 function trCheck(el) {
 	var tr = parentTag(el, 'tr');
 	alterClass(tr, 'checked', el.checked);
-	if (el.form && el.form['all'] && el.form['all'].onclick) { // Opera thinks that 'all' is who knows what
+	if (el.form && el.form['all'] && el.form['all'].onclick) { // Opera treats form.all as document.all
 		el.form['all'].onclick();
 	}
 }
@@ -184,6 +186,9 @@ function tableClick(event, click) {
 			click = false;
 		}
 		el = el.parentNode;
+		if (!el) { // Ctrl+click on text fields hides the element
+			return;
+		}
 	}
 	el = el.firstChild.firstChild;
 	if (click) {
@@ -498,11 +503,19 @@ function fieldChange(field) {
 * @param string
 * @param function (XMLHttpRequest)
 * @param [string]
+* @param [string]
 * @return XMLHttpRequest or false in case of an error
 */
-function ajax(url, callback, data) {
+function ajax(url, callback, data, message) {
 	var request = (window.XMLHttpRequest ? new XMLHttpRequest() : (window.ActiveXObject ? new ActiveXObject('Microsoft.XMLHTTP') : false));
 	if (request) {
+		var ajaxStatus = document.getElementById('ajaxstatus');
+		if (message) {
+			ajaxStatus.innerHTML = '<div class="message">' + message + '</div>';
+			ajaxStatus.className = ajaxStatus.className.replace(/ hidden/g, '');
+		} else {
+			ajaxStatus.className += ' hidden';
+		}
 		request.open((data ? 'POST' : 'GET'), url);
 		if (data) {
 			request.setRequestHeader('Content-Type', 'application/x-www-form-urlencoded');
@@ -510,7 +523,12 @@ function ajax(url, callback, data) {
 		request.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
 		request.onreadystatechange = function () {
 			if (request.readyState == 4) {
-				callback(request);
+				if (/^2/.test(request.status)) {
+					callback(request);
+				} else {
+					ajaxStatus.innerHTML = (request.status ? request.responseText : '<div class="error">' + offlineMessage + '</div>');
+					ajaxStatus.className = ajaxStatus.className.replace(/ hidden/g, '');
+				}
 			}
 		};
 		request.send(data);
@@ -524,11 +542,9 @@ function ajax(url, callback, data) {
 */
 function ajaxSetHtml(url) {
 	return ajax(url, function (request) {
-		if (request.status) {
-			var data = eval('(' + request.responseText + ')');
-			for (var key in data) {
-				setHtml(key, data[key]);
-			}
+		var data = eval('(' + request.responseText + ')');
+		for (var key in data) {
+			setHtml(key, data[key]);
 		}
 	});
 }
@@ -555,18 +571,17 @@ function ajaxForm(form, message, button) {
 	}
 	data = data.join('&');
 	
-	setHtml('message', '<div class="message">' + message + '</div>');
 	var url = form.action;
 	if (!/post/i.test(form.method)) {
 		url = url.replace(/\?.*/, '') + '?' + data;
 		data = '';
 	}
 	return ajax(url, function (request) {
-		setHtml('message', request.responseText);
+		setHtml('ajaxstatus', request.responseText);
 		if (window.jush) {
-			jush.highlight_tag(document.getElementById('message').getElementsByTagName('code'), 0);
+			jush.highlight_tag(document.getElementById('ajaxstatus').getElementsByTagName('code'), 0);
 		}
-	}, data);
+	}, data, message);
 }
 
 
@@ -624,7 +639,7 @@ function selectClick(td, event, text, warning) {
 	input.focus();
 	if (text == 2) { // long text
 		return ajax(location.href + '&' + encodeURIComponent(td.id) + '=', function (request) {
-			if (request.status && request.responseText) {
+			if (request.responseText) {
 				input.value = request.responseText;
 				input.name = td.id;
 			}

adminer/table.inc.php

@@ -19,8 +19,10 @@ if ($fields) {
 	echo "<thead><tr><th>" . lang('Column') . "<td>" . lang('Type') . (support("comment") ? "<td>" . lang('Comment') : "") . "</thead>\n";
 	foreach ($fields as $field) {
 		echo "<tr" . odd() . "><th>" . h($field["field"]);
-		echo "<td title='" . h($field["collation"]) . "'>" . h($field["full_type"]) . ($field["null"] ? " <i>NULL</i>" : "") . ($field["auto_increment"] ? " <i>" . lang('Auto Increment') . "</i>" : "");
-		echo (isset($field["default"]) ? " [<b>" . h($field["default"]) . "</b>]" : "");
+		echo "<td><span title='" . h($field["collation"]) . "'>" . h($field["full_type"]) . "</span>";
+		echo ($field["null"] ? " <i>NULL</i>" : "");
+		echo ($field["auto_increment"] ? " <i>" . lang('Auto Increment') . "</i>" : "");
+		echo (isset($field["default"]) ? " <span title='" . lang('Default value') . "'>[<b>" . h($field["default"]) . "</b>]</span>" : "");
 		echo (support("comment") ? "<td>" . nbsp($field["comment"]) : "");
 		echo "\n";
 	}
@@ -79,7 +81,7 @@ if (support(is_view($table_status) ? "view_trigger" : "trigger")) {
 	if ($triggers) {
 		echo "<table cellspacing='0'>\n";
 		foreach ($triggers as $key => $val) {
-			echo "<tr valign='top'><td>$val[0]<td>$val[1]<th>" . h($key) . "<td><a href='" . h(ME . 'trigger=' . urlencode($TABLE) . '&name=' . urlencode($key)) . "'>" . lang('Alter') . "</a>\n";
+			echo "<tr valign='top'><td>" . h($val[0]) . "<td>" . h($val[1]) . "<th>" . h($key) . "<td><a href='" . h(ME . 'trigger=' . urlencode($TABLE) . '&name=' . urlencode($key)) . "'>" . lang('Alter') . "</a>\n";
 		}
 		echo "</table>\n";
 	}

adminer/trigger.inc.php

@@ -2,11 +2,10 @@
 $TABLE = $_GET["trigger"];
 $name = $_GET["name"];
 $trigger_options = trigger_options();
-$trigger_event = array("INSERT", "UPDATE", "DELETE");
 $row = (array) trigger($name) + array("Trigger" => $TABLE . "_bi");
 
 if ($_POST) {
-	if (!$error && in_array($_POST["Timing"], $trigger_options["Timing"]) && in_array($_POST["Event"], $trigger_event) && in_array($_POST["Type"], $trigger_options["Type"])) {
+	if (!$error && in_array($_POST["Timing"], $trigger_options["Timing"]) && in_array($_POST["Event"], $trigger_options["Event"]) && in_array($_POST["Type"], $trigger_options["Type"])) {
 		// don't use drop_create() because there may not be more triggers for the same action
 		$on = " ON " . table($TABLE);
 		$drop = "DROP TRIGGER " . idf_escape($name) . ($jush == "pgsql" ? $on : "");
@@ -35,11 +34,13 @@ page_header(($name != "" ? lang('Alter trigger') . ": " . h($name) : lang('Creat
 
 <form action="" method="post" id="form">
 <table cellspacing="0">
-<tr><th><?php echo lang('Time'); ?><td><?php echo html_select("Timing", $trigger_options["Timing"], $row["Timing"], "if (/^" . preg_quote($TABLE, "/") . "_[ba][iud]$/.test(this.form['Trigger'].value)) this.form['Trigger'].value = '" . js_escape($TABLE) . "_' + selectValue(this).charAt(0).toLowerCase() + selectValue(this.form['Event']).charAt(0).toLowerCase();"); ?>
-<tr><th><?php echo lang('Event'); ?><td><?php echo html_select("Event", $trigger_event, $row["Event"], "this.form['Timing'].onchange();"); ?>
+<tr><th><?php echo lang('Time'); ?><td><?php echo html_select("Timing", $trigger_options["Timing"], $row["Timing"], "triggerChange(/^" . preg_quote($TABLE, "/") . "_[ba][iud]$/, '" . js_escape($TABLE) . "', this.form);"); ?>
+<tr><th><?php echo lang('Event'); ?><td><?php echo html_select("Event", $trigger_options["Event"], $row["Event"], "this.form['Timing'].onchange();"); ?>
+<?php echo (in_array("UPDATE OF", $trigger_options["Event"]) ? " <input name='Of' value='" . h($row["Of"]) . "' class='hidden'>": ""); ?>
 <tr><th><?php echo lang('Type'); ?><td><?php echo html_select("Type", $trigger_options["Type"], $row["Type"]); ?>
 </table>
 <p><?php echo lang('Name'); ?>: <input name="Trigger" value="<?php echo h($row["Trigger"]); ?>" maxlength="64" autocapitalize="off">
+<script type="text/javascript">document.getElementById('form')['Timing'].onchange();</script>
 <p><?php textarea("Statement", $row["Statement"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">

adminer/view.inc.php

@@ -7,17 +7,27 @@ if ($_POST && !$error) {
 	$as = " AS\n$row[select]";
 	$location = ME . "table=" . urlencode($name);
 	$message = lang('View has been altered.');
-	
-	if (!$_POST["drop"] && $TABLE == $name && $jush != "sqlite") {
+
+	if ($_GET["materialized"]) {
+		$type = "MATERIALIZED VIEW";
+	} else {
+		$type = "VIEW";
+		if ($jush == "pgsql") {
+			$status = table_status($name);
+			$type = ($status ? strtoupper($status["Engine"]) : $type);
+		}
+	}
+
+	if (!$_POST["drop"] && $TABLE == $name && $jush != "sqlite" && $type != "MATERIALIZED VIEW") {
 		query_redirect(($jush == "mssql" ? "ALTER" : "CREATE OR REPLACE") . " VIEW " . table($name) . $as, $location, $message);
 	} else {
 		$temp_name = $name . "_adminer_" . uniqid();
 		drop_create(
-			"DROP VIEW " . table($TABLE),
-			"CREATE VIEW " . table($name) . $as,
-			"DROP VIEW " . table($name),
-			"CREATE VIEW " . table($temp_name) . $as,
-			"DROP VIEW " . table($temp_name),
+			"DROP $type " . table($TABLE),
+			"CREATE $type " . table($name) . $as,
+			"DROP $type " . table($name),
+			"CREATE $type " . table($temp_name) . $as,
+			"DROP $type " . table($temp_name),
 			($_POST["drop"] ? substr(ME, 0, -1) : $location),
 			lang('View has been dropped.'),
 			$message,
@@ -32,7 +42,7 @@ if (!$_POST && $TABLE != "") {
 	$row = view($TABLE);
 	$row["name"] = $TABLE;
 	if (!$error) {
-		$error = $connection->error;
+		$error = error();
 	}
 }
 

changes.txt

@@ -1,3 +1,46 @@
+Adminer 4.2.0 (released 2015-02-07)
+Fix XSS in login form (bug #436)
+Allow limiting number of displayed rows in SQL command
+Fix reading routine column collations
+Unlock session in alter database
+Make master key unreadable to others (bug #410)
+Fix edit by long non-utf8 string
+Specify encoding for PHP 5.6 with invalid default_charset
+Fix saving NULL value, bug since Adminer 4.0.3
+Send 403 for auth error
+Report offline and other AJAX errors (bug #419)
+Don't alter table comment if not changed
+Add links to documentation on table status page
+Fix handling of 64 bit numbers in auto_increment
+Add referrer: never meta tag
+MySQL: Use utf8mb4 if available
+MySQL: Support foreign keys in NDB storage
+PostgreSQL: Materialized views
+SQLite: Support CURRENT_* default values (bug #417)
+Elasticsearch: Use where in select
+Firebird: Alpha version
+Danish translation
+
+Adminer 4.1.0 (released 2014-04-18)
+Provide size of all databases in the overview
+Prevent against brute force login attempts from the same IP address
+Compute number of tables in the overview explicitly
+Display edit form after error in clone or multi-edit
+Trim trailing non-breaking spaces in SQL textarea
+Display time of the select command
+Print elapsed time in HTML instead of SQL command comment
+Improve gzip export ratio (bug #387)
+Use rel="noreferrer" for external links, skip adminer.org redirect in WebKit
+MySQL: Fix enum types in routines (bug #391)
+MySQL: Fix editing rows by binary values, bug since Adminer 3.7.1
+MySQL: Respect daylight saving time in dump, bug since Adminer 3.6.4
+MySQL 5.6.5+: Support ON UPDATE on datatime column
+SQLite: Support UPDATE OF triggers
+SQLite: Display auto-created unique indexes, bug since Adminer 3.5.0
+Editor: Fix login() method, bug since Adminer 4.0.0
+Translate numbers in ar, bn, fa
+Vietnamese translation
+
 Adminer 4.0.3 (released 2014-02-01)
 MongoDB: insert, truncate, indexes
 SimpleDB, MongoDB: insert more fields at once

compile.php

@@ -70,7 +70,7 @@ function lang(\$translation, \$number = null) {
 		$translation = $translation[$pos];
 	}
 	$translation = str_replace("%d", "%s", $translation);
-	$number = number_format($number, 0, ".", lang(\',\'));
+	$number = format_number($number);
 	return sprintf($translation, $number);
 }
 ';

composer.json

@@ -0,0 +1,31 @@
+{
+    "name": "vrana/adminer",
+    "description": "Database management in a single PHP file.",
+    "homepage": "http://www.adminer.org/",
+    "keywords": [
+        "database"
+    ],
+    "support": {
+        "issues": "http://sourceforge.net/p/adminer/bugs-and-features/",
+        "forum": "http://sourceforge.net/p/adminer/discussion/",
+        "source": "https://github.com/vrana/adminer/"
+    },
+    "authors": [
+        {
+            "name": "Jakub Vrána",
+            "homepage": "http://www.vrana.cz/"
+        }
+    ],
+    "autoload": {
+        "classmap": [
+            "plugins/"
+        ]
+    },
+    "license": [
+        "Apache-2.0",
+        "GPL-2.0"
+    ],
+    "scripts": {
+        "compile": "php compile.php"
+    }
+}

designs/bueltge/adminer.css

@@ -1,13 +1,16 @@
-/** 
- * Alternative style for Adminer by Frank Bueltge
- * @link http://bueltge.de/
+/**
+ * Alternative style for Adminer by Frank Bültge
+ * 
+ * @link     http://bueltge.de/
+ * @version  02/18/2014
  */
 
 body {
-margin: 0; 
-line-height: 1.25em;
+margin: 0;
 font-size: 12px;
+line-height: 1.4em;
 background: #F9F9F9;
+color: #333;
 }
 body, select, option, optgroup, button {
 font-family: "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
@@ -20,27 +23,67 @@ font-family: "Lucida Grande",Verdana,Arial,"Bitstream Vera Sans",sans-serif;
 font-size: 12px;
 }
 
+pre {
+white-space: pre-wrap;
+}
+
+p {
+margin: 0.8em 20px 0 5px
+}
+
 a { 
 color: #21759B;
+background: none !important;
 }
 a:visited { 
 color: #21759B;
 }
-a:hover { 
+a:hover, a:hover { 
 text-decoration: none;
-color: #D54E21;
+color: #d54e21;
+}
+a:focus {
+	background: #c7e7fd;
+	color: #124964;
+}
+a:active {
+	background: none;
+	outline: thin dotted;
+}
+
+a.active, a.active + a {
+	text-decoration: none;
+	font-weight: 700;
 }
 
 form {
 margin: 0;
+padding: 0 0 0 5px;
 }
-table { 
-margin: 0 12px 12px 0; 
+table {
+width: 100%;
+clear: both;
+margin: 0;
+border-spacing: 0;
+border-collapse: separate;
+border-color: gray;
+}
+table, thead, tbody {
+margin: 10px 12px 0 0;
 border: 1px #BBB solid;
 font-size: 90%;
 }
+thead th, thead td {
+text-align: center;
+}
+td {
+white-space: normal;
+overflow: hidden;
+padding: 0 4px;
+}
 th {
 text-align: left;
+font-weight: 400;
 }
 td, th {
 background-color: #fff;
@@ -54,9 +97,14 @@ border-top-width: 0;
 td:first-child, th:first-child {
 border-left-width: 0;
 }
+thead {
+display: table-header-group;
+vertical-align: middle;
+border-color: inherit;
+}
 thead td, thead th { 
 background-color: #DFDFDF;
-border: none; 
+border: none;
 border-bottom: 1px #BBB solid;
 }
 thead tr:hover td, thead tr:hover th {
@@ -85,19 +133,21 @@ fieldset, x:-moz-any-link {
 padding-top: 4px;
 }
 fieldset {
-%padding-top: 14px;
+padding-top: 14px;
 }
 legend {
 font-weight: 900; 
 color: #000;
-position: absolute;
 top: -1.666em;
 left: -1em;
 padding: 0 4px;
 }
-input[name='limit'], input[name*='length'] {
+input {
+padding: 2px 5px 1px 5px;
+}
+input[name='limit'], input[name='length'] {
 width: 3em; 
-xtext-align: right;
+text-align: right;
 }
 input[name='text_length'] {
 width: 5em;
@@ -108,39 +158,83 @@ margin-left: 2px;
 textarea, input, select {
 border-width: 1px;
 border-style: solid;
--moz-border-radius: 4px;
--khtml-border-radius: 4px;
--webkit-border-radius: 4px;
-border-radius: 4px;
+-moz-border-radius: 3px;
+-khtml-border-radius: 3px;
+-webkit-border-radius: 3px;
+border-radius: 3px;
 border-color: #DFDFDF;
 }
+select {
+margin: 0 0 1px 0;
+}
 input[type="checkbox"], input[type="radio"], input[type="image"] {
 border: 0 none;
 }
 input[type=button], input[type=submit] {
-border-color: #bbb;
-color: #464646;
+	display: inline-block;
+	text-decoration: none;
+	font-size: 12px;
+	line-height: 15px;
+	padding: 1px 0 0 0;
+	cursor: pointer;
+	border-width: 1px;
+	border-style: solid;
+	-webkit-border-radius: 3px;
+	border-radius: 3px;
+	-webkit-box-sizing: content-box;
+	-moz-box-sizing:    content-box;
+	box-sizing:         content-box;
+	white-space: nowrap;
+	border-color: #dfdfdf;
+	background-color: #fff;
+	color: #333;
 }
-input[type=button]:hover, input[type=submit]:hover {
-color: #000;
-border-color: #666;
+input[type="button"]:focus, input[type=submit] {
+	border-color: #a1a1a1;
+	-webkit-box-shadow: 1px 1px 2px rgba(0,0,0,0.1);
+	box-shadow: 1px 1px 2px rgba(0,0,0,0.1);
 }
 input[type=button], input[type=submit] {
-text-decoration: none;
-font-size: 11px !important;
-line-height: 14px;
-padding: 2px 8px;
-cursor: pointer;
-border-width: 1px;
-border-style: solid;
--moz-border-radius: 11px;
--khtml-border-radius: 11px;
--webkit-border-radius: 11px;
-border-radius: 11px;
--moz-box-sizing: content-box;
--webkit-box-sizing: content-box;
--khtml-box-sizing: content-box;
-box-sizing: content-box;
+	padding: 2px 5px 1px 5px;
+	background: #ececec;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#eee));
+	background-image: -webkit-linear-gradient(top, #fff, #eee);
+	background-image:    -moz-linear-gradient(top, #fff, #eee);
+	background-image:      -o-linear-gradient(top, #fff, #eee);
+	background-image:   linear-gradient(to bottom, #fff, #eee);
+	border-color: #ccc;
+	-webkit-box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9); 
+ 	box-shadow: inset 0 0 1px 1px rgba(255,255,255, 0.9);
+ 	color: #464646;
+	text-shadow: 1px 1px 0 #fff;
+}
+input[type=button]:hover, input[type=submit]:hover,
+input[type=button]:focus, input[type=submit]:focus  {
+	background: #ececec;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#fff), to(#eee));
+	background-image: -webkit-linear-gradient(top, #fff, #eee);
+	background-image:    -moz-linear-gradient(top, #fff, #eee);
+	background-image:      -o-linear-gradient(top, #fff, #eee);
+	background-image:   linear-gradient(to bottom, #fff, #eee);
+	border-color: #bbb;
+	-webkit-box-shadow: 0px 1px 1px rgba(0,0,0,.1); 
+	box-shadow: 0px 1px 1px rgba(0,0,0,.1);
+	color: #000;
+}
+input[type=button]:active, input[type=submit]:active {
+	background: #eee;
+	background-image: -webkit-gradient(linear, left top, left bottom, from(#eee), to(#f9f9f9));
+	background-image: -webkit-linear-gradient(top, #eee, #f9f9f9);
+	background-image:    -moz-linear-gradient(top, #eee, #f9f9f9);
+	background-image:      -o-linear-gradient(top, #eee, #f9f9f9);
+	background-image:   linear-gradient(to bottom, #eee, #f9f9f9);
+	border-color: #999 #ddd #ddd #999;
+	color: #555;
+	-webkit-box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1); 
+	box-shadow: inset 1px 1px 0 rgba(50,50,50,0.1);
+}
+input[type=button]:focus, input[type=submit]:focus {
+	border-color: #aaa;
 }
 input + label input, select + label input {
 margin-left: 4px;
@@ -166,6 +260,11 @@ vertical-align: middle;
 margin: 0; 
 padding: 0;
 }
+.js .column {
+position: relative;
+background: none;
+padding: 0;
+}
 .error { 
 padding: 8px; 
 color: red; 
@@ -190,17 +289,20 @@ color: red;
 .jush-sql {
 padding: 2px 4px;
 margin-right: 4px;
-outline: 1px #BBB dashed;
-font-size: 9pt;
+font-size: 11px;
+}
+.time {
+color: #333;
 }
 
 #content { 
-margin: 2px 0 0 260px; 
+margin: 2px 0 0 270px; 
 padding: 10px 20px 20px 0;
 }
-#lang { 
+#lang {
+font-size:10px;
 height: 23px;
-width: 250px;
+width: 255px;
 display: block; 
 padding: 1px 0; 
 position: absolute; 
@@ -212,7 +314,7 @@ border: 1px solid #E3E3E3;
 line-height: 1.25em;
 }
 #lang select {
-font-size: 8pt;
+font-size: 10px;
 }
 #breadcrumb { 
 margin: 0; 
@@ -220,7 +322,7 @@ height: 21px;
 display: block; 
 position: absolute; 
 top: 0; 
-left: 260px;
+left: 270px;
 background-color: #f1f1f1;
 border: 1px solid #E3E3E3;
 padding: 2px 12px;
@@ -230,7 +332,7 @@ position: absolute;
 margin: 0;
 top: 28px; 
 left: 0; 
-width: 250px; 
+width: 255px; 
 background-color: #f1f1f1;
 border: 1px solid #E3E3E3;
 }
@@ -239,9 +341,11 @@ margin: 0;
 }
 #menu p { 
 padding-left: 8px;
-font-size: 10pt;
 border-bottom: none;
 }
+#dbs {
+padding: 0 !important;
+}
 #menu form p {
 padding-left: 0;
 text-align: left;
@@ -257,19 +361,15 @@ line-height: 35px;
 text-shadow: rgba(255,255,255,1) 0 1px 0px;
 background: none;
 }
-h1 {
-font-size: 12px;
-}
 h1 .h1 {
 font-size: 12px;
 }
 h2 {
 padding: 22px 0 0 10px;
 }
-h3 { 
-margin: 40px 0 0;
-font-weight: 400; 
-font-size: 130%;
+h3 {
+font: normal normal normal 18px/22px Georgia, "Times New Roman", "Bitstream Charter", Times, serif;
+margin: 20px 0 0 5px;
 }
 #schema { 
 margin: 1.5em 0 0 220px;
@@ -285,8 +385,11 @@ position: absolute;
 #schema .references { 
 position: absolute;
 }
-.js div.hidden {
-display: inline;
+.js .hidden {
+display: hidden;
+}
+.js td.hidden, .js input.hidden {
+display: none;
 }
 legend a {
 color: #333;
@@ -299,40 +402,27 @@ color: #333;
 code {
 background: transparent;
 }
-fieldset, legend, h2, table, .error, .message {
--moz-border-radius: 5px;
--khtml-border-radius: 5px;
--webkit-border-radius: 5px;
-border-radius: 5px;
+fieldset, legend, table, thead, tbody, .error, .message {
+-moz-border-radius: 3px;
+-khtml-border-radius: 3px;
+-webkit-border-radius: 3px;
+border-radius: 3px;
 }
 #breadcrumb, #lang, #menu {
--moz-border-radius-bottomright: 5px;
--khtml-border-bottom-right-radius: 5px;
--webkit-border-bottom-right-radius: 5px;
-border-bottom-right-radius: 5px;
+-moz-border-radius-bottomright: 3px;
+-khtml-border-bottom-right-radius: 3px;
+-webkit-border-bottom-right-radius: 3px;
+border-bottom-right-radius: 3px;
 }
 #breadcrumb {
--moz-border-radius-bottomleft: 5px;
--khtml-border-bottom-left-radius: 5px;
--webkit-border-bottom-left-radius: 5px;
-border-bottom-left-radius: 5px;
+-moz-border-radius-bottomleft: 3px;
+-khtml-border-bottom-left-radius: 3px;
+-webkit-border-bottom-left-radius: 3px;
+border-bottom-left-radius: 3px;
 }
 #menu {
 -moz-border-radius-topright: 5px;
--khtml-border-top-right-radius: 5px;
--webkit-border-top-right-radius: 5px;
-border-bottom-top-radius: 5px;
-}
-.js .column {
-background: #DFDFDF;
-}
-#logout {
-color: #21759B;
-}
-#logout:hover {
-text-decoration: none;
-}
-#logins a, #tables a {
-background: #F1F1F1;
-line-height: 1.5em;
-}
+-khtml-border-top-right-radius: 3px;
+-webkit-border-top-right-radius: 3px;
+border-top-right-radius: 3px;
+}

designs/haeckel/adminer.css

@@ -146,8 +146,13 @@ html>/**/body table a[href*="&edit="][href*="&where"] {
     height: 16px;
     overflow: hidden;
     padding-left: 24px;
+}
+
+/* Hide text in automatic selects */
+html>/**/body form>table a[href*="&edit="][href*="&where"] {
     width: 0;
 }
+
 /* Select data */
 html>/**/body #menu p a[href*="&select="], html>/**/body .links a[href*="&select="] {
     background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAdVJREFUeNqck8tO21AQhn8bB8ehRe0SUEBOlIsSVFGqqlK3oey6K+9A96wTKU/RFU/AG7CrKhAg7gmKiJKIplFWqItWIQEfuzOT2LmsSo408j+2/5lvjo+1rULhM4AFTLfahuu6i3vF4rdp3F/y+W3DVUrzKNk8BTzPC4IKS3h8Hc0Hz49zr8BeXSml8wu8PsU1uW7EhjpHOmd7wX1fs4e9hnIcTUkBDfs1DzGjS5N1pPOGRR3bLjR6ztoNNJm9ebDXcBxnjMD99YCdzGvJT25v8T6ZFH1QLuNjNiv6++UlESyDvSMEEIKcCZzX6zLvXDiMo0pFZn5hWfhxfS2aF3sCAkUvDwmA1ZUVyS9qNawnEn0aKvQhkxF9WCqBPUIgBSYISnd3QmCZJs6qVekaYZqbmzGCfoGnp2AEnyAdjUpeajTwJh4XfU778S6d7tNQISlA3rFN9AkqzaYQmLOzuKIxuGuYaE4H++F/RvbqVEVXE+cgsbSEFFH0Hh+RtW2sxmLo9npYoy/yNpUajkBeo9ftzkwSVFstIeBVpjH8rhc0xigBe43f9/dmKBTCburv4ISb//VvsYe9mmXbX/VIZHman8ntdH7y0BbFSwrjmX6H4s8/AQYAQChL+KIinhAAAAAASUVORK5CYII=") no-repeat left bottom

designs/pepa-linha/adminer.css

@@ -0,0 +1,664 @@
+/*
+ * Theme by Pepa Linha [http://webdream.cz]
+ * JUSH color syntax inspired by NetBeans
+ * @version 0.2 (February 2014)
+ */
+
+html,
+body {
+	height: 100%;
+}
+
+body {
+	font-family: "Segoe UI", Arial, sans-serif;
+}
+
+h1 {
+	margin: 0;
+	padding: 0;
+	background: none;
+	border: 0;
+}
+
+h2 {
+	margin: 0;
+	padding: 0;
+	background: none;
+	border: 0;
+	font-family: "Segoe UI Light", "Segoe UI", Arial, sans-serif;
+	font-size: 32px;
+	font-weight: normal;
+	color: #34567c;
+	border-bottom: 1px solid #ebebeb;
+	padding-bottom: 6px;
+	margin-bottom: 40px;
+}
+
+.rtl h2 {
+	margin: 0;
+	margin-bottom: 40px;
+}
+
+h3 {
+	font-size: 22px;
+	margin: 0 0 10px;
+	border-bottom: 1px solid #ebebeb;
+	padding: 0;
+	padding-bottom: 6px;
+}
+
+p {
+	margin: 0;
+	margin-bottom: 15px;
+}
+
+a {
+	color:#2e84e4;
+	text-decoration:none;
+}
+
+a:visited {
+	color: #34567c;
+}
+
+a:link:hover,
+a:visited:hover {
+	color: #2e84e4;
+	text-decoration:underline;
+}
+
+/* otravuje pri prochazeni formulare klavesama */
+a[href*=charsets] {
+	display: none;
+}
+
+table {
+	border: 0;
+	margin: 0;
+	margin-top: 15px;
+}
+
+th, td {
+	border: 0;
+	padding: 6px;
+}
+
+th {
+	background: none;
+	color: #34567c;
+	font-weight: normal;
+}
+
+tbody tr:hover td,
+tbody tr:hover th {
+	background: none;
+}
+
+table:not(.checkable) th {
+	min-width: 120px;
+}
+
+thead td,
+thead th {
+	background: #34567c;
+}
+
+thead td,
+thead td a,
+thead td a:link:hover,
+thead td a:visited,
+thead td a:visited:hover,
+thead th,
+thead th a,
+thead th a:link:hover,
+thead th a:visited,
+thead th a:visited:hover {
+	color: #fff;
+}
+
+table.checkable,
+p.links + table,
+pre + table,
+#edit-fields,
+p + table,
+h3 + table {
+	border: 1px solid #bbb;
+	margin-bottom: 15px;
+}
+
+table.checkable tbody tr:hover td,
+table.checkable tbody tr:hover th {
+	background: #ffffd9;
+}
+
+.js .checkable .checked td,
+.js .checkable .checked th {
+	background: #fbfabc;
+}
+
+.js .checkable thead .checked td,
+.js .checkable thead .checked th {
+	background: #bfb008;
+}
+
+.odd th,
+.odd td {
+	background: #f5f5f5;
+}
+
+fieldset {
+	display: inline-block;
+	padding: 15px;
+	padding-top: 5px;
+	margin: 0 0 15px;
+	border: 0;
+	background: #f5f5f5;
+}
+
+fieldset select {
+	margin-right: 5px;
+}
+
+fieldset input[type=button],
+fieldset input[type=submit],
+fieldset p {
+	margin-bottom: 0;
+}
+
+fieldset div p {
+	margin-top: 10px;
+}
+
+legend {
+	display: inline-block;
+	padding: 6px 15px;
+	margin: 0 0 0 -15px;
+	background: #f5f5f5;
+	font-family: "Segoe UI Semibold", "Segoe UI", Arial, sans-serif;
+}
+
+legend a,
+legend a:link:hover {
+	color: #000;
+	text-decoration: underline;
+}
+
+code {
+	background: none;
+}
+
+p code,
+pre code,
+pre[contenteditable=true] {
+	padding: 10px 15px;
+	display: block;
+	font-size: 17px;
+	margin-bottom: 15px;
+}
+
+p code + a,
+p code + a:link:hover,
+p code + a:visited:hover {
+	margin-left: 15px;
+	position: relative;
+	top: -20px;
+	color: #000;
+	font-size: 12px;
+	text-decoration: underline;
+	text-transform: lowercase;
+}
+
+#content {
+	margin: 0;
+	margin-left: 400px;
+	margin-right: 54px;
+	padding: 0;
+	padding-top: 50px;
+}
+
+#content > p {
+	margin-bottom: 15px;
+}
+
+.rtl #content {
+	margin: 0;
+	margin-left: 54px;
+	margin-right: 400px;
+	padding: 0;
+	padding-top: 50px;
+}
+
+#menu {
+	width: 347px;
+	border-right: 1px solid #dae8fa;
+	box-shadow: inset -1px 0 0 #fff;
+	margin: 0;
+	padding: 0;
+	top: 0;
+	background: #f4f8fd;
+	bottom: 0;
+	position: fixed;
+	padding: 0 15px;
+	box-sizing: border-box;
+}
+
+#menu h1 {
+	background: none left top no-repeat;
+	background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAD0AAAAyCAIAAABgVkRrAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NTA0RDI5NkM5QkRGMTFFMzg4ODNEQjEzNjY5NzJEMEEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NTA0RDI5NkQ5QkRGMTFFMzg4ODNEQjEzNjY5NzJEMEEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo1MDREMjk2QTlCREYxMUUzODg4M0RCMTM2Njk3MkQwQSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo1MDREMjk2QjlCREYxMUUzODg4M0RCMTM2Njk3MkQwQSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnG4emkAAASXSURBVHja7Fk9aNtAFL6EDKKUoqGDySRKB1FC8dDBdCgeOmQoIUMG0yGE0EFT8dDBUwidPJQQQgcNpYROGjKI0sFDB9GhaMhgSgcPpWgqHjqYYsINJfQ7PfV0tmX9JI4Sgx+HI8f26bt3733fe6elIf/LbqwdHbJWS1wYBrMstrXJVg36ZJnNhQWBWMB9k+215gq3tDeHBH3pRseJtC8ee2ezEzd62+ncDH/DhS+ttC88qbMPDntaj952uyvXD3q7ETvyyE77pq5HFz9614r7V8C2GnBezBgp9tGNl3ffzIjvwZ9B//dA7Mz3YPLTyl29UhE+MI0KW9YKh2yjwQZichEAjsNu6WlUqNqkvwHUO+0BJeD2gn4hJFXTwAIw6jUzYxlwHkCTvWqy1+0Ct7FtsPh/3Ofc9brOJ5+8ezHr9gKMcGpWf2SK8bhKk48sA1kIOiODmzc2c8U0DLrzwhI5ypjA3fsZtNrOgPP4y5pmGJXamqHd1kQMTIkENYpwEfQHEW7GsGkYZse393ewb+Y9IwE0PJcOejQ2pFgK3Li3BI14hZM269XKaiXPVPodHUOs6l48o/+t5wO038OcQGztHzd31uPfUEgQdCQi3JkfumLLHa9LoK2tunPQtJ6v5wQ9zWoPzebupms34QKxmZNJAugIDzJE+V4rbTrDSMYtr3AD+H5WFIfZ0lIFPu50otiF7zfW2dlgquKccTFWRxYQ8wlFJOVTdc2gAChq/V99vxdgD7O5CIBO/Yi/P3vsUY2dOOxBdSrzIBm2dxJwq+hlaiId9dua5OlEv/IhH0vKvAYXfvUjvUTFB2STeinJu91Oxo3Eh58onwRXcB7zWkGj/Maa9203+9soPIyWEKBEkQdc8veo+sS4wQkYzV1Bi+A1Ee5DnhO33BxsSw1/wszGPHkXmqI7yIQzPvnvhPqEFjAWtSq7j7n2YplwSctVV8F/FXazbN76nQXu68btfe3Odmqwahl5Ca6tel0UVdnVc6pRBX/JkrgYn0RCY0cdAMhYvGYxHbEklbJ++FoqD8LTUiwTlZLEha55WKOmSybWTCXD1eJG8dnc4XAYqmdgmoRFyp/ZqqHbgMiD8qGXZeAOs1RD9YyhBgBVTgL3cMTHwKd2xyUL50qmTI5p/oK/F7jnEjeycLZTFz02SrKlaSPGbe0fOx+9mbTGcMHhe/fwuFMGn4Dy7BMPA3oBGkZrbIDgcp9JgK37YYtZjmSuqApH9yPRcTp+TM939THOpkaYroMguRuSE14tbuegif11vS58poYm7i1vn6fdxF6hMoNk4leIvTJ0B1FhPQ/PxM45eZ2HGjkY8jHXqptghGJJqqmKVHn1oCr4k93xgr8XuOcZ9zmf7dQym68Et6QFcFaBk7EsQ5fdfuteHW7xPM3asyVh05EkxFJITMHuGDUCukxwvOz3YI31mtWoX7TRXkrDjQhBLeFOHBtQQ6n/f8TDlAd/6mNBP7xO7Ecbz2qNjfrl6qoU3Mr5Qa4j9yyLHqZd7jwjL241QQFdPiJTdT7RsBuapslzi5mqVSHcKXYetcZlSelU3P8EGADW25uhkIE0mQAAAABJRU5ErkJggg==);
+	line-height: 50px;
+	padding-left: 50px;
+	padding-top: 9px;
+	text-transform: lowercase;
+	margin: 25px 0 10px 16px;
+}
+
+#menu h1 a {
+	font-style: normal;
+}
+
+#menu h1 .version {
+	color: #2e84e4;
+}
+
+#menu a {
+	color: #34567c;
+}
+
+#menu p {
+	border: 0;
+	padding: 0;
+}
+
+#menu #dbs {
+	background: #fff;
+	padding: 0 15px 15px;
+	border: 1px solid #dae8fa;
+	border-bottom: 0;
+	box-sizing: border-box;
+	color: #fff;
+}
+
+#menu #dbs select {
+	outline: 0;
+	border-color: rgba(0, 0, 0, 0.1);
+	width: 100%;
+}
+
+#menu p.links {
+	margin: 0 0 15px;
+	border: 1px solid #dae8fa;
+	border-top: 0;
+	text-align: center;
+	display: table;
+	width: 100%;
+	box-sizing: border-box;
+}
+
+#menu p.links a {
+	padding: 8px;
+	margin: 0;
+	display: table-cell;
+	font-size: 12px;
+}
+
+#menu p.links a:hover {
+	color: #2e84e4;
+}
+
+#menu p.links a.active {
+	font-weight: normal;
+	background: #fff;
+	color: #000;
+}
+
+#content p.links {
+	margin: -10px 0 15px;
+}
+
+#content p.links a {
+	padding: 8px;
+	margin: 0;
+	display: table-cell;
+	border: 1px solid #fff;
+}
+
+#content p.links a,
+#content p.links a:visited,
+#content p.links a:hover {
+	color: #2e84e4;
+}
+
+#content p.links a.active {
+	font-weight: normal;
+	border: 1px solid #2e84e4;
+	background: #f4f8fd;
+}
+
+#tables {
+	max-height: 100%;
+	margin: 0 -15px !important;
+	position: absolute;
+	left: 15px;
+	right: 15px;
+	bottom: 0;
+	top: 220px;o
+	overflow: hidden !important;
+	overflow-y: auto !important;
+}
+
+.rtl #tables {
+	overflow: hidden !important;
+	overflow-y: auto !important;
+}
+
+#tables a {
+	float: right;
+	padding: 6px 15px;
+}
+
+.rtl #tables a {
+	float: none;
+}
+
+#tables a[title] {
+	float: none;
+	display: block;
+}
+
+.rtl #tables a:first-child,
+.rtl #tables br + a {
+	float: left;
+	display: block;
+	margin-left: 15px;
+}
+
+#tables a:hover,
+#tables a:hover + a,
+#tables a.active,
+#tables a.active + a {
+	background: #fff;
+	color: #2e84e4;
+}
+
+#tables br {
+	display: none;
+}
+
+.js .column {
+	background: #2e84e4;
+}
+
+.js .checked .column {
+	background: #7b7105;
+}
+
+.pages {
+	left: 400px;
+	background: #34567c;
+	color: #fff;
+	font-weight: bold;
+	border: 0;
+	display: inline-block;
+	position: static;
+}
+
+.pages a,
+.pages a:link,
+.pages a:link:hover,
+.pages a:visited,
+.pages a:visited:hover {
+	color: #fff;
+	font-weight: normal;
+}
+
+#breadcrumb {
+	margin: 0;
+	left: 400px;
+	background: none;
+	padding: 0;
+	padding-top: 25px;
+	font-size: 12px;
+}
+
+#breadcrumb a {
+	color: #aeaeae;
+	text-decoration: underline;
+}
+
+#breadcrumb,
+#breadcrumb a:hover {
+	color: #666;
+}
+
+.rtl #breadcrumb {
+	margin: 0;
+	padding: 0;
+	padding-top: 25px;
+	right: 400px;
+}
+
+.logout,
+.rtl .logout {
+	top: 30px;
+	right: 54px;
+	margin: 0;
+}
+
+.rtl .logout {
+	right: auto;
+	left: 54px;
+}
+
+input:not([type]),
+input[type="color"],
+input[type="email"],
+input[type="number"],
+input[type="password"],
+input[type="tel"],
+input[type="url"],
+input[type="text"],
+input[type="search"] {
+	border: 1px solid #bbbbbb;
+	padding: 6px;
+	margin: 0;
+	box-sizing: border-box;
+}
+
+table:not(#table) input:not([type]),
+table:not(#table) input[type="color"],
+table:not(#table) input[type="email"],
+table:not(#table) input[type="number"],
+table:not(#table) input[type="password"],
+table:not(#table) input[type="tel"],
+table:not(#table) input[type="url"],
+table:not(#table) input[type="text"],
+table:not(#table) input[type="search"] {
+	min-width: 280px;
+}
+
+input[type=submit],
+input[type=button] {
+	border: 0;
+	padding: 7px 12px;
+	cursor: pointer;
+	outline: 0;
+	box-shadow: none;
+	background: #2e84e4;
+	color: #fff;
+	font-weight: bold;
+	margin-bottom: 5px;
+	transition: background .4s ease;
+}
+
+input[type=submit][disabled],
+input[type=button][disabled] {
+	background: #aeaeae !important;
+	color: #e9e9e9;
+	cursor: not-allowed;
+}
+
+input[type=submit]:hover,
+input[type=button]:hover,
+input[type=submit]:focus,
+input[type=button]:focus {
+	background: #34567c;
+}
+
+.logout input[type=submit] {
+	background: #f40204;
+}
+
+.logout input[type=submit]:hover {
+	background: #d50204;
+}
+
+input.default,
+input.default {
+	box-shadow: none;
+	background: #2e84e4;
+	color: #fff;
+	font-weight: bold;
+}
+
+select {
+	box-sizing: border-box;
+	margin: 0;
+	padding: 6px 0;
+	border: 1px solid #bbbbbb;
+}
+
+label {
+	cursor: pointer;
+	margin-right: 6px;
+}
+
+.error,
+.message {
+	margin: 0;
+	margin-bottom: 15px;
+}
+
+#logins a,
+#tables a,
+#tables span {
+	background: none;
+}
+
+#form > p {
+	margin-bottom: 15px;
+}
+
+#schema .table {
+	padding: 6px;
+}
+
+#schema .table a {
+	display: block;
+	margin: -6px;
+	margin-bottom: 6px;
+	padding: 6px;
+	color: #fff;
+	background: #34567c;
+}
+
+#schema .table br {
+	display: none;
+}
+
+#schema .table span {
+	display: block;
+	margin-bottom: 1px solid #f5f5f5;
+}
+
+#lang {
+	position: fixed;
+	top: 55px;
+	right: 100%;
+	z-index: 10;
+	margin-right: -331px;
+	line-height: normal;
+	padding: 0;
+	left: auto;
+	font-size: 0;
+}
+
+#lang select {
+	font-size: 12px;
+	padding: 0;
+	text-align: right;
+	border: 0;
+	background: none;
+	-webkit-appearance: none;
+	-moz-appearance: none;
+	appearance: none;
+	cursor: pointer;
+	outline: 0;
+}
+
+#lang select option {
+	text-align: right;
+}
+
+.rtl #lang {
+	margin-right: 0;
+	left: 100%;
+	margin-left: -261px;
+	right: auto;
+}
+
+.jush {
+	color: #000;
+}
+
+.jush a {
+	color: #3939f2;
+}
+
+.jush-sql a,
+.jush-sql_code a,
+.jush-sqlite a,
+.jush-pgsql a,
+.jush-mssql a,
+.jush-oracle a,
+.jush-simpledb a {
+	font-weight: normal;
+}
+
+.jush-bac,
+.jush-php_bac,
+.jush-bra,
+.jush-mssql_bra,
+.jush-sqlite_quo {
+	color: #009900;
+}
+
+.jush-php_quo,
+.jush-quo,
+.jush-quo_one,
+.jush-php_eot,
+.jush-apo,
+.jush-sql_apo,
+.jush-sqlite_apo,
+.jush-sql_quo,
+.jush-sql_eot {
+	color: #ce7b00;
+}
+
+.jush-num,
+.jush-clr {
+	color: #000;
+}
+
+@media print {
+	.logout {
+		display: none;
+	}
+	
+	#breadcrumb {
+		position: static;
+	}
+	
+	#content {
+		margin: 0;
+	}
+}

designs/price/adminer.css

@@ -62,7 +62,6 @@ td{background-color:#f4f8ff}
 tbody tr:hover td,tbody tr:hover th{background-color:#FFE}
 p.tabs{margin:0 20px 0 0}
 .jush-sql{background:0}
-.jush{padding:5px 15px 3px;margin:0 20px;background-color:#fff;border:1px solid #369;border-radius:4px}
 fieldset{border:1px solid #999;border-radius:5px;display:inline;margin:.8em .5em 0 0;padding:.5em .8em;vertical-align:top}
 a{color:#369}
 a:hover{color:#28c}

editor/db.inc.php

@@ -15,7 +15,7 @@ if ($adminer->homepage()) {
 		if (isset($row["Engine"]) && $name != "") {
 			echo '<tr' . odd() . '><td>' . checkbox("tables[]", $table, in_array($table, (array) $_POST["tables"], true), "", "formUncheck('check-all');");
 			echo "<th><a href='" . h(ME) . 'select=' . urlencode($table) . "'>$name</a>";
-			$val = number_format($row["Rows"], 0, '.', lang(','));
+			$val = format_number($row["Rows"]);
 			echo "<td align='right'><a href='" . h(ME . "edit=") . urlencode($table) . "'>" . ($row["Engine"] == "InnoDB" && $val ? "~ $val" : $val) . "</a>";
 		}
 	}

editor/include/adminer.inc.php

@@ -17,6 +17,10 @@ class Adminer {
 		return password_file($create);
 	}
 
+	function bruteForceKey() {
+		return $_SERVER["REMOTE_ADDR"];
+	}
+
 	function database() {
 		global $connection;
 		if ($connection) {
@@ -128,8 +132,8 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 		}
 	}
 
-	function selectQuery($query) {
-		return "<!--\n" . str_replace("--", "--><!-- ", $query) . "\n-->\n";
+	function selectQuery($query, $time) {
+		return "<!--\n" . str_replace("--", "--><!-- ", $query) . "\n($time)\n-->\n";
 	}
 
 	function rowDescription($table) {
@@ -183,7 +187,7 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 			$return = ($val ? lang('yes') : lang('no'));
 		}
 		if ($link) {
-			$return = "<a href='$link'>$return</a>";
+			$return = "<a href='$link'" . (is_url($link) ? " rel='noreferrer'" : "") . ">$return</a>";
 		}
 		if (!$link && !like_bool($field) && preg_match('~int|float|double|decimal~', $field["type"])) {
 			$return = "<div class='number'>$return</div>"; // Firefox doesn't support <colgroup>
@@ -425,8 +429,8 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 		return "";
 	}
 
-	function messageQuery($query) {
-		return " <span class='time'>" . @date("H:i:s") . "</span><!--\n" . str_replace("--", "--><!-- ", $query) . "\n-->";
+	function messageQuery($query, $time) {
+		return " <span class='time'>" . @date("H:i:s") . "</span><!--\n" . str_replace("--", "--><!-- ", $query) . "\n" . ($time ? "($time)\n" : "") . "-->";
 	}
 
 	function editFunctions($field) {
@@ -581,7 +585,10 @@ ORDER BY ORDINAL_POSITION", null, "") as $row) { //! requires MySQL 5
 		foreach ($tables as $row) {
 			$name = $this->tableName($row);
 			if (isset($row["Engine"]) && $name != "") { // ignore views and tables without name
-				echo "<a href='" . h(ME) . 'select=' . urlencode($row["Name"]) . "'" . bold($_GET["select"] == $row["Name"] || $_GET["edit"] == $row["Name"]) . " title='" . lang('Select data') . "'>$name</a><br>\n";
+				echo "<a href='" . h(ME) . 'select=' . urlencode($row["Name"]) . "'"
+					. bold($_GET["select"] == $row["Name"] || $_GET["edit"] == $row["Name"], "select")
+					. " title='" . lang('Select data') . "'>$name</a><br>\n"
+				;
 			}
 		}
 	}

editor/script.inc.php

@@ -1,6 +1,6 @@
 <?php
 if ($_GET["script"] == "kill") {
-	$connection->query("KILL " . (+$_POST["kill"]));
+	$connection->query("KILL " . number($_POST["kill"]));
 
 } elseif (list($table, $id, $name) = $adminer->_foreignColumn(column_foreign_keys($_GET["source"]), $_GET["field"])) {
 	$limit = 11;

editor/static/editing.js

@@ -1,6 +1,14 @@
 // Editor specific functions
 
-function selectFieldChange(form) {
+function selectFieldChange() {
+}
+
+var helpOpen;
+
+function helpMouseover() {
+}
+
+function helpMouseout() {
 }
 
 function whisperClick(event, field) {

plugins/dump-alter.php

@@ -12,7 +12,7 @@ class AdminerDumpAlter {
 		if (DRIVER == 'server') {
 			return array('sql_alter' => 'Alter');
 		}
-	}	
+	}
 	
 	function _database() {
 		// drop old tables
@@ -29,15 +29,15 @@ CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
 		FETCH tables INTO _table_name, _engine, _table_collation, _table_comment;
 		IF NOT done THEN
 			CASE _table_name";
-			foreach (get_rows($query) as $row) {
-				$comment = q($row["ENGINE"] == "InnoDB" ? preg_replace('~(?:(.+); )?InnoDB free: .*~', '\\1', $row["TABLE_COMMENT"]) : $row["TABLE_COMMENT"]);
-				echo "
+		foreach (get_rows($query) as $row) {
+			$comment = q($row["ENGINE"] == "InnoDB" ? preg_replace('~(?:(.+); )?InnoDB free: .*~', '\\1', $row["TABLE_COMMENT"]) : $row["TABLE_COMMENT"]);
+			echo "
 			WHEN " . q($row["TABLE_NAME"]) . " THEN
 				" . (isset($row["ENGINE"]) ? "IF _engine != '$row[ENGINE]' OR _table_collation != '$row[TABLE_COLLATION]' OR _table_comment != $comment THEN
 					ALTER TABLE " . idf_escape($row["TABLE_NAME"]) . " ENGINE=$row[ENGINE] COLLATE=$row[TABLE_COLLATION] COMMENT=$comment;
 				END IF" : "BEGIN END") . ";";
-			}
-			echo "
+		}
+		echo "
 				ELSE
 					SET alter_command = CONCAT(alter_command, 'DROP TABLE `', REPLACE(_table_name, '`', '``'), '`;\\n');
 			END CASE;
@@ -114,17 +114,16 @@ CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
 		IF NOT done THEN
 			SET set_after = 1;
 			CASE _column_name";
-			foreach ($fields as $row) {
-				echo "
+				foreach ($fields as $row) {
+					echo "
 				WHEN " . q($row["COLUMN_NAME"]) . " THEN
 					SET add_columns = REPLACE(add_columns, ', ADD $row[alter]', IF(
 						_column_default <=> $row[default] AND _is_nullable = '$row[IS_NULLABLE]' AND _collation_name <=> " . (isset($row["COLLATION_NAME"]) ? "'$row[COLLATION_NAME]'" : "NULL") . " AND _column_type = " . q($row["COLUMN_TYPE"]) . " AND _extra = '$row[EXTRA]' AND _column_comment = " . q($row["COLUMN_COMMENT"]) . " AND after = $row[after]
-					, '', ', MODIFY $row[alter]'));"
-				; //! don't replace in comment
-			}
-			echo "
+					, '', ', MODIFY $row[alter]'));"; //! don't replace in comment
+				}
+				echo "
 				ELSE
-					SET @alter_table = CONCAT(@alter_table, ', DROP ', _column_name);
+					SET @alter_table = CONCAT(@alter_table, ', DROP ', '`', REPLACE(_column_name, '`', '``'), '`');
 					SET set_after = 0;
 			END CASE;
 			IF set_after THEN
@@ -148,4 +147,9 @@ DROP PROCEDURE adminer_alter;
 		}
 	}
 	
+	function dumpData() {
+		if ($_POST["format"] == "sql_alter") {
+			return true;
+		}
+	}
 }

plugins/dump-php.php

@@ -0,0 +1,51 @@
+<?php
+
+/** Dump to PHP format
+* @author Martin Zeman (Zemistr), http://www.zemistr.eu/
+* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
+*/
+class AdminerDumpPhp {
+	var $output = array();
+	var $shutdown_callback = false;
+
+	function dumpFormat() {
+		return array('php' => 'PHP');
+	}
+
+	function dumpHeaders() {
+		if ($_POST['format'] == 'php') {
+			header('Content-Type: text/plain; charset=utf-8');
+			return 'php';
+		}
+	}
+
+	function dumpTable($table) {
+		if ($_POST['format'] == 'php') {
+			$this->output[$table] = array();
+			if (!$this->shutdown_callback) {
+				$this->shutdown_callback = true;
+				register_shutdown_function(array($this, '_export'));
+			}
+			return true;
+		}
+	}
+
+	function dumpData($table, $style, $query) {
+		if ($_POST['format'] == 'php') {
+			$connection = connection();
+			$result = $connection->query($query, 1);
+			if ($result) {
+				while ($row = $result->fetch_assoc()) {
+					$this->output[$table][] = $row;
+				}
+			}
+			return true;
+		}
+	}
+
+	function _export() {
+		echo "<?php\n";
+		var_export($this->output);
+	}
+}

plugins/edit-foreign.php

@@ -7,6 +7,11 @@
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerEditForeign {
+	var $_limit;
+	
+	function AdminerEditForeign($limit = 0) {
+		$this->_limit = $limit;
+	}
 	
 	function editInput($table, $field, $attrs, $value) {
 		static $foreignTables = array();
@@ -22,6 +27,9 @@ class AdminerEditForeign {
 				$options = &$values[$target][$id];
 				if (!$options) {
 					$options = array("" => "") + get_vals("SELECT " . idf_escape($id) . " FROM " . table($target) . " ORDER BY 1");
+					if ($this->_limit && count($options) - 1 > $this->_limit) {
+						return;
+					}
 				}
 				return "<select$attrs>" . optionlist($options, $value) . "</select>";
 			}

plugins/json-column.php

@@ -3,19 +3,46 @@
 /** Display JSON values as table in edit
 * @link http://www.adminer.org/plugins/#use
 * @author Jakub Vrana, http://www.vrana.cz/
+* @author Martin Zeman (Zemistr), http://www.zemistr.eu/
 * @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
 * @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 class AdminerJsonColumn {
-	
-	function editInput($table, $field, $attrs, $value) {
-		if (substr($value, 0, 1) == '{' && ($json = json_decode($value, true))) {
-			echo "<table cellspacing='0'>";
-			foreach ($json as $key => $val) {
-				echo "<tr><th>" . h($key) . "<td><code class='jush-js'>" . h(json_encode($val)) . "</code>";
-			}
-			echo "</table>";
+	private function _testJson($value) {
+		if ((substr($value, 0, 1) == '{' || substr($value, 0, 1) == '[') && ($json = json_decode($value, true))) {
+			return $json;
 		}
+		return $value;
 	}
 
+	private function _buildTable($json) {
+		echo '<table cellspacing="0" style="margin:2px">';
+		foreach ($json as $key => $val) {
+			echo '<tr>';
+			echo '<th>' . h($key) . '</th>';
+			echo '<td>';
+			if (is_scalar($val) || $val === null) {
+				if (is_bool($val)) {
+					$val = $val ? 'true' : 'false';
+				} elseif ($val === null) {
+					$val = 'null';
+				} elseif (!is_numeric($val)) {
+					$val = '"' . h(addcslashes($val, "\r\n\"")) . '"';
+				}
+				echo '<code class="jush-js">' . $val . '</code>';
+			} else {
+				$this->_buildTable($val);
+			}
+			echo '</td>';
+			echo '</tr>';
+		}
+		echo '</table>';
+	}
+
+	function editInput($table, $field, $attrs, $value) {
+		$json = $this->_testJson($value);
+		if ($json !== $value) {
+			$this->_buildTable($json);
+		}
+	}
 }

plugins/master-slave.php

@@ -30,7 +30,7 @@ class AdminerMasterSlave {
 		}
 	}
 
-	function messageQuery($query) {
+	function messageQuery($query, $time) {
 		//! doesn't work with sql.inc.php
 		$connection = connection();
 		$result = $connection->query('SHOW MASTER STATUS');

plugins/password-sha1.php

@@ -1,39 +0,0 @@
-<?php
-
-/** Store password's SHA1 to session
-* @link http://www.adminer.org/plugins/#use
-* @author Jakub Vrana, http://www.vrana.cz/
-* @license http://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
-* @license http://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
-*/
-class AdminerPasswordSha1 {
-	/** @access protected */
-	var $login, $passwordSha1, $credentials;
-	
-	/**
-	* @param string
-	* @param string
-	* @param array returned by credentials()
-	*/
-	function AdminerPasswordSha1($login, $passwordSha1, $credentials) {
-		$this->login = $login;
-		$this->passwordSha1 = $passwordSha1;
-		$this->credentials = $credentials;
-		if (isset($_POST["auth"])) {
-			$_POST["auth"]["password"] = sha1($_POST["auth"]["password"]);
-		}
-	}
-	
-	function login($login, $password) {
-		return ($login == $this->login && $password == $this->passwordSha1);
-	}
-	
-	function credentials() {
-		return $this->credentials;
-	}
-	
-	function permanentLogin() {
-		//! should save original $_POST["auth"]["password"] and hash after load
-	}
-	
-}

plugins/sql-log.php

@@ -17,7 +17,7 @@ class AdminerSqlLog {
 		$this->filename = $filename;
 	}
 	
-	function messageQuery($query) {
+	function messageQuery($query, $time) {
 		if ($this->filename == "") {
 			$adminer = adminer();
 			$this->filename = $adminer->database() . ".sql"; // no database goes to ".sql" to avoid collisions