Release 4.3.1

Fixes https://sourceforge.net/p/adminer/bugs-and-features/521/.

.gitignore

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

.gitmodules

@@ -1,21 +1,9 @@
 [submodule "jush"]
 	path = externals/jush
-	url = git://jush.git.sourceforge.net/gitroot/jush/jush
-[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
+	url = git://git.code.sf.net/p/jush/git
 [submodule "wymeditor"]
 	path = externals/wymeditor
 	url = git://github.com/wymeditor/wymeditor.git
 [submodule "JsShrink"]
 	path = externals/JsShrink
 	url = git://github.com/vrana/JsShrink.git
-[submodule "CodeMirror2"]
-	path = externals/CodeMirror2
-	url = git://github.com/marijnh/CodeMirror2.git

.travis.yml

@@ -0,0 +1,5 @@
+language: php
+php:
+  - '5.3'
+  - '7.1'
+script: git diff --name-only $TRAVIS_COMMIT_RANGE | grep '\.php$' | xargs -n1 -P8 php -l | grep -v 'No syntax errors'; test $? -eq 1

adminer/call.inc.php

@@ -28,8 +28,10 @@ if (!$error && $_POST) {
 		}
 		$call[] = (isset($out[$key]) ? "@" . idf_escape($field["field"]) : $val);
 	}
-	$query = (isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . idf_escape($PROCEDURE) . "(" . implode(", ", $call) . ")";
+	
+	$query = (isset($_GET["callf"]) ? "SELECT" : "CALL") . " " . table($PROCEDURE) . "(" . implode(", ", $call) . ")";
 	echo "<p><code class='jush-$jush'>" . h($query) . "</code> <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>\n";
+	
 	if (!$connection->multi_query($query)) {
 		echo "<p class='error'>" . error() . "\n";
 	} else {
@@ -37,6 +39,7 @@ if (!$error && $_POST) {
 		if (is_object($connection2)) {
 			$connection2->select_db(DB);
 		}
+		
 		do {
 			$result = $connection->store_result();
 			if (is_object($result)) {
@@ -45,6 +48,7 @@ if (!$error && $_POST) {
 				echo "<p class='message'>" . lang('Routine has been called, %d row(s) affected.', $connection->affected_rows) . "\n";
 			}
 		} while ($connection->next_result());
+		
 		if ($out) {
 			select($connection->query("SELECT " . implode(", ", $out)));
 		}

adminer/create.inc.php

@@ -1,6 +1,9 @@
 <?php
 $TABLE = $_GET["create"];
-$partition_by = array('HASH', 'LINEAR HASH', 'KEY', 'LINEAR KEY', 'RANGE', 'LIST');
+$partition_by = array();
+foreach (array('HASH', 'LINEAR HASH', 'KEY', 'LINEAR KEY', 'RANGE', 'LIST') as $key) {
+	$partition_by[$key] = $key;
+}
 
 $referencable_primary = referencable_primary($TABLE);
 $foreign_keys = array();
@@ -9,39 +12,40 @@ foreach ($referencable_primary as $table_name => $field) {
 }
 
 $orig_fields = array();
-$orig_status = array();
+$table_status = array();
 if ($TABLE != "") {
 	$orig_fields = fields($TABLE);
-	$orig_status = table_status($TABLE);
-}
-if ($_POST && !$_POST["fields"]) {
-	$_POST["fields"] = array();
+	$table_status = table_status($TABLE);
+	if (!$table_status) {
+		$error = lang('No tables.');
+	}
 }
 
-if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"] && !$_POST["down"]) {
+$row = $_POST;
+$row["fields"] = (array) $row["fields"];
+if ($row["auto_increment_col"]) {
+	$row["fields"][$row["auto_increment_col"]]["auto_increment"] = true;
+}
+
+if ($_POST && !process_fields($row["fields"]) && !$error) {
 	if ($_POST["drop"]) {
-		query_redirect("DROP TABLE " . table($TABLE), substr(ME, 0, -1), lang('Table has been dropped.'));
+		queries_redirect(substr(ME, 0, -1), lang('Table has been dropped.'), drop_tables(array($TABLE)));
 	} else {
 		$fields = array();
 		$all_fields = array();
 		$use_all_fields = false;
 		$foreign = array();
-		ksort($_POST["fields"]);
 		$orig_field = reset($orig_fields);
 		$after = " FIRST";
-		foreach ($_POST["fields"] as $key => $field) {
+
+		foreach ($row["fields"] as $key => $field) {
 			$foreign_key = $foreign_keys[$field["type"]];
 			$type_field = ($foreign_key !== null ? $referencable_primary[$foreign_key] : $field); //! can collide with user defined type
 			if ($field["field"] != "") {
 				if (!$field["has_default"]) {
 					$field["default"] = null;
 				}
-				$default = eregi_replace(" *on update CURRENT_TIMESTAMP", "", $field["default"]);
-				if ($default != $field["default"]) { // preg_replace $count is available since PHP 5.1.0
-					$field["on_update"] = "CURRENT_TIMESTAMP";
-					$field["default"] = $default;
-				}
-				if ($key == $_POST["auto_increment_col"]) {
+				if ($key == $row["auto_increment_col"]) {
 					$field["auto_increment"] = true;
 				}
 				$process_field = process_field($field, $type_field);
@@ -53,7 +57,12 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
 					}
 				}
 				if ($foreign_key !== null) {
-					$foreign[idf_escape($field["field"])] = ($TABLE != "" && $jush != "sqlite" ? "ADD" : " ") . " FOREIGN KEY (" . idf_escape($field["field"]) . ") REFERENCES " . table($foreign_keys[$field["type"]]) . " (" . idf_escape($type_field["field"]) . ")" . (ereg("^($on_actions)\$", $field["on_delete"]) ? " ON DELETE $field[on_delete]" : "");
+					$foreign[idf_escape($field["field"])] = ($TABLE != "" && $jush != "sqlite" ? "ADD" : " ") . format_foreign_key(array(
+						'table' => $foreign_keys[$field["type"]],
+						'source' => array($field["field"]),
+						'target' => array($type_field["field"]),
+						'on_delete' => $field["on_delete"],
+					));
 				}
 				$after = " AFTER " . idf_escape($field["field"]);
 			} elseif ($field["orig"] != "") {
@@ -67,89 +76,79 @@ if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"]
 				}
 			}
 		}
+
 		$partitioning = "";
-		if (in_array($_POST["partition_by"], $partition_by)) {
+		if ($partition_by[$row["partition_by"]]) {
 			$partitions = array();
-			if ($_POST["partition_by"] == 'RANGE' || $_POST["partition_by"] == 'LIST') {
-				foreach (array_filter($_POST["partition_names"]) as $key => $val) {
-					$value = $_POST["partition_values"][$key];
-					$partitions[] = "\nPARTITION " . idf_escape($val) . " VALUES " . ($_POST["partition_by"] == 'RANGE' ? "LESS THAN" : "IN") . ($value != "" ? " ($value)" : " MAXVALUE"); //! SQL injection
+			if ($row["partition_by"] == 'RANGE' || $row["partition_by"] == 'LIST') {
+				foreach (array_filter($row["partition_names"]) as $key => $val) {
+					$value = $row["partition_values"][$key];
+					$partitions[] = "\n  PARTITION " . idf_escape($val) . " VALUES " . ($row["partition_by"] == 'RANGE' ? "LESS THAN" : "IN") . ($value != "" ? " ($value)" : " MAXVALUE"); //! SQL injection
 				}
 			}
-			$partitioning .= "\nPARTITION BY $_POST[partition_by]($_POST[partition])" . ($partitions // $_POST["partition"] can be expression, not only column
+			$partitioning .= "\nPARTITION BY $row[partition_by]($row[partition])" . ($partitions // $row["partition"] can be expression, not only column
 				? " (" . implode(",", $partitions) . "\n)"
-				: ($_POST["partitions"] ? " PARTITIONS " . (+$_POST["partitions"]) : "")
+				: ($row["partitions"] ? " PARTITIONS " . (+$row["partitions"]) : "")
 			);
-		} elseif (support("partitioning") && ereg("partitioned", $orig_status["Create_options"])) {
+		} elseif (support("partitioning") && preg_match("~partitioned~", $table_status["Create_options"])) {
 			$partitioning .= "\nREMOVE PARTITIONING";
 		}
+
 		$message = lang('Table has been altered.');
 		if ($TABLE == "") {
-			cookie("adminer_engine", $_POST["Engine"]);
+			cookie("adminer_engine", $row["Engine"]);
 			$message = lang('Table has been created.');
 		}
-		$name = trim($_POST["name"]);
-		queries_redirect(ME . "table=" . urlencode($name), $message, alter_table(
+		$name = trim($row["name"]);
+
+		queries_redirect(ME . (support("table") ? "table=" : "select=") . urlencode($name), $message, alter_table(
 			$TABLE,
 			$name,
 			($jush == "sqlite" && ($use_all_fields || $foreign) ? $all_fields : $fields),
 			$foreign,
-			$_POST["Comment"],
-			($_POST["Engine"] && $_POST["Engine"] != $orig_status["Engine"] ? $_POST["Engine"] : ""),
-			($_POST["Collation"] && $_POST["Collation"] != $orig_status["Collation"] ? $_POST["Collation"] : ""),
-			($_POST["Auto_increment"] != "" ? +$_POST["Auto_increment"] : ""),
+			($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"] != "" ? number($row["Auto_increment"]) : ""),
 			$partitioning
 		));
 	}
 }
 
-page_header(($TABLE != "" ? lang('Alter table') : lang('Create table')), $error, array("table" => $TABLE), $TABLE);
+page_header(($TABLE != "" ? lang('Alter table') : lang('Create table')), $error, array("table" => $TABLE), h($TABLE));
 
-$row = array(
-	"Engine" => $_COOKIE["adminer_engine"],
-	"fields" => array(array("field" => "", "type" => (isset($types["int"]) ? "int" : (isset($types["integer"]) ? "integer" : "")))),
-	"partition_names" => array(""),
-);
-if ($_POST) {
-	$row = $_POST;
-	if ($row["auto_increment_col"]) {
-		$row["fields"][$row["auto_increment_col"]]["auto_increment"] = true;
-	}
-	process_fields($row["fields"]);
-} elseif ($TABLE != "") {
-	$row = $orig_status;
-	$row["name"] = $TABLE;
-	$row["fields"] = array();
-	if (!$_GET["auto_increment"]) { // don't prefill by original Auto_increment for the sake of performance and not reusing deleted ids
-		$row["Auto_increment"] = "";
-	}
-	foreach ($orig_fields as $field) {
-		$field["has_default"] = isset($field["default"]);
-		if ($field["on_update"]) {
-			$field["default"] .= " ON UPDATE $field[on_update]"; // CURRENT_TIMESTAMP
+if (!$_POST) {
+	$row = array(
+		"Engine" => $_COOKIE["adminer_engine"],
+		"fields" => array(array("field" => "", "type" => (isset($types["int"]) ? "int" : (isset($types["integer"]) ? "integer" : "")))),
+		"partition_names" => array(""),
+	);
+
+	if ($TABLE != "") {
+		$row = $table_status;
+		$row["name"] = $TABLE;
+		$row["fields"] = array();
+		if (!$_GET["auto_increment"]) { // don't prefill by original Auto_increment for the sake of performance and not reusing deleted ids
+			$row["Auto_increment"] = "";
 		}
-		$row["fields"][] = $field;
-	}
-	if (support("partitioning")) {
-		$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . q(DB) . " AND TABLE_NAME = " . q($TABLE);
-		$result = $connection->query("SELECT PARTITION_METHOD, PARTITION_ORDINAL_POSITION, PARTITION_EXPRESSION $from ORDER BY PARTITION_ORDINAL_POSITION DESC LIMIT 1");
-		list($row["partition_by"], $row["partitions"], $row["partition"]) = $result->fetch_row();
-		$row["partition_names"] = array();
-		$row["partition_values"] = array();
-		foreach (get_rows("SELECT PARTITION_NAME, PARTITION_DESCRIPTION $from AND PARTITION_NAME != '' ORDER BY PARTITION_ORDINAL_POSITION") as $row1) {
-			$row["partition_names"][] = $row1["PARTITION_NAME"];
-			$row["partition_values"][] = $row1["PARTITION_DESCRIPTION"];
+		foreach ($orig_fields as $field) {
+			$field["has_default"] = isset($field["default"]);
+			$row["fields"][] = $field;
+		}
+
+		if (support("partitioning")) {
+			$from = "FROM information_schema.PARTITIONS WHERE TABLE_SCHEMA = " . q(DB) . " AND TABLE_NAME = " . q($TABLE);
+			$result = $connection->query("SELECT PARTITION_METHOD, PARTITION_ORDINAL_POSITION, PARTITION_EXPRESSION $from ORDER BY PARTITION_ORDINAL_POSITION DESC LIMIT 1");
+			list($row["partition_by"], $row["partitions"], $row["partition"]) = $result->fetch_row();
+			$partitions = get_key_vals("SELECT PARTITION_NAME, PARTITION_DESCRIPTION $from AND PARTITION_NAME != '' ORDER BY PARTITION_ORDINAL_POSITION");
+			$partitions[""] = "";
+			$row["partition_names"] = array_keys($partitions);
+			$row["partition_values"] = array_values($partitions);
 		}
-		$row["partition_names"][] = "";
 	}
 }
+
 $collations = collations();
-
-$suhosin = floor(extension_loaded("suhosin") ? (min(ini_get("suhosin.request.max_vars"), ini_get("suhosin.post.max_vars")) - 13) / 10 : 0); // 10 - number of fields per row, 13 - number of other fields
-if ($suhosin && count($row["fields"]) > $suhosin) {
-	echo "<p class='error'>" . h(lang('Maximum number of allowed fields exceeded. Please increase %s and %s.', 'suhosin.post.max_vars', 'suhosin.request.max_vars')) . "\n";
-}
-
 $engines = engines();
 // case of engine may differ
 foreach ($engines as $engine) {
@@ -162,11 +161,15 @@ foreach ($engines as $engine) {
 
 <form action="" method="post" id="form">
 <p>
-<?php echo lang('Table name'); ?>: <input name="name" maxlength="64" value="<?php echo h($row["name"]); ?>">
-<?php if ($TABLE == "" && !$_POST) { ?><script type='text/javascript'>document.getElementById('form')['name'].focus();</script><?php } ?>
-<?php echo ($engines ? html_select("Engine", array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) : ""); ?>
- <?php echo ($collations && !ereg("sqlite|mssql", $jush) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
+<?php if (support("columns") || $TABLE == "") { ?>
+<?php echo lang('Table name'); ?>: <input name="name" maxlength="64" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
+<?php if ($TABLE == "" && !$_POST) { ?><script type='text/javascript'>focus(document.getElementById('form')['name']);</script><?php } ?>
+<?php echo ($engines ? "<select name='Engine' onchange='helpClose();'" . on_help("getTarget(event).value", 1) . ">" . optionlist(array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . "</select>" : ""); ?>
+ <?php echo ($collations && !preg_match("~sqlite|mssql~", $jush) ? html_select("Collation", array("" => "(" . lang('collation') . ")") + $collations, $row["Collation"]) : ""); ?>
  <input type="submit" value="<?php echo lang('Save'); ?>">
+<?php } ?>
+
+<?php if (support("columns")) { ?>
 <table cellspacing="0" id="edit-fields" class="nowrap">
 <?php
 $comments = ($_POST ? $_POST["comments"] : $row["Comment"] != "");
@@ -178,32 +181,38 @@ if (!$_POST && !$comments) {
 		}
 	}
 }
-edit_fields($row["fields"], $collations, "TABLE", $suhosin, $foreign_keys, $comments);
+edit_fields($row["fields"], $collations, "TABLE", $foreign_keys, $comments);
 ?>
 </table>
 <p>
-<?php echo lang('Auto Increment'); ?>: <input name="Auto_increment" size="6" value="<?php echo h($row["Auto_increment"]); ?>">
-<label class="jsonly"><input type="checkbox" name="defaults" value="1"<?php echo ($_POST["defaults"] ? " checked" : ""); ?> onclick="columnShow(this.checked, 5);"><?php echo lang('Default values'); ?></label>
-<?php echo (support("comment") ? checkbox("comments", 1, $comments, lang('Comment'), "columnShow(this.checked, 6); toggle('Comment'); if (this.checked) this.form['Comment'].focus();", true) . ' <input id="Comment" name="Comment" value="' . h($row["Comment"]) . '" maxlength="60"' . ($comments ? '' : ' class="hidden"') . '>' : ''); ?>
+<?php echo lang('Auto Increment'); ?>: <input type="number" name="Auto_increment" size="6" value="<?php echo h($row["Auto_increment"]); ?>">
+<?php echo checkbox("defaults", 1, true, lang('Default values'), "columnShow(this.checked, 5)", "jsonly"); ?>
+<?php if (!$_POST["defaults"]) { ?><script type="text/javascript">editingHideDefaults()</script><?php } ?>
+<?php echo (support("comment")
+	? "<label><input type='checkbox' name='comments' value='1' class='jsonly' onclick=\"columnShow(this.checked, 6); toggle('Comment'); if (this.checked) this.form['Comment'].focus();\"" . ($comments ? " checked" : "") . ">" . lang('Comment') . "</label>"
+		. ' <input name="Comment" id="Comment" value="' . h($row["Comment"]) . '" maxlength="' . ($connection->server_info >= 5.5 ? 2048 : 60) . '"' . ($comments ? '' : ' class="hidden"') . '>'
+	: '')
+; ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($_GET["create"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
-<input type="hidden" name="token" value="<?php echo $token; ?>">
+<?php } ?>
+
+<?php if ($TABLE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
 <?php
 if (support("partitioning")) {
-	$partition_table = ereg('RANGE|LIST', $row["partition_by"]);
+	$partition_table = preg_match('~RANGE|LIST~', $row["partition_by"]);
 	print_fieldset("partition", lang('Partition by'), $row["partition_by"]);
 	?>
 <p>
-<?php echo html_select("partition_by", array(-1 => "") + $partition_by, $row["partition_by"], "partitionByChange(this);"); ?>
+<?php echo "<select name='partition_by' onchange='partitionByChange(this);'" . on_help("getTarget(event).value.replace(/./, 'PARTITION BY \$&')", 1) . ">" . optionlist(array("" => "") + $partition_by, $row["partition_by"]) . "</select>"; ?>
 (<input name="partition" value="<?php echo h($row["partition"]); ?>">)
-<?php echo lang('Partitions'); ?>: <input name="partitions" size="2" value="<?php echo h($row["partitions"]); ?>"<?php echo ($partition_table || !$row["partition_by"] ? " class='hidden'" : ""); ?>>
+<?php echo lang('Partitions'); ?>: <input type="number" name="partitions" class="size<?php echo ($partition_table || !$row["partition_by"] ? " hidden" : ""); ?>" value="<?php echo h($row["partitions"]); ?>">
 <table cellspacing="0" id="partition-table"<?php echo ($partition_table ? "" : " class='hidden'"); ?>>
 <thead><tr><th><?php echo lang('Partition name'); ?><th><?php echo lang('Values'); ?></thead>
 <?php
 foreach ($row["partition_names"] as $key => $val) {
 	echo '<tr>';
-	echo '<td><input name="partition_names[]" value="' . h($val) . '"' . ($key == count($row["partition_names"]) - 1 ? ' onchange="partitionNameChange(this);"' : '') . '>';
+	echo '<td><input name="partition_names[]" value="' . h($val) . '"' . ($key == count($row["partition_names"]) - 1 ? ' onchange="partitionNameChange(this);"' : '') . ' autocapitalize="off">';
 	echo '<td><input name="partition_values[]" value="' . h($row["partition_values"][$key]) . '">';
 }
 ?>
@@ -212,4 +221,5 @@ foreach ($row["partition_names"] as $key => $val) {
 <?php
 }
 ?>
+<input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/database.inc.php

@@ -1,7 +1,8 @@
 <?php
+$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($_POST["name"]);
+	$name = trim($row["name"]);
 	if ($_POST["drop"]) {
 		$_GET["db"] = ""; // to save in global history
 		queries_redirect(remove_from_uri("db|database"), lang('Database has been dropped.'), drop_databases(array(DB)));
@@ -9,40 +10,40 @@ if ($_POST && !$error && !isset($_POST["add_x"])) { // add is an image and PHP c
 		// create or rename database
 		if (DB != "") {
 			$_GET["db"] = $name;
-			queries_redirect(preg_replace('~db=[^&]*&~', '', ME) . "db=" . urlencode($name), lang('Database has been renamed.'), rename_database($name, $_POST["collation"]));
+			queries_redirect(preg_replace('~\bdb=[^&]*&~', '', ME) . "db=" . urlencode($name), lang('Database has been renamed.'), rename_database($name, $row["collation"]));
 		} else {
 			$databases = explode("\n", str_replace("\r", "", $name));
 			$success = true;
 			$last = "";
 			foreach ($databases as $db) {
 				if (count($databases) == 1 || $db != "") { // ignore empty lines but always try to create single database
-					if (!create_database($db, $_POST["collation"])) {
+					if (!create_database($db, $row["collation"])) {
 						$success = false;
 					}
 					$last = $db;
 				}
 			}
+			restart_session();
+			set_session("dbs", null);
 			queries_redirect(ME . "db=" . urlencode($last), lang('Database has been created.'), $success);
 		}
 	} else {
 		// alter database
-		if (!$_POST["collation"]) {
+		if (!$row["collation"]) {
 			redirect(substr(ME, 0, -1));
 		}
-		query_redirect("ALTER DATABASE " . idf_escape($name) . (eregi('^[a-z0-9_]+$', $_POST["collation"]) ? " COLLATE $_POST[collation]" : ""), substr(ME, 0, -1), lang('Database has been altered.'));
+		query_redirect("ALTER DATABASE " . idf_escape($name) . (preg_match('~^[a-z0-9_]+$~i', $row["collation"]) ? " COLLATE $row[collation]" : ""), substr(ME, 0, -1), lang('Database has been altered.'));
 	}
 }
 
-page_header(DB != "" ? lang('Alter database') : lang('Create database'), $error, array(), DB);
+page_header(DB != "" ? lang('Alter database') : lang('Create database'), $error, array(), h(DB));
 
 $collations = collations();
 $name = DB;
-$collate = null;
 if ($_POST) {
-	$name = $_POST["name"];
-	$collate = $_POST["collation"];
+	$name = $row["name"];
 } elseif (DB != "") {
-	$collate = db_collation(DB, $collations);
+	$row["collation"] = db_collation(DB, $collations);
 } elseif ($jush == "sql") {
 	// propose database name with limited privileges
 	foreach (get_vals("SHOW GRANTS") as $grant) {
@@ -59,16 +60,19 @@ if ($_POST) {
 <?php
 echo ($_POST["add_x"] || strpos($name, "\n")
 	? '<textarea id="name" name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
-	: '<input id="name" name="name" value="' . h($name) . '" maxlength="64">'
-) . "\n" . ($collations ? html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $collate) : "");
+	: '<input name="name" id="name" value="' . h($name) . '" maxlength="64" autocapitalize="off">'
+) . "\n" . ($collations ? html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $row["collation"]) . doc_link(array(
+	'sql' => "charset-charsets.html",
+	'mssql' => "ms187963.aspx",
+)) : "");
 ?>
-<script type='text/javascript'>document.getElementById('name').focus();</script>
+<script type='text/javascript'>focus(document.getElementById('name'));</script>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if (DB != "") {
 	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
 } elseif (!$_POST["add_x"] && $_GET["db"] == "") {
-	echo "<input type='image' name='add' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>\n";
+	echo "<input type='image' class='icon' name='add' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>\n";
 }
 ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">

adminer/db.inc.php

@@ -7,6 +7,7 @@ if ($tables_views && !$error && !$_POST["search"]) {
 	if ($jush == "sql" && count($_POST["tables"]) > 1 && ($_POST["drop"] || $_POST["truncate"] || $_POST["copy"])) {
 		queries("SET foreign_key_checks = 0"); // allows to truncate or drop several tables at once
 	}
+
 	if ($_POST["truncate"]) {
 		if ($_POST["tables"]) {
 			$result = truncate_tables($_POST["tables"]);
@@ -32,11 +33,14 @@ if ($tables_views && !$error && !$_POST["search"]) {
 			: apply_queries("VACUUM" . ($_POST["optimize"] ? "" : " ANALYZE"), $_POST["tables"])
 		);
 		$message = lang('Tables have been optimized.');
-	} elseif ($_POST["tables"] && ($result = queries(($_POST["optimize"] ? "OPTIMIZE" : ($_POST["check"] ? "CHECK" : ($_POST["repair"] ? "REPAIR" : "ANALYZE"))) . " TABLE " . implode(", ", array_map('idf_escape', $_POST["tables"]))))) {
+	} elseif (!$_POST["tables"]) {
+		$message = lang('No tables.');
+	} elseif ($result = queries(($_POST["optimize"] ? "OPTIMIZE" : ($_POST["check"] ? "CHECK" : ($_POST["repair"] ? "REPAIR" : "ANALYZE"))) . " TABLE " . implode(", ", array_map('idf_escape', $_POST["tables"])))) {
 		while ($row = $result->fetch_assoc()) {
 			$message .= "<b>" . h($row["Table"]) . "</b>: " . h($row["Msg_text"]) . "<br>";
 		}
 	}
+
 	queries_redirect(substr(ME, 0, -1), $message, $result);
 }
 
@@ -44,34 +48,42 @@ page_header(($_GET["ns"] == "" ? lang('Database') . ": " . h(DB) : lang('Schema'
 
 if ($adminer->homepage()) {
 	if ($_GET["ns"] !== "") {
-		echo "<h3>" . lang('Tables and views') . "</h3>\n";
+		echo "<h3 id='tables-views'>" . lang('Tables and views') . "</h3>\n";
 		$tables_list = tables_list();
 		if (!$tables_list) {
 			echo "<p class='message'>" . lang('No tables.') . "\n";
 		} else {
 			echo "<form action='' method='post'>\n";
-			echo "<p>" . lang('Search data in tables') . ": <input name='query' value='" . h($_POST["query"]) . "'> <input type='submit' name='search' value='" . lang('Search') . "'>\n";
-			if ($_POST["search"] && $_POST["query"] != "") {
-				search_tables();
+			if (support("table")) {
+				echo "<fieldset><legend>" . lang('Search data in tables') . " <span id='selected2'></span></legend><div>";
+				echo "<input type='search' name='query' value='" . h($_POST["query"]) . "'> <input type='submit' name='search' value='" . lang('Search') . "'>\n";
+				echo "</div></fieldset>\n";
+				if ($_POST["search"] && $_POST["query"] != "") {
+					search_tables();
+				}
 			}
-			echo "<table cellspacing='0' class='nowrap checkable' onclick='tableClick(event);'>\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 "<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)\[/);" class="jsonly">';
 			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;
 			foreach ($tables_list as $name => $type) {
-				$view = ($type !== null && !eregi("table", $type));
-				echo '<tr' . odd() . '><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "formUncheck('check-all');");
-				echo '<th><a href="' . h(ME) . 'table=' . urlencode($name) . '" title="' . lang('Show structure') . '">' . h($name) . '</a>';
+				$view = ($type !== null && !preg_match('~table~i', $type));
+				$id = h("Table-" . $name);
+				echo '<tr' . odd() . '><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "formUncheck('check-all');", "", $id);
+				echo '<th>' . (support("table") || support("indexes") ? "<a href='" . h(ME) . "table=" . urlencode($name) . "' title='" . lang('Show structure') . "' id='$id'>" . 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(
@@ -83,45 +95,59 @@ if ($adminer->homepage()) {
 						"Auto_increment" => array("auto_increment=1&create", lang('Alter table')),
 						"Rows" => array("select", lang('Select data')),
 					) as $key => $link) {
-						echo ($link ? "<td align='right'><a href='" . h(ME . "$link[0]=") . urlencode($name) . "' id='$key-" . h($name) . "' title='$link[1]'>?</a>" : "<td id='$key-" . h($name) . "'>&nbsp;");
+						$id = " id='$key-" . h($name) . "'";
+						echo ($link ? "<td align='right'>" . (support("table") || $key == "Rows" || (support("indexes") && $key != "Data_length")
+							? "<a href='" . h(ME . "$link[0]=") . urlencode($name) . "'$id title='$link[1]'>?</a>"
+							: "<span$id>?</span>"
+						) : "<td id='$key-" . h($name) . "'>&nbsp;");
 					}
+					$tables++;
 				}
 				echo (support("comment") ? "<td id='Comment-" . h($name) . "'>&nbsp;" : "");
 			}
+
 			echo "<tr><td>&nbsp;<th>" . lang('%d in total', count($tables_list));
 			echo "<td>" . nbsp($jush == "sql" ? $connection->result("SELECT @@storage_engine") : "");
 			echo "<td>" . nbsp(db_collation(DB, collations()));
 			foreach (array("Data_length", "Index_length", "Data_free") as $key) {
 				echo "<td align='right' id='sum-$key'>&nbsp;";
 			}
+
 			echo "</table>\n";
-			echo "<script type='text/javascript'>tableCheck();</script>\n";
 			if (!information_schema(DB)) {
-				echo "<p>" . (ereg('^(sql|sqlite|pgsql)$', $jush)
-					? ($jush != "sqlite" ? "<input type='submit' value='" . lang('Analyze') . "'> " : "")
-					. "<input type='submit' name='optimize' value='" . lang('Optimize') . "'> " : ""
-				) . ($jush == "sql" ? "<input type='submit' name='check' value='" . lang('Check') . "'> <input type='submit' name='repair' value='" . lang('Repair') . "'> " : "") . "<input type='submit' name='truncate' value='" . lang('Truncate') . "'" . confirm("formChecked(this, /tables/)") . "> <input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm("formChecked(this, /tables|views/)") . ">\n";
-				$databases = (support("scheme") ? schemas() : $adminer->databases());
+				$vacuum = "<input type='submit' value='" . lang('Vacuum') . "'" . on_help("'VACUUM'") . "> ";
+				$optimize = "<input type='submit' name='optimize' value='" . lang('Optimize') . "'" . on_help($jush == "sql" ? "'OPTIMIZE TABLE'" : "'VACUUM OPTIMIZE'") . "> ";
+				echo "<fieldset><legend>" . lang('Selected') . " <span id='selected'></span></legend><div>"
+				. ($jush == "sqlite" ? $vacuum
+				: ($jush == "pgsql" ? $vacuum . $optimize
+				: ($jush == "sql" ? "<input type='submit' value='" . lang('Analyze') . "'" . on_help("'ANALYZE TABLE'") . "> " . $optimize
+					. "<input type='submit' name='check' value='" . lang('Check') . "'" . on_help("'CHECK TABLE'") . "> "
+					. "<input type='submit' name='repair' value='" . lang('Repair') . "'" . on_help("'REPAIR TABLE'") . "> "
+				: "")))
+				. "<input type='submit' name='truncate' value='" . lang('Truncate') . "'" . confirm() . on_help($jush == "sqlite" ? "'DELETE'" : "'TRUNCATE" . ($jush == "pgsql" ? "'" : " TABLE'")) . "> "
+				. "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . on_help("'DROP TABLE'") . ">\n";
+				$databases = (support("scheme") ? $adminer->schemas() : $adminer->databases());
 				if (count($databases) != 1 && $jush != "sqlite") {
 					$db = (isset($_POST["target"]) ? $_POST["target"] : (support("scheme") ? $_GET["ns"] : DB));
 					echo "<p>" . lang('Move to other database') . ": ";
-					echo ($databases ? html_select("target", $databases, $db) : '<input name="target" value="' . h($db) . '">');
+					echo ($databases ? html_select("target", $databases, $db) : '<input name="target" value="' . h($db) . '" autocapitalize="off">');
 					echo " <input type='submit' name='move' value='" . lang('Move') . "'>";
 					echo (support("copy") ? " <input type='submit' name='copy' value='" . lang('Copy') . "'>" : "");
 					echo "\n";
 				}
+				echo "<input type='hidden' name='all' value='' onclick=\"selectCount('selected', formChecked(this, /^(tables|views)\[/));" . (support("table") ? " selectCount('selected2', formChecked(this, /^tables\[/) || $tables);" : "") . "\">\n"; // used by trCheck()
 				echo "<input type='hidden' name='token' value='$token'>\n";
+				echo "</div></fieldset>\n";
 			}
 			echo "</form>\n";
+			echo "<script type='text/javascript'>tableCheck();</script>\n";
 		}
-		
-		echo '<p><a href="' . h(ME) . 'create=">' . lang('Create table') . "</a>\n";
-		if (support("view")) {
-			echo '<a href="' . h(ME) . 'view=">' . lang('Create view') . "</a>\n";
-		}
-	
+
+		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" : "");
+
 		if (support("routine")) {
-			echo "<h3>" . lang('Routines') . "</h3>\n";
+			echo "<h3 id='routines'>" . lang('Routines') . "</h3>\n";
 			$routines = routines();
 			if ($routines) {
 				echo "<table cellspacing='0'>\n";
@@ -136,12 +162,15 @@ if ($adminer->homepage()) {
 				}
 				echo "</table>\n";
 			}
-			echo '<p>' . (support("procedure") ? '<a href="' . h(ME) . 'procedure=">' . lang('Create procedure') . '</a> ' : '') . '<a href="' . h(ME) . 'function=">' . lang('Create function') . "</a>\n";
+			echo '<p class="links">'
+				. (support("procedure") ? '<a href="' . h(ME) . 'procedure=">' . lang('Create procedure') . '</a>' : '')
+				. '<a href="' . h(ME) . 'function=">' . lang('Create function') . "</a>\n"
+			;
 		}
-		
+
 		if (support("sequence")) {
-			echo "<h3>" . lang('Sequences') . "</h3>\n";
-			$sequences = get_vals("SELECT sequence_name FROM information_schema.sequences WHERE sequence_schema = current_schema()");
+			echo "<h3 id='sequences'>" . lang('Sequences') . "</h3>\n";
+			$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";
@@ -151,35 +180,36 @@ if ($adminer->homepage()) {
 				}
 				echo "</table>\n";
 			}
-			echo "<p><a href='" . h(ME) . "sequence='>" . lang('Create sequence') . "</a>\n";
+			echo "<p class='links'><a href='" . h(ME) . "sequence='>" . lang('Create sequence') . "</a>\n";
 		}
-		
+
 		if (support("type")) {
-			echo "<h3>" . lang('User types') . "</h3>\n";
-			$types = types();
-			if ($types) {
+			echo "<h3 id='user-types'>" . lang('User types') . "</h3>\n";
+			$user_types = types();
+			if ($user_types) {
 				echo "<table cellspacing='0'>\n";
 				echo "<thead><tr><th>" . lang('Name') . "</thead>\n";
 				odd('');
-				foreach ($types as $val) {
+				foreach ($user_types as $val) {
 					echo "<tr" . odd() . "><th><a href='" . h(ME) . "type=" . urlencode($val) . "'>" . h($val) . "</a>\n";
 				}
 				echo "</table>\n";
 			}
-			echo "<p><a href='" . h(ME) . "type='>" . lang('Create type') . "</a>\n";
+			echo "<p class='links'><a href='" . h(ME) . "type='>" . lang('Create type') . "</a>\n";
 		}
-		
+
 		if (support("event")) {
-			echo "<h3>" . lang('Events') . "</h3>\n";
+			echo "<h3 id='events'>" . lang('Events') . "</h3>\n";
 			$rows = get_rows("SHOW EVENTS");
 			if ($rows) {
 				echo "<table cellspacing='0'>\n";
-				echo "<thead><tr><th>" . lang('Name') . "<td>" . lang('Schedule') . "<td>" . lang('Start') . "<td>" . lang('End') . "</thead>\n";
+				echo "<thead><tr><th>" . lang('Name') . "<td>" . lang('Schedule') . "<td>" . lang('Start') . "<td>" . lang('End') . "<td></thead>\n";
 				foreach ($rows as $row) {
 					echo "<tr>";
-					echo '<th><a href="' . h(ME) . 'event=' . urlencode($row["Name"]) . '">' . h($row["Name"]) . "</a>";
+					echo "<th>" . h($row["Name"]);
 					echo "<td>" . ($row["Execute at"] ? lang('At given time') . "<td>" . $row["Execute at"] : lang('Every') . " " . $row["Interval value"] . " " . $row["Interval field"] . "<td>$row[Starts]");
 					echo "<td>$row[Ends]";
+					echo '<td><a href="' . h(ME) . 'event=' . urlencode($row["Name"]) . '">' . lang('Alter') . '</a>';
 				}
 				echo "</table>\n";
 				$event_scheduler = $connection->result("SELECT @@event_scheduler");
@@ -187,9 +217,9 @@ if ($adminer->homepage()) {
 					echo "<p class='error'><code class='jush-sqlset'>event_scheduler</code>: " . h($event_scheduler) . "\n";
 				}
 			}
-			echo '<p><a href="' . h(ME) . 'event=">' . lang('Create event') . "</a>\n";
+			echo '<p class="links"><a href="' . h(ME) . 'event=">' . lang('Create event') . "</a>\n";
 		}
-		
+
 		if ($tables_list) {
 			echo "<script type='text/javascript'>ajaxSetHtml('" . js_escape(ME) . "script=db');</script>\n";
 		}

adminer/download.inc.php

@@ -1,6 +1,10 @@
 <?php
 $TABLE = $_GET["download"];
+$fields = fields($TABLE);
 header("Content-Type: application/octet-stream");
 header("Content-Disposition: attachment; filename=" . friendly_url("$TABLE-" . implode("_", $_GET["where"])) . "." . friendly_url($_GET["field"]));
-echo $connection->result("SELECT" . limit(idf_escape($_GET["field"]) . " FROM " . table($TABLE), " WHERE " . where($_GET), 1));
+$select = array(idf_escape($_GET["field"]));
+$result = $driver->select($TABLE, $select, array(where($_GET, $fields)), $select);
+$row = ($result ? $result->fetch_row() : array());
+echo $row[0];
 exit; // don't output footer

adminer/drivers/elastic.inc.php

@@ -0,0 +1,375 @@
+<?php
+$drivers["elastic"] = "Elasticsearch (beta)";
+
+if (isset($_GET["elastic"])) {
+	$possible_drivers = array("json");
+	define("DRIVER", "elastic");
+
+	if (function_exists('json_decode')) {
+		class Min_DB {
+			var $extension = "JSON", $server_info, $errno, $error, $_url;
+
+			/** Performs query
+			 * @param string
+			 * @param array
+			 * @param string
+			 * @return mixed
+			 */
+			function rootQuery($path, $content = array(), $method = 'GET') {
+				@ini_set('track_errors', 1); // @ - may be disabled
+				$file = @file_get_contents($this->_url  . '/' . ltrim($path, '/'), false, stream_context_create(array('http' => array(
+					'method' => $method,
+					'content' => json_encode($content),
+					'ignore_errors' => 1, // available since PHP 5.2.10
+				))));
+				if (!$file) {
+					$this->error = $php_errormsg;
+					return $file;
+				}
+				if (!preg_match('~^HTTP/[0-9.]+ 2~i', $http_response_header[0])) {
+					$this->error = $file;
+					return false;
+				}
+				$return = json_decode($file, true);
+				if ($return === null) {
+					$this->errno = json_last_error();
+					if (function_exists('json_last_error_msg')) {
+						$this->error = json_last_error_msg();
+					} else {
+						$constants = get_defined_constants(true);
+						foreach ($constants['json'] as $name => $value) {
+							if ($value == $this->errno && preg_match('~^JSON_ERROR_~', $name)) {
+								$this->error = $name;
+								break;
+							}
+						}
+					}
+				}
+				return $return;
+			}
+
+			/** Performs query relative to actual selected DB
+			 * @param string
+			 * @param array
+			 * @param string
+			 * @return mixed
+			 */
+			function query($path, $content = array(), $method = 'GET') {
+				return $this->rootQuery(($this->_db != "" ? "$this->_db/" : "/") . ltrim($path, '/'), $content, $method);
+			}
+
+			function connect($server, $username, $password) {
+				preg_match('~^(https?://)?(.*)~', $server, $match);
+				$this->_url = ($match[1] ? $match[1] : "http://") . "$username:$password@$match[2]/";
+				$return = $this->query('');
+				if ($return) {
+					$this->server_info = $return['version']['number'];
+				}
+				return (bool) $return;
+			}
+
+			function select_db($database) {
+				$this->_db = $database;
+				return true;
+			}
+
+			function quote($string) {
+				return $string;
+			}
+
+		}
+
+		class Min_Result {
+			var $num_rows, $_rows;
+
+			function __construct($rows) {
+				$this->num_rows = count($this->_rows);
+				$this->_rows = $rows;
+				reset($this->_rows);
+			}
+
+			function fetch_assoc() {
+				$return = current($this->_rows);
+				next($this->_rows);
+				return $return;
+			}
+
+			function fetch_row() {
+				return array_values($this->fetch_assoc());
+			}
+
+		}
+
+	}
+
+
+
+	class Min_Driver extends Min_SQL {
+
+		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+			global $adminer;
+			$data = array();
+			$query = "$table/_search";
+			if ($select != array("*")) {
+				$data["fields"] = $select;
+			}
+			if ($order) {
+				$sort = array();
+				foreach ($order as $col) {
+					$col = preg_replace('~ DESC$~', '', $col, 1, $count);
+					$sort[] = ($count ? array($col => "desc") : $col);
+				}
+				$data["sort"] = $sort;
+			}
+			if ($limit) {
+				$data["size"] = +$limit;
+				if ($page) {
+					$data["from"] = ($page * $limit);
+				}
+			}
+			foreach ($where as $val) {
+				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"] && !$data["query"]["ids"]) {
+				$data["query"]["filtered"]["query"] = array("match_all" => array());
+			}
+			$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();
+					foreach ($select as $key) {
+						$fields[$key] = $hit['fields'][$key];
+					}
+				}
+				foreach ($fields as $key => $val) {
+					if ($data["fields"]) {
+						$val = $val[0];
+					}
+					$row[$key] = (is_array($val) ? json_encode($val) : $val); //! display JSON and others differently
+				}
+				$return[] = $row;
+			}
+			return new Min_Result($return);
+		}
+
+	}
+
+
+
+	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 support($feature) {
+		return preg_match("~database|table|columns~", $feature);
+	}
+
+	function logged_user() {
+		global $adminer;
+		$credentials = $adminer->credentials();
+		return $credentials[1];
+	}
+
+	function get_databases() {
+		global $connection;
+		$return = $connection->rootQuery('_aliases');
+		if ($return) {
+			$return = array_keys($return);
+			sort($return, SORT_STRING);
+		}
+		return $return;
+	}
+
+	function collations() {
+		return array();
+	}
+
+	function db_collation($db, $collations) {
+	}
+	
+	function engines() {
+		return array();
+	}
+
+	function count_tables($databases) {
+		global $connection;
+		$return = $connection->query('_mapping');
+		if ($return) {
+			$return = array_map('count', $return);
+		}
+		return $return;
+	}
+
+	function tables_list() {
+		global $connection;
+		$return = $connection->query('_mapping');
+		if ($return) {
+			$return = array_fill_keys(array_keys($return[$connection->_db]["mappings"]), 'table');
+		}
+		return $return;
+	}
+
+	function table_status($name = "", $fast = false) {
+		global $connection;
+		$search = $connection->query("_search?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 != "" && $name == $table["term"]) {
+					return $return[$name];
+				}
+			}
+		}
+		return $return;
+	}
+
+	function error() {
+		global $connection;
+		return h($connection->error);
+	}
+
+	function information_schema() {
+	}
+
+	function is_view($table_status) {
+	}
+
+	function indexes($table, $connection2 = null) {
+		return array(
+			array("type" => "PRIMARY", "columns" => array("_id")),
+		);
+	}
+
+	function fields($table) {
+		global $connection;
+		$result = $connection->query("$table/_mapping");
+		$return = array();
+		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;
+	}
+
+	function foreign_keys($table) {
+		return array();
+	}
+
+	function table($idf) {
+		return $idf;
+	}
+
+	function idf_escape($idf) {
+		return $idf;
+	}
+
+	function convert_field($field) {
+	}
+
+	function unconvert_field($field, $return) {
+		return $return;
+	}
+
+	function fk_support($table_status) {
+	}
+
+	function found_rows($table_status, $where) {
+		return null;
+	}
+
+	/** Create database
+	* @param string
+	* @return mixed
+	*/
+	function create_database($db) {
+		global $connection;
+		return $connection->rootQuery(urlencode($db), array(), 'PUT');
+	}
+
+	/** Drop databases
+	* @param array
+	* @return mixed
+	*/
+	function drop_databases($databases) {
+		global $connection;
+		return $connection->rootQuery(urlencode(implode(',', $databases)), array(), 'DELETE');
+	}
+
+	/** Drop tables
+	* @param array
+	* @return bool
+	*/
+	function drop_tables($tables) {
+		global $connection;
+		$return = true;
+		foreach ($tables as $table) { //! convert to bulk api
+			$return = $return && $connection->query(urlencode($table), array(), 'DELETE');
+		}
+		return $return;
+	}
+
+	$jush = "elastic";
+	$operators = array("=", "query");
+	$functions = array();
+	$grouping = array();
+	$edit_functions = array(array("json"));
+}

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 __construct($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

@@ -0,0 +1,357 @@
+<?php
+$drivers["mongo"] = "MongoDB (beta)";
+
+if (isset($_GET["mongo"])) {
+	$possible_drivers = array("mongo");
+	define("DRIVER", "mongo");
+
+	if (class_exists('MongoDB')) {
+		class Min_DB {
+			var $extension = "Mongo", $error, $last_id, $_link, $_db;
+
+			function connect($server, $username, $password) {
+				global $adminer;
+				$db = $adminer->database();
+				$options = array();
+				if ($username != "") {
+					$options["username"] = $username;
+					$options["password"] = $password;
+				}
+				if ($db != "") {
+					$options["db"] = $db;
+				}
+				try {
+					$this->_link = @new MongoClient("mongodb://$server", $options);
+					return true;
+				} catch (Exception $ex) {
+					$this->error = $ex->getMessage();
+					return false;
+				}
+			}
+			
+			function query($query) {
+				return false;
+			}
+
+			function select_db($database) {
+				try {
+					$this->_db = $this->_link->selectDB($database);
+					return true;
+				} catch (Exception $ex) {
+					$this->error = $ex->getMessage();
+					return false;
+				}
+			}
+
+			function quote($string) {
+				return $string;
+			}
+
+		}
+
+		class Min_Result {
+			var $num_rows, $_rows = array(), $_offset = 0, $_charset = array();
+
+			function __construct($result) {
+				foreach ($result as $item) {
+					$row = array();
+					foreach ($item as $key => $val) {
+						if (is_a($val, 'MongoBinData')) {
+							$this->_charset[$key] = 63;
+						}
+						$row[$key] =
+							(is_a($val, 'MongoId') ? 'ObjectId("' . strval($val) . '")' :
+							(is_a($val, 'MongoDate') ? gmdate("Y-m-d H:i:s", $val->sec) . " GMT" :
+							(is_a($val, 'MongoBinData') ? $val->bin : //! allow downloading
+							(is_a($val, 'MongoRegex') ? strval($val) :
+							(is_object($val) ? get_class($val) : // MongoMinKey, MongoMaxKey
+							$val
+						)))));
+					}
+					$this->_rows[] = $row;
+					foreach ($row as $key => $val) {
+						if (!isset($this->_rows[0][$key])) {
+							$this->_rows[0][$key] = null;
+						}
+					}
+				}
+				$this->num_rows = count($this->_rows);
+			}
+
+			function fetch_assoc() {
+				$row = current($this->_rows);
+				if (!$row) {
+					return $row;
+				}
+				$return = array();
+				foreach ($this->_rows[0] as $key => $val) {
+					$return[$key] = $row[$key];
+				}
+				next($this->_rows);
+				return $return;
+			}
+
+			function fetch_row() {
+				$return = $this->fetch_assoc();
+				if (!$return) {
+					return $return;
+				}
+				return array_values($return);
+			}
+
+			function fetch_field() {
+				$keys = array_keys($this->_rows[0]);
+				$name = $keys[$this->_offset++];
+				return (object) array(
+					'name' => $name,
+					'charsetnr' => $this->_charset[$name],
+				);
+			}
+
+		}
+	}
+
+
+
+	class Min_Driver extends Min_SQL {
+		public $primary = "_id";
+		
+		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+			$select = ($select == array("*")
+				? array()
+				: array_fill_keys($select, true)
+			);
+			$sort = array();
+			foreach ($order as $val) {
+				$val = preg_replace('~ DESC$~', '', $val, 1, $count);
+				$sort[$val] = ($count ? -1 : 1);
+			}
+			return new Min_Result($this->_conn->_db->selectCollection($table)
+				->find(array(), $select)
+				->sort($sort)
+				->limit(+$limit)
+				->skip($page * $limit)
+			);
+		}
+		
+		function insert($table, $set) {
+			try {
+				$return = $this->_conn->_db->selectCollection($table)->insert($set);
+				$this->_conn->errno = $return['code'];
+				$this->_conn->error = $return['err'];
+				$this->_conn->last_id = $set['_id'];
+				return !$return['err'];
+			} catch (Exception $ex) {
+				$this->_conn->error = $ex->getMessage();
+				return false;
+			}
+		}
+	}
+
+
+
+	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 error() {
+		global $connection;
+		return h($connection->error);
+	}
+
+	function logged_user() {
+		global $adminer;
+		$credentials = $adminer->credentials();
+		return $credentials[1];
+	}
+
+	function get_databases($flush) {
+		global $connection;
+		$return = array();
+		$dbs = $connection->_link->listDBs();
+		foreach ($dbs['databases'] as $db) {
+			$return[] = $db['name'];
+		}
+		return $return;
+	}
+
+	function collations() {
+		return array();
+	}
+
+	function db_collation($db, $collations) {
+	}
+
+	function count_tables($databases) {
+		global $connection;
+		$return = array();
+		foreach ($databases as $db) {
+			$return[$db] = count($connection->_link->selectDB($db)->getCollectionNames(true));
+		}
+		return $return;
+	}
+
+	function tables_list() {
+		global $connection;
+		return array_fill_keys($connection->_db->getCollectionNames(true), 'table');
+	}
+
+	function table_status($name = "", $fast = false) {
+		$return = array();
+		foreach (tables_list() as $table => $type) {
+			$return[$table] = array("Name" => $table);
+			if ($name == $table) {
+				return $return[$table];
+			}
+		}
+		return $return;
+	}
+
+	function information_schema() {
+	}
+
+	function is_view($table_status) {
+	}
+
+	function drop_databases($databases) {
+		global $connection;
+		foreach ($databases as $db) {
+			$response = $connection->_link->selectDB($db)->drop();
+			if (!$response['ok']) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	function indexes($table, $connection2 = null) {
+		global $connection;
+		$return = array();
+		foreach ($connection->_db->selectCollection($table)->getIndexInfo() as $index) {
+			$descs = array();
+			foreach ($index["key"] as $column => $type) {
+				$descs[] = ($type == -1 ? '1' : null);
+			}
+			$return[$index["name"]] = array(
+				"type" => ($index["name"] == "_id_" ? "PRIMARY" : ($index["unique"] ? "UNIQUE" : "INDEX")),
+				"columns" => array_keys($index["key"]),
+				"lengths" => array(),
+				"descs" => $descs,
+			);
+		}
+		return $return;
+	}
+
+	function fields($table) {
+		return fields_from_edit();
+	}
+
+	function convert_field($field) {
+	}
+
+	function unconvert_field($field, $return) {
+		return $return;
+	}
+
+	function foreign_keys($table) {
+		return array();
+	}
+
+	function fk_support($table_status) {
+	}
+
+	function engines() {
+		return array();
+	}
+
+	function found_rows($table_status, $where) {
+		global $connection;
+		//! don't call count_rows()
+		return $connection->_db->selectCollection($_GET["select"])->count($where);
+	}
+
+	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
+		global $connection;
+		if ($table == "") {
+			$connection->_db->createCollection($name);
+			return true;
+		}
+	}
+
+	function drop_tables($tables) {
+		global $connection;
+		foreach ($tables as $table) {
+			$response = $connection->_db->selectCollection($table)->drop();
+			if (!$response['ok']) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	function truncate_tables($tables) {
+		global $connection;
+		foreach ($tables as $table) {
+			$response = $connection->_db->selectCollection($table)->remove();
+			if (!$response['ok']) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	function alter_indexes($table, $alter) {
+		global $connection;
+		foreach ($alter as $val) {
+			list($type, $name, $set) = $val;
+			if ($set == "DROP") {
+				$return = $connection->_db->command(array("deleteIndexes" => $table, "index" => $name));
+			} else {
+				$columns = array();
+				foreach ($set as $column) {
+					$column = preg_replace('~ DESC$~', '', $column, 1, $count);
+					$columns[$column] = ($count ? -1 : 1);
+				}
+				$return = $connection->_db->selectCollection($table)->ensureIndex($columns, array(
+					"unique" => ($type == "UNIQUE"),
+					"name" => $name,
+					//! "sparse"
+				));
+			}
+			if ($return['errmsg']) {
+				$connection->error = $return['errmsg'];
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	function last_id() {
+		global $connection;
+		return $connection->last_id;
+	}
+
+	function table($idf) {
+		return $idf;
+	}
+
+	function idf_escape($idf) {
+		return $idf;
+	}
+
+	function support($feature) {
+		return preg_match("~database|indexes~", $feature);
+	}
+
+	$jush = "mongo";
+	$operators = array("=");
+	$functions = array();
+	$grouping = array();
+	$edit_functions = array(array("json"));
+}

adminer/drivers/mssql.inc.php

@@ -8,15 +8,16 @@
 $drivers["mssql"] = "MS SQL";
 
 if (isset($_GET["mssql"])) {
-	$possible_drivers = array("SQLSRV", "MSSQL");
+	$possible_drivers = array("SQLSRV", "MSSQL", "PDO_DBLIB");
 	define("DRIVER", "mssql");
 	if (extension_loaded("sqlsrv")) {
 		class Min_DB {
-			var $extension = "sqlsrv", $_link, $_result, $server_info, $affected_rows, $error;
+			var $extension = "sqlsrv", $_link, $_result, $server_info, $affected_rows, $errno, $error;
 
 			function _get_error() {
 				$this->error = "";
 				foreach (sqlsrv_errors() as $error) {
+					$this->errno = $error["code"];
 					$this->error .= "$error[message]\n";
 				}
 				$this->error = rtrim($this->error);
@@ -38,7 +39,7 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function select_db($database) {
-				return $this->query("USE $database");
+				return $this->query("USE " . idf_escape($database));
 			}
 
 			function query($query, $unbuffered = false) {
@@ -65,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);
 				}
@@ -73,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) {
@@ -89,7 +93,7 @@ if (isset($_GET["mssql"])) {
 		class Min_Result {
 			var $_result, $_offset = 0, $_fields, $num_rows;
 
-			function Min_Result($result) {
+			function __construct($result) {
 				$this->_result = $result;
 				// $this->num_rows = sqlsrv_num_rows($result); // available only in scrollable results
 			}
@@ -103,13 +107,13 @@ if (isset($_GET["mssql"])) {
 				}
 				return $row;
 			}
-			
+
 			function fetch_assoc() {
-				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_ASSOC, SQLSRV_SCROLL_NEXT));
+				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_ASSOC));
 			}
 
 			function fetch_row() {
-				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_NUMERIC, SQLSRV_SCROLL_NEXT));
+				return $this->_convert(sqlsrv_fetch_array($this->_result, SQLSRV_FETCH_NUMERIC));
 			}
 
 			function fetch_field() {
@@ -123,7 +127,7 @@ if (isset($_GET["mssql"])) {
 				$return->type = ($field["Type"] == 1 ? 254 : 0);
 				return $return;
 			}
-			
+
 			function seek($offset) {
 				for ($i=0; $i < $offset; $i++) {
 					sqlsrv_fetch($this->_result); // SQLSRV_SCROLL_ABSOLUTE added in sqlsrv 1.1
@@ -134,7 +138,7 @@ if (isset($_GET["mssql"])) {
 				sqlsrv_free_stmt($this->_result);
 			}
 		}
-		
+
 	} elseif (extension_loaded("mssql")) {
 		class Min_DB {
 			var $extension = "MSSQL", $_link, $_result, $server_info, $affected_rows, $error;
@@ -160,7 +164,7 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function query($query, $unbuffered = false) {
-				$result = mssql_query($query, $this->_link); //! $unbuffered
+				$result = @mssql_query($query, $this->_link); //! $unbuffered
 				$this->error = "";
 				if (!$result) {
 					$this->error = mssql_get_last_message();
@@ -182,7 +186,7 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function next_result() {
-				return mssql_next_result($this->_result);
+				return mssql_next_result($this->_result->_result);
 			}
 
 			function result($query, $field = 0) {
@@ -197,7 +201,7 @@ if (isset($_GET["mssql"])) {
 		class Min_Result {
 			var $_result, $_offset = 0, $_fields, $num_rows;
 
-			function Min_Result($result) {
+			function __construct($result) {
 				$this->_result = $result;
 				$this->num_rows = mssql_num_rows($result);
 			}
@@ -224,14 +228,60 @@ if (isset($_GET["mssql"])) {
 			function seek($offset) {
 				mssql_data_seek($this->_result, $offset);
 			}
-			
+
 			function __destruct() {
 				mssql_free_result($this->_result);
 			}
 		}
-		
+
+	} elseif (extension_loaded("pdo_dblib")) {
+		class Min_DB extends Min_PDO {
+			var $extension = "PDO_DBLIB";
+
+			function connect($server, $username, $password) {
+				$this->dsn("dblib:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)), $username, $password);
+				return true;
+			}
+
+			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));
+			}
+		}
 	}
 
+
+	class Min_Driver extends Min_SQL {
+
+		function insertUpdate($table, $rows, $primary) {
+			foreach ($rows as $set) {
+				$update = array();
+				$where = array();
+				foreach ($set as $key => $val) {
+					$update[] = "$key = $val";
+					if (isset($primary[idf_unescape($key)])) {
+						$where[] = "$key = $val";
+					}
+				}
+				//! can use only one query for all rows
+				if (!queries("MERGE " . table($table) . " USING (VALUES(" . implode(", ", $set) . ")) AS source (c" . implode(", c", range(1, count($set))) . ") ON " . implode(" AND ", $where) //! source, c1 - possible conflict
+					. " WHEN MATCHED THEN UPDATE SET " . implode(", ", $update)
+					. " WHEN NOT MATCHED THEN INSERT (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ");" // ; is mandatory
+				)) {
+					return false;
+				}
+			}
+			return true;
+		}
+
+		function begin() {
+			return queries("BEGIN TRANSACTION");
+		}
+
+	}
+
+
+
 	function idf_escape($idf) {
 		return "[" . str_replace("]", "]]", $idf) . "]";
 	}
@@ -251,7 +301,7 @@ if (isset($_GET["mssql"])) {
 	}
 
 	function get_databases() {
-		return get_vals("EXEC sp_databases");
+		return get_vals("SELECT name FROM sys.databases WHERE name NOT IN ('master', 'tempdb', 'model', 'msdb')");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -289,10 +339,10 @@ if (isset($_GET["mssql"])) {
 		}
 		return $return;
 	}
-	
+
 	function table_status($name = "") {
 		$return = array();
-		foreach (get_rows("SELECT name AS Name, type_desc AS Engine FROM sys.all_objects WHERE schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND type IN ('S', 'U', 'V')" . ($name != "" ? " AND name = " . q($name) : "")) as $row) {
+		foreach (get_rows("SELECT name AS Name, type_desc AS Engine FROM sys.all_objects WHERE schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND type IN ('S', 'U', 'V') " . ($name != "" ? "AND name = " . q($name) : "ORDER BY name")) as $row) {
 			if ($name != "") {
 				return $row;
 			}
@@ -304,7 +354,7 @@ if (isset($_GET["mssql"])) {
 	function is_view($table_status) {
 		return $table_status["Engine"] == "VIEW";
 	}
-	
+
 	function fk_support($table_status) {
 		return true;
 	}
@@ -319,7 +369,7 @@ LEFT JOIN sys.default_constraints d ON c.default_object_id = d.parent_column_id
 WHERE o.schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND o.type IN ('S', 'U', 'V') AND o.name = " . q($table)
 		) as $row) {
 			$type = $row["type"];
-			$length = (ereg("char|binary", $type) ? $row["max_length"] : ($type == "decimal" ? "$row[precision],$row[scale]" : ""));
+			$length = (preg_match("~char|binary~", $type) ? $row["max_length"] : ($type == "decimal" ? "$row[precision],$row[scale]" : ""));
 			$return[$row["name"]] = array(
 				"field" => $row["name"],
 				"full_type" => $type . ($length ? "($length)" : ""),
@@ -339,15 +389,17 @@ WHERE o.schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND o.type IN ('S', 'U',
 	function indexes($table, $connection2 = null) {
 		$return = array();
 		// sp_statistics doesn't return information about primary key
-		foreach (get_rows("SELECT i.name, key_ordinal, is_unique, is_primary_key, c.name AS column_name
+		foreach (get_rows("SELECT i.name, key_ordinal, is_unique, is_primary_key, c.name AS column_name, is_descending_key
 FROM sys.indexes i
 INNER JOIN sys.index_columns ic ON i.object_id = ic.object_id AND i.index_id = ic.index_id
 INNER JOIN sys.columns c ON ic.object_id = c.object_id AND ic.column_id = c.column_id
 WHERE OBJECT_NAME(i.object_id) = " . q($table)
 		, $connection2) as $row) {
-			$return[$row["name"]]["type"] = ($row["is_primary_key"] ? "PRIMARY" : ($row["is_unique"] ? "UNIQUE" : "INDEX"));
-			$return[$row["name"]]["lengths"] = array();
-			$return[$row["name"]]["columns"][$row["key_ordinal"]] = $row["column_name"];
+			$name = $row["name"];
+			$return[$name]["type"] = ($row["is_primary_key"] ? "PRIMARY" : ($row["is_unique"] ? "UNIQUE" : "INDEX"));
+			$return[$name]["lengths"] = array();
+			$return[$name]["columns"][$row["key_ordinal"]] = $row["column_name"];
+			$return[$name]["descs"][$row["key_ordinal"]] = ($row["is_descending_key"] ? '1' : null);
 		}
 		return $return;
 	}
@@ -356,11 +408,11 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 		global $connection;
 		return array("select" => preg_replace('~^(?:[^[]|\\[[^]]*])*\\s+AS\\s+~isU', '', $connection->result("SELECT VIEW_DEFINITION FROM INFORMATION_SCHEMA.VIEWS WHERE TABLE_SCHEMA = SCHEMA_NAME() AND TABLE_NAME = " . q($name))));
 	}
-	
+
 	function collations() {
 		$return = array();
 		foreach (get_vals("SELECT name FROM fn_helpcollations()") as $collation) {
-			$return[ereg_replace("_.*", "", $collation)][] = $collation;
+			$return[preg_replace('~_.*~', '', $collation)][] = $collation;
 		}
 		return $return;
 	}
@@ -373,21 +425,17 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 		global $connection;
 		return nl_br(h(preg_replace('~^(\\[[^]]*])+~m', '', $connection->error)));
 	}
-	
-	function exact_value($val) {
-		return q($val);
-	}
 
 	function create_database($db, $collation) {
-		return queries("CREATE DATABASE " . idf_escape($db) . (eregi('^[a-z0-9_]+$', $collation) ? " COLLATE $collation" : ""));
+		return queries("CREATE DATABASE " . idf_escape($db) . (preg_match('~^[a-z0-9_]+$~i', $collation) ? " COLLATE $collation" : ""));
 	}
-	
+
 	function drop_databases($databases) {
 		return queries("DROP DATABASE " . implode(", ", array_map('idf_escape', $databases)));
 	}
-	
+
 	function rename_database($name, $collation) {
-		if (eregi('^[a-z0-9_]+$', $collation)) {
+		if (preg_match('~^[a-z0-9_]+$~i', $collation)) {
 			queries("ALTER DATABASE " . idf_escape(DB) . " COLLATE $collation");
 		}
 		queries("ALTER DATABASE " . idf_escape(DB) . " MODIFY NAME = " . idf_escape($name));
@@ -395,9 +443,9 @@ 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) {
 		$alter = array();
 		foreach ($fields as $field) {
@@ -434,7 +482,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 		}
 		return true;
 	}
-	
+
 	function alter_indexes($table, $alter) {
 		$index = array();
 		$drop = array();
@@ -448,7 +496,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 			} elseif (!queries(($val[0] != "PRIMARY"
 				? "CREATE $val[0] " . ($val[0] != "INDEX" ? "INDEX " : "") . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table)
 				: "ALTER TABLE " . table($table) . " ADD PRIMARY KEY"
-			) . " $val[2]")) {
+			) . " (" . implode(", ", $val[2]) . ")")) {
 				return false;
 			}
 		}
@@ -456,46 +504,22 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 			&& (!$drop || queries("ALTER TABLE " . table($table) . " DROP " . implode(", ", $drop)))
 		;
 	}
-	
-	function begin() {
-		return queries("BEGIN TRANSACTION");
-	}
-	
-	function insert_into($table, $set) {
-		return queries("INSERT INTO " . table($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
-	}
-	
-	function insert_update($table, $set, $primary) {
-		$update = array();
-		$where = array();
-		foreach ($set as $key => $val) {
-			$update[] = "$key = $val";
-			if (isset($primary[idf_unescape($key)])) {
-				$where[] = "$key = $val";
-			}
-		}
-		// can use only one query for all rows with different API
-		return queries("MERGE " . table($table) . " USING (VALUES(" . implode(", ", $set) . ")) AS source (c" . implode(", c", range(1, count($set))) . ") ON " . implode(" AND ", $where) //! source, c1 - possible conflict
-			. " WHEN MATCHED THEN UPDATE SET " . implode(", ", $update)
-			. " WHEN NOT MATCHED THEN INSERT (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ");" // ; is mandatory
-		);
-	}
-	
+
 	function last_id() {
 		global $connection;
 		return $connection->result("SELECT SCOPE_IDENTITY()"); // @@IDENTITY can return trigger INSERT
 	}
-	
+
 	function explain($connection, $query) {
 		$connection->query("SET SHOWPLAN_ALL ON");
 		$return = $connection->query($query);
 		$connection->query("SET SHOWPLAN_ALL OFF"); // connection is used also for indexes
 		return $return;
 	}
-	
+
 	function found_rows($table_status, $where) {
 	}
-	
+
 	function foreign_keys($table) {
 		$return = array();
 		foreach (get_rows("EXEC sp_fkeys @fktable_name = " . q($table)) as $row) {
@@ -522,7 +546,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 	function move_tables($tables, $views, $target) {
 		return apply_queries("ALTER SCHEMA " . idf_escape($target) . " TRANSFER", array_merge($tables, $views));
 	}
-	
+
 	function trigger($name) {
 		if ($name == "") {
 			return array();
@@ -541,7 +565,7 @@ WHERE s.xtype = 'TR' AND s.name = " . q($name)
 		}
 		return $return;
 	}
-	
+
 	function triggers($table) {
 		$return = array();
 		foreach (get_rows("SELECT sys1.name,
@@ -555,18 +579,19 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
 		}
 		return $return;
 	}
-	
+
 	function trigger_options() {
 		return array(
 			"Timing" => array("AFTER", "INSTEAD OF"),
+			"Event" => array("INSERT", "UPDATE", "DELETE"),
 			"Type" => array("AS"),
 		);
 	}
-	
+
 	function schemas() {
 		return get_vals("SELECT name FROM sys.schemas");
 	}
-	
+
 	function get_schema() {
 		global $connection;
 		if ($_GET["ns"] != "") {
@@ -574,34 +599,34 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
 		}
 		return $connection->result("SELECT SCHEMA_NAME()");
 	}
-	
+
 	function set_schema($schema) {
 		return true; // ALTER USER is permanent
 	}
-	
+
 	function use_sql($database) {
 		return "USE " . idf_escape($database);
 	}
-	
+
 	function show_variables() {
 		return array();
 	}
-	
+
 	function show_status() {
 		return array();
 	}
 
 	function convert_field($field) {
 	}
-	
+
 	function unconvert_field($field, $return) {
 		return $return;
 	}
-	
+
 	function support($feature) {
-		return ereg('^(scheme|trigger|view|drop_col)$', $feature); //! routine|
+		return preg_match('~^(columns|database|drop_col|indexes|scheme|sql|table|trigger|view|view_trigger)$~', $feature); //! routine|
 	}
-	
+
 	$jush = "mssql";
 	$types = array();
 	$structured_types = array();

adminer/drivers/mysql.inc.php

@@ -8,32 +8,34 @@ if (!defined("DRIVER")) {
 	if (extension_loaded("mysqli")) {
 		class Min_DB extends MySQLi {
 			var $extension = "MySQLi";
-			
-			function Min_DB() {
+
+			function __construct() {
 				parent::init();
 			}
-			
-			function connect($server, $username, $password) {
+
+			function connect($server = "", $username = "", $password = "", $database = null, $port = null, $socket = null) {
 				mysqli_report(MYSQLI_REPORT_OFF); // stays between requests, not required since PHP 5.3.4
 				list($host, $port) = explode(":", $server, 2); // part after : is used for port or socket
 				$return = @$this->real_connect(
 					($server != "" ? $host : ini_get("mysqli.default_host")),
 					($server . $username != "" ? $username : ini_get("mysqli.default_user")),
 					($server . $username . $password != "" ? $password : ini_get("mysqli.default_pw")),
-					null,
+					$database,
 					(is_numeric($port) ? $port : ini_get("mysqli.default_port")),
-					(!is_numeric($port) ? $port : null)
+					(!is_numeric($port) ? $port : $socket)
 				);
-				if ($return) {
-					if (method_exists($this, 'set_charset')) {
-						$this->set_charset("utf8");
-					} else {
-						$this->query("SET NAMES utf8");
-					}
-				}
 				return $return;
 			}
-			
+
+			function set_charset($charset) {
+				if (parent::set_charset($charset)) {
+					return true;
+				}
+				// the client library may not support utf8mb4
+				parent::set_charset('utf8');
+				return $this->query("SET NAMES $charset");
+			}
+
 			function result($query, $field = 0) {
 				$result = $this->query($query);
 				if (!$result) {
@@ -47,17 +49,18 @@ if (!defined("DRIVER")) {
 				return "'" . $this->escape_string($string) . "'";
 			}
 		}
-		
+
 	} elseif (extension_loaded("mysql") && !(ini_get("sql.safe_mode") && extension_loaded("pdo_mysql"))) {
 		class Min_DB {
 			var
 				$extension = "MySQL", ///< @var string extension name
 				$server_info, ///< @var string server version
 				$affected_rows, ///< @var int number of affected rows
+				$errno, ///< @var int last error code
 				$error, ///< @var string last error message
 				$_link, $_result ///< @access private
 			;
-			
+
 			/** Connect to server
 			* @param string
 			* @param string
@@ -74,17 +77,27 @@ 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')) {
+					if (mysql_set_charset($charset, $this->_link)) {
+						return true;
+					}
+					// the client library may not support utf8mb4
+					mysql_set_charset('utf8', $this->_link);
+				}
+				return $this->query("SET NAMES $charset");
+			}
+
 			/** Quote string to use in SQL
 			* @param string
 			* @return string escaped string enclosed in '
@@ -92,7 +105,7 @@ if (!defined("DRIVER")) {
 			function quote($string) {
 				return "'" . mysql_real_escape_string($string, $this->_link) . "'";
 			}
-			
+
 			/** Select database
 			* @param string
 			* @return bool
@@ -100,7 +113,7 @@ if (!defined("DRIVER")) {
 			function select_db($database) {
 				return mysql_select_db($database, $this->_link);
 			}
-			
+
 			/** Send query
 			* @param string
 			* @param bool
@@ -110,6 +123,7 @@ if (!defined("DRIVER")) {
 				$result = @($unbuffered ? mysql_unbuffered_query($query, $this->_link) : mysql_query($query, $this->_link)); // @ - mute mysql.trace_mode
 				$this->error = "";
 				if (!$result) {
+					$this->errno = mysql_errno($this->_link);
 					$this->error = mysql_error($this->_link);
 					return false;
 				}
@@ -120,7 +134,7 @@ if (!defined("DRIVER")) {
 				}
 				return new Min_Result($result);
 			}
-			
+
 			/** Send query with more resultsets
 			* @param string
 			* @return bool
@@ -128,14 +142,14 @@ if (!defined("DRIVER")) {
 			function multi_query($query) {
 				return $this->_result = $this->query($query);
 			}
-			
+
 			/** Get current resultset
 			* @return Min_Result
 			*/
 			function store_result() {
 				return $this->_result;
 			}
-			
+
 			/** Fetch next resultset
 			* @return bool
 			*/
@@ -143,7 +157,7 @@ if (!defined("DRIVER")) {
 				// MySQL extension doesn't support multiple results
 				return false;
 			}
-			
+
 			/** Get single field from result
 			* @param string
 			* @param int
@@ -157,35 +171,35 @@ if (!defined("DRIVER")) {
 				return mysql_result($result->_result, 0, $field);
 			}
 		}
-		
+
 		class Min_Result {
 			var
 				$num_rows, ///< @var int number of rows in the result
 				$_result, $_offset = 0 ///< @access private
 			;
-			
+
 			/** Constructor
 			* @param resource
 			*/
-			function Min_Result($result) {
+			function __construct($result) {
 				$this->_result = $result;
 				$this->num_rows = mysql_num_rows($result);
 			}
-			
+
 			/** Fetch next row as associative array
 			* @return array
 			*/
 			function fetch_assoc() {
 				return mysql_fetch_assoc($this->_result);
 			}
-			
+
 			/** Fetch next row as numbered array
 			* @return array
 			*/
 			function fetch_row() {
 				return mysql_fetch_row($this->_result);
 			}
-			
+
 			/** Fetch next field
 			* @return object properties: name, type, orgtable, orgname, charsetnr
 			*/
@@ -196,37 +210,77 @@ if (!defined("DRIVER")) {
 				$return->charsetnr = ($return->blob ? 63 : 0);
 				return $return;
 			}
-			
+
 			/** Free result set
 			*/
 			function __destruct() {
-				mysql_free_result($this->_result); //! not called in PHP 4 which is a problem with mysql.trace_mode
+				mysql_free_result($this->_result);
 			}
 		}
-		
+
 	} elseif (extension_loaded("pdo_mysql")) {
 		class Min_DB extends Min_PDO {
 			var $extension = "PDO_MySQL";
-			
+
 			function connect($server, $username, $password) {
-				$this->dsn("mysql:host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)), $username, $password);
-				$this->query("SET NAMES utf8"); // charset in DSN is ignored
+				$this->dsn("mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)), $username, $password);
 				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));
 			}
-			
+
 			function query($query, $unbuffered = false) {
 				$this->setAttribute(1000, !$unbuffered); // 1000 - PDO::MYSQL_ATTR_USE_BUFFERED_QUERY
 				return parent::query($query, $unbuffered);
 			}
 		}
-		
+
 	}
 
+
+
+	class Min_Driver extends Min_SQL {
+
+		function insert($table, $set) {
+			return ($set ? parent::insert($table, $set) : queries("INSERT INTO " . table($table) . " ()\nVALUES ()"));
+		}
+
+		function insertUpdate($table, $rows, $primary) {
+			$columns = array_keys(reset($rows));
+			$prefix = "INSERT INTO " . table($table) . " (" . implode(", ", $columns) . ") VALUES\n";
+			$values = array();
+			foreach ($columns as $key) {
+				$values[$key] = "$key = VALUES($key)";
+			}
+			$suffix = "\nON DUPLICATE KEY UPDATE " . implode(", ", $values);
+			$values = array();
+			$length = 0;
+			foreach ($rows as $set) {
+				$value = "(" . implode(", ", $set) . ")";
+				if ($values && (strlen($prefix) + $length + strlen($value) + strlen($suffix) > 1e6)) { // 1e6 - default max_allowed_packet
+					if (!queries($prefix . implode(",\n", $values) . $suffix)) {
+						return false;
+					}
+					$values = array();
+					$length = 0;
+				}
+				$values[] = $value;
+				$length += strlen($value) + 2; // 2 - strlen(",\n")
+			}
+			return queries($prefix . implode(",\n", $values) . $suffix);
+		}
+
+	}
+
+
+
 	/** Escape database identifier
 	* @param string
 	* @return string
@@ -247,11 +301,16 @@ if (!defined("DRIVER")) {
 	* @return mixed Min_DB or string for error
 	*/
 	function connect() {
-		global $adminer;
+		global $adminer, $types, $structured_types;
 		$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");
+			if (version_compare($connection->server_info, '5.7.8') >= 0) {
+				$structured_types[lang('Strings')][] = "json";
+				$types["json"] = 4294967295;
+			}
 			return $connection;
 		}
 		$return = $connection->error;
@@ -296,6 +355,7 @@ if (!defined("DRIVER")) {
 
 	/** Formulate SQL modification query with limit 1
 	* @param string everything after UPDATE or DELETE
+	* @param string
 	* @return string
 	*/
 	function limit1($query, $where) {
@@ -326,7 +386,7 @@ if (!defined("DRIVER")) {
 	function engines() {
 		$return = array();
 		foreach (get_rows("SHOW ENGINES") as $row) {
-			if (ereg("YES|DEFAULT", $row["Support"])) {
+			if (preg_match("~YES|DEFAULT~", $row["Support"])) {
 				$return[] = $row["Engine"];
 			}
 		}
@@ -346,7 +406,10 @@ if (!defined("DRIVER")) {
 	*/
 	function tables_list() {
 		global $connection;
-		return get_key_vals("SHOW" . ($connection->server_info >= 5 ? " FULL" : "") . " TABLES");
+		return get_key_vals($connection->server_info >= 5
+			? "SELECT TABLE_NAME, TABLE_TYPE FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() ORDER BY TABLE_NAME"
+			: "SHOW TABLES"
+		);
 	}
 
 	/** Count tables in all databases
@@ -363,16 +426,21 @@ if (!defined("DRIVER")) {
 
 	/** Get table status
 	* @param string
+	* @param bool return only "Name", "Engine" and "Comment" fields
 	* @return array array($name => array("Name" => , "Engine" => , "Comment" => , "Oid" => , "Rows" => , "Collation" => , "Auto_increment" => , "Data_length" => , "Index_length" => , "Data_free" => )) or only inner array with $name
 	*/
-	function table_status($name = "") {
+	function table_status($name = "", $fast = false) {
+		global $connection;
 		$return = array();
-		foreach (get_rows("SHOW TABLE STATUS" . ($name != "" ? " LIKE " . q(addcslashes($name, "%_")) : "")) as $row) {
+		foreach (get_rows($fast && $connection->server_info >= 5
+			? "SELECT TABLE_NAME AS Name, ENGINE AS Engine, TABLE_COMMENT AS Comment FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() " . ($name != "" ? "AND TABLE_NAME = " . q($name) : "ORDER BY Name")
+			: "SHOW TABLE STATUS" . ($name != "" ? " LIKE " . q(addcslashes($name, "%_\\")) : "")
+		) as $row) {
 			if ($row["Engine"] == "InnoDB") {
 				// ignore internal comment, unnecessary since MySQL 5.1.21
 				$row["Comment"] = preg_replace('~(?:(.+); )?InnoDB free: .*~', '\\1', $row["Comment"]);
 			}
-			if (!isset($row["Rows"])) {
+			if (!isset($row["Engine"])) {
 				$row["Comment"] = "";
 			}
 			if ($name != "") {
@@ -388,7 +456,7 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function is_view($table_status) {
-		return !isset($table_status["Rows"]);
+		return $table_status["Engine"] === null;
 	}
 
 	/** Check if table supports foreign keys
@@ -396,7 +464,9 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function fk_support($table_status) {
-		return eregi("InnoDB|IBMDB2I", $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
@@ -413,12 +483,12 @@ if (!defined("DRIVER")) {
 				"type" => $match[1],
 				"length" => $match[2],
 				"unsigned" => ltrim($match[3] . $match[4]),
-				"default" => ($row["Default"] != "" || ereg("char", $match[1]) ? $row["Default"] : null),
+				"default" => ($row["Default"] != "" || preg_match("~char|set~", $match[1]) ? $row["Default"] : null),
 				"null" => ($row["Null"] == "YES"),
 				"auto_increment" => ($row["Extra"] == "auto_increment"),
-				"on_update" => (eregi('^on update (.+)', $row["Extra"], $match) ? $match[1] : ""), //! available since MySQL 5.1.23
+				"on_update" => (preg_match('~^on update (.+)~i', $row["Extra"], $match) ? $match[1] : ""), //! available since MySQL 5.1.23
 				"collation" => $row["Collation"],
-				"privileges" => array_flip(explode(",", $row["Privileges"])),
+				"privileges" => array_flip(preg_split('~, *~', $row["Privileges"])),
 				"comment" => $row["Comment"],
 				"primary" => ($row["Key"] == "PRI"),
 			);
@@ -429,14 +499,16 @@ if (!defined("DRIVER")) {
 	/** Get table indexes
 	* @param string
 	* @param string Min_DB to use
-	* @return array array($key_name => array("type" => , "columns" => array(), "lengths" => array()))
+	* @return array array($key_name => array("type" => , "columns" => array(), "lengths" => array(), "descs" => array()))
 	*/
 	function indexes($table, $connection2 = null) {
 		$return = array();
 		foreach (get_rows("SHOW INDEX FROM " . table($table), $connection2) as $row) {
-			$return[$row["Key_name"]]["type"] = ($row["Key_name"] == "PRIMARY" ? "PRIMARY" : ($row["Index_type"] == "FULLTEXT" ? "FULLTEXT" : ($row["Non_unique"] ? "INDEX" : "UNIQUE")));
-			$return[$row["Key_name"]]["columns"][] = $row["Column_name"];
-			$return[$row["Key_name"]]["lengths"][] = $row["Sub_part"];
+			$name = $row["Key_name"];
+			$return[$name]["type"] = ($name == "PRIMARY" ? "PRIMARY" : ($row["Index_type"] == "FULLTEXT" ? "FULLTEXT" : ($row["Non_unique"] ? ($row["Index_type"] == "SPATIAL" ? "SPATIAL" : "INDEX") : "UNIQUE")));
+			$return[$name]["columns"][] = $row["Column_name"];
+			$return[$name]["lengths"][] = ($row["Index_type"] == "SPATIAL" ? null : $row["Sub_part"]);
+			$return[$name]["descs"][] = null;
 		}
 		return $return;
 	}
@@ -451,7 +523,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);
@@ -514,62 +586,49 @@ if (!defined("DRIVER")) {
 		return h(preg_replace('~^You have an error.*syntax to use~U', "Syntax error", $connection->error));
 	}
 
-	/** Get line of error
-	* @return int 0 for first line
-	*/
-	function error_line() {
-		global $connection;
-		if (ereg(' at line ([0-9]+)$', $connection->error, $regs)) {
-			return $regs[1] - 1;
-		}
-	}
-
-	/** Return expression for binary comparison
-	* @param string
-	* @return string
-	*/
-	function exact_value($val) {
-		return q($val) . " COLLATE utf8_bin";
-	}
-
 	/** Create database
 	* @param string
+	* @param string
 	* @return string
 	*/
 	function create_database($db, $collation) {
-		set_session("dbs", null);
 		return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " COLLATE " . q($collation) : ""));
 	}
-	
+
 	/** Drop databases
 	* @param array
 	* @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
 	* @param string new name
-	* @return string
+	* @param string
 	* @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
 	* @return string
 	*/
@@ -589,7 +648,7 @@ if (!defined("DRIVER")) {
 		}
 		return " AUTO_INCREMENT$auto_increment_index";
 	}
-	
+
 	/** Run commands to create or alter table
 	* @param string "" to create
 	* @param string new name
@@ -598,7 +657,7 @@ if (!defined("DRIVER")) {
 	* @param string
 	* @param string
 	* @param string
-	* @param int
+	* @param string number
 	* @param string
 	* @return bool
 	*/
@@ -611,37 +670,38 @@ 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
 	* @param string escaped table name
-	* @param array of array("index type", "name", "(columns definition)") or array("index type", "name", "DROP")
+	* @param array of array("index type", "name", array("column definition", ...)) or array("index type", "name", "DROP")
 	* @return bool
 	*/
 	function alter_indexes($table, $alter) {
 		foreach ($alter as $key => $val) {
 			$alter[$key] = ($val[2] == "DROP"
 				? "\nDROP INDEX " . idf_escape($val[1])
-				: "\nADD $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "") . ($val[1] != "" ? idf_escape($val[1]) . " " : "") . $val[2]
+				: "\nADD $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "") . ($val[1] != "" ? idf_escape($val[1]) . " " : "") . "(" . implode(", ", $val[2]) . ")"
 			);
 		}
 		return queries("ALTER TABLE " . table($table) . implode(",", $alter));
 	}
-	
+
 	/** Run commands to truncate tables
 	* @param array
 	* @return bool
@@ -649,7 +709,7 @@ if (!defined("DRIVER")) {
 	function truncate_tables($tables) {
 		return apply_queries("TRUNCATE TABLE", $tables);
 	}
-	
+
 	/** Drop views
 	* @param array
 	* @return bool
@@ -657,7 +717,7 @@ if (!defined("DRIVER")) {
 	function drop_views($views) {
 		return queries("DROP VIEW " . implode(", ", array_map('table', $views)));
 	}
-	
+
 	/** Drop tables
 	* @param array
 	* @return bool
@@ -665,7 +725,7 @@ if (!defined("DRIVER")) {
 	function drop_tables($tables) {
 		return queries("DROP TABLE " . implode(", ", array_map('table', $tables)));
 	}
-	
+
 	/** Move tables to other schema
 	* @param array
 	* @param array
@@ -680,7 +740,7 @@ if (!defined("DRIVER")) {
 		return queries("RENAME TABLE " . implode(", ", $rename));
 		//! move triggers
 	}
-	
+
 	/** Copy tables to other schema
 	* @param array
 	* @param array
@@ -691,7 +751,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))
 			) {
@@ -709,10 +769,10 @@ if (!defined("DRIVER")) {
 		}
 		return true;
 	}
-	
+
 	/** 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 == "") {
@@ -721,30 +781,30 @@ if (!defined("DRIVER")) {
 		$rows = get_rows("SHOW TRIGGERS WHERE `Trigger` = " . q($name));
 		return reset($rows);
 	}
-	
+
 	/** Get defined triggers
 	* @param string
 	* @return array array($name => array($timing, $event))
 	*/
 	function triggers($table) {
 		$return = array();
-		foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_"))) as $row) {
+		foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_\\"))) as $row) {
 			$return[$row["Trigger"]] = array($row["Timing"], $row["Event"]);
 		}
 		return $return;
 	}
-	
+
 	/** 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"),
 		);
 	}
-	
+
 	/** Get information about stored routine
 	* @param string
 	* @param string "FUNCTION" or "PROCEDURE"
@@ -753,7 +813,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);
@@ -766,6 +826,7 @@ if (!defined("DRIVER")) {
 				"type" => strtolower($param[5]),
 				"length" => preg_replace_callback("~$enum_length~s", 'normalize_enum', $param[6]),
 				"unsigned" => strtolower(preg_replace('~\\s+~', ' ', trim("$param[8] $param[7]"))),
+				"null" => 1,
 				"full_type" => $param[4],
 				"inout" => strtoupper($param[1]),
 				"collation" => strtolower($param[9]),
@@ -781,51 +842,21 @@ if (!defined("DRIVER")) {
 			"language" => "SQL", // available in information_schema.ROUTINES.PARAMETER_STYLE
 		);
 	}
-	
+
 	/** Get list of routines
 	* @return array ("ROUTINE_TYPE" => , "ROUTINE_NAME" => , "DTD_IDENTIFIER" => )
 	*/
 	function routines() {
-		return get_rows("SELECT * FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = " . q(DB));
+		return get_rows("SELECT ROUTINE_NAME, ROUTINE_TYPE, DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = " . q(DB));
 	}
-	
+
 	/** Get list of available routine languages
 	* @return array
 	*/
 	function routine_languages() {
 		return array(); // "SQL" not required
 	}
-	
-	/** Begin transaction
-	* @return bool
-	*/
-	function begin() {
-		return queries("BEGIN");
-	}
-	
-	/** Insert data into table
-	* @param string
-	* @param array
-	* @return bool
-	*/
-	function insert_into($table, $set) {
-		return queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")");
-	}
-	
-	/** Insert or update data in the table
-	* @param string
-	* @param array
-	* @param array columns in keys
-	* @return bool
-	*/
-	function insert_update($table, $set, $primary) {
-		foreach ($set as $key => $val) {
-			$set[$key] = "$key = $val";
-		}
-		$update = implode(", ", $set);
-		return queries("INSERT INTO " . table($table) . " SET $update ON DUPLICATE KEY UPDATE $update");
-	}
-	
+
 	/** Get last auto increment ID
 	* @return string
 	*/
@@ -833,16 +864,16 @@ if (!defined("DRIVER")) {
 		global $connection;
 		return $connection->result("SELECT LAST_INSERT_ID()"); // mysql_insert_id() truncates bigint
 	}
-	
+
 	/** Explain select
 	* @param Min_DB
 	* @param string
 	* @return Min_Result
 	*/
 	function explain($connection, $query) {
-		return $connection->query("EXPLAIN $query");
+		return $connection->query("EXPLAIN " . ($connection->server_info >= 5.1 ? "PARTITIONS " : "") . $query);
 	}
-	
+
 	/** Get approximate number of rows
 	* @param array
 	* @param array
@@ -851,28 +882,28 @@ if (!defined("DRIVER")) {
 	function found_rows($table_status, $where) {
 		return ($where || $table_status["Engine"] != "InnoDB" ? null : $table_status["Rows"]);
 	}
-	
+
 	/** Get user defined types
 	* @return array
 	*/
 	function types() {
 		return array();
 	}
-	
+
 	/** Get existing schemas
 	* @return array
 	*/
 	function schemas() {
 		return array();
 	}
-	
+
 	/** Get current schema
 	* @return string
 	*/
 	function get_schema() {
 		return "";
 	}
-	
+
 	/** Set current schema
 	* @param string
 	* @return bool
@@ -880,7 +911,7 @@ if (!defined("DRIVER")) {
 	function set_schema($schema) {
 		return true;
 	}
-	
+
 	/** Get SQL command to create table
 	* @param string
 	* @param bool
@@ -894,7 +925,7 @@ if (!defined("DRIVER")) {
 		}
 		return $return;
 	}
-	
+
 	/** Get SQL command to truncate table
 	* @param string
 	* @return string
@@ -902,7 +933,7 @@ if (!defined("DRIVER")) {
 	function truncate_sql($table) {
 		return "TRUNCATE " . table($table);
 	}
-	
+
 	/** Get SQL command to change database
 	* @param string
 	* @return string
@@ -910,7 +941,7 @@ if (!defined("DRIVER")) {
 	function use_sql($database) {
 		return "USE " . idf_escape($database);
 	}
-	
+
 	/** Get SQL commands to create triggers
 	* @param string
 	* @param string
@@ -918,69 +949,96 @@ if (!defined("DRIVER")) {
 	*/
 	function trigger_sql($table, $style) {
 		$return = "";
-		foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_")), null, "-- ") as $row) {
+		foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_\\")), null, "-- ") as $row) {
 			$return .= "\n" . ($style == 'CREATE+ALTER' ? "DROP TRIGGER IF EXISTS " . idf_escape($row["Trigger"]) . ";;\n" : "")
 			. "CREATE TRIGGER " . idf_escape($row["Trigger"]) . " $row[Timing] $row[Event] ON " . table($row["Table"]) . " FOR EACH ROW\n$row[Statement];;\n";
 		}
 		return $return;
 	}
-	
+
 	/** Get server variables
 	* @return array ($name => $value)
 	*/
 	function show_variables() {
 		return get_key_vals("SHOW VARIABLES");
 	}
-	
+
 	/** Get process list
 	* @return array ($row)
 	*/
 	function process_list() {
 		return get_rows("SHOW FULL PROCESSLIST");
 	}
-	
+
 	/** Get status variables
 	* @return array ($name => $value)
 	*/
 	function show_status() {
 		return get_key_vals("SHOW STATUS");
 	}
-	
+
+	/** Get replication status of master or slave
+	* @param string
+	* @return array ($name => $value)
+	*/
+	function replication_status($type) {
+		return get_rows("SHOW $type STATUS");
+	}
+
 	/** Convert field in select and edit
 	* @param array one element from fields()
 	* @return string
 	*/
 	function convert_field($field) {
-		if (ereg("binary", $field["type"])) {
+		if (preg_match("~binary~", $field["type"])) {
 			return "HEX(" . idf_escape($field["field"]) . ")";
 		}
-		if (ereg("geometry|point|linestring|polygon", $field["type"])) {
+		if ($field["type"] == "bit") {
+			return "BIN(" . idf_escape($field["field"]) . " + 0)"; // + 0 is required outside MySQLnd
+		}
+		if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) {
 			return "AsWKT(" . idf_escape($field["field"]) . ")";
 		}
 	}
-	
+
 	/** Convert value in edit after applying functions back
 	* @param array one element from fields()
 	* @param string
 	* @return string
 	*/
 	function unconvert_field($field, $return) {
-		if (ereg("binary", $field["type"])) {
-			$return = "unhex($return)";
+		if (preg_match("~binary~", $field["type"])) {
+			$return = "UNHEX($return)";
 		}
-		if (ereg("geometry|point|linestring|polygon", $field["type"])) {
+		if ($field["type"] == "bit") {
+			$return = "CONV($return, 2, 10) + 0";
+		}
+		if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) {
 			$return = "GeomFromText($return)";
 		}
 		return $return;
 	}
-	
+
 	/** Check whether a feature is supported
-	* @param string "comment", "copy", "drop_col", "dump", "event", "kill", "partitioning", "privileges", "procedure", "processlist", "routine", "scheme", "sequence", "status", "trigger", "type", "variables", "view"
+	* @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) {
 		global $connection;
-		return !ereg("scheme|sequence|type" . ($connection->server_info < 5.1 ? "|event|partitioning" . ($connection->server_info < 5 ? "|view|routine|trigger" : "") : ""), $feature);
+		return !preg_match("~scheme|sequence|type|view_trigger|materializedview" . ($connection->server_info < 5.1 ? "|event|partitioning" . ($connection->server_info < 5 ? "|routine|trigger|view" : "") : "") . "~", $feature);
+	}
+
+	function kill_process($val) {
+		return queries("KILL " . number($val));
+	}
+
+	function connection_id(){
+		return "SELECT CONNECTION_ID()";
+	}
+
+	function max_connections() {
+		global $connection;
+		return $connection->result("SELECT @@max_connections");
 	}
 
 	$jush = "sql"; ///< @var string JUSH identifier
@@ -998,7 +1056,7 @@ if (!defined("DRIVER")) {
 		$structured_types[$key] = array_keys($val);
 	}
 	$unsigned = array("unsigned", "zerofill", "unsigned zerofill"); ///< @var array number variants
-	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", ""); ///< @var array operators used in select
+	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL"); ///< @var array operators used in select
 	$functions = array("char_length", "date", "from_unixtime", "lower", "round", "sec_to_time", "time_to_sec", "upper"); ///< @var array functions used in select
 	$grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum"); ///< @var array grouping functions used in select
 	$edit_functions = array( ///< @var array of array("$type|$type2" => "$function/$function2") functions used in editing, [0] - edit and insert, [1] - edit only

adminer/drivers/oracle.inc.php

@@ -6,16 +6,16 @@ if (isset($_GET["oracle"])) {
 	define("DRIVER", "oracle");
 	if (extension_loaded("oci8")) {
 		class Min_DB {
-			var $extension = "oci8", $_link, $_result, $server_info, $affected_rows, $error;
+			var $extension = "oci8", $_link, $_result, $server_info, $affected_rows, $errno, $error;
 
 			function _error($errno, $error) {
 				if (ini_bool("html_errors")) {
 					$error = html_entity_decode(strip_tags($error));
 				}
-				$error = ereg_replace('^[^:]*: ', '', $error);
+				$error = preg_replace('~^[^:]*: ~', '', $error);
 				$this->error = $error;
 			}
-			
+
 			function connect($server, $username, $password) {
 				$this->_link = @oci_new_connect($username, $password, $server, "AL32UTF8");
 				if ($this->_link) {
@@ -40,6 +40,7 @@ if (isset($_GET["oracle"])) {
 				$this->error = "";
 				if (!$result) {
 					$error = oci_error($this->_link);
+					$this->errno = $error["code"];
 					$this->error = $error["message"];
 					return false;
 				}
@@ -58,15 +59,15 @@ if (isset($_GET["oracle"])) {
 			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 = 1) {
 				$result = $this->query($query);
 				if (!is_object($result) || !oci_fetch($result->_result)) {
@@ -79,7 +80,7 @@ if (isset($_GET["oracle"])) {
 		class Min_Result {
 			var $_result, $_offset = 1, $num_rows;
 
-			function Min_Result($result) {
+			function __construct($result) {
 				$this->_result = $result;
 			}
 
@@ -91,7 +92,7 @@ if (isset($_GET["oracle"])) {
 				}
 				return $row;
 			}
-			
+
 			function fetch_assoc() {
 				return $this->_convert(oci_fetch_assoc($this->_result));
 			}
@@ -106,31 +107,45 @@ if (isset($_GET["oracle"])) {
 				$return->name = oci_field_name($this->_result, $column);
 				$return->orgname = $return->name;
 				$return->type = oci_field_type($this->_result, $column);
-				$return->charsetnr = (ereg("raw|blob|bfile", $return->type) ? 63 : 0); // 63 - binary
+				$return->charsetnr = (preg_match("~raw|blob|bfile~", $return->type) ? 63 : 0); // 63 - binary
 				return $return;
 			}
-			
+
 			function __destruct() {
 				oci_free_statement($this->_result);
 			}
 		}
-		
+
 	} elseif (extension_loaded("pdo_oci")) {
 		class Min_DB extends Min_PDO {
 			var $extension = "PDO_OCI";
-			
+
 			function connect($server, $username, $password) {
 				$this->dsn("oci:dbname=//$server;charset=AL32UTF8", $username, $password);
 				return true;
 			}
-			
+
 			function select_db($database) {
 				return true;
 			}
 		}
-		
+
 	}
-	
+
+
+
+	class Min_Driver extends Min_SQL {
+
+		//! support empty $set in insert()
+
+		function begin() {
+			return true; // automatic start
+		}
+
+	}
+
+
+
 	function idf_escape($idf) {
 		return '"' . str_replace('"', '""', $idf) . '"';
 	}
@@ -180,19 +195,21 @@ if (isset($_GET["oracle"])) {
 
 	function tables_list() {
 		return get_key_vals("SELECT table_name, 'table' FROM all_tables WHERE tablespace_name = " . q(DB) . "
-UNION SELECT view_name, 'view' FROM user_views"
+UNION SELECT view_name, 'view' FROM user_views
+ORDER BY 1"
 		); //! views don't have schema
 	}
 
 	function count_tables($databases) {
 		return array();
 	}
-	
+
 	function table_status($name = "") {
 		$return = array();
 		$search = q($name);
 		foreach (get_rows('SELECT table_name "Name", \'table\' "Engine", avg_row_len * num_rows "Data_length", num_rows "Rows" FROM all_tables WHERE tablespace_name = ' . q(DB) . ($name != "" ? " AND table_name = $search" : "") . "
-UNION SELECT view_name, 'view', 0, 0 FROM user_views" . ($name != "" ? " WHERE view_name = $search" : "")
+UNION SELECT view_name, 'view', 0, 0 FROM user_views" . ($name != "" ? " WHERE view_name = $search" : "") . "
+ORDER BY 1"
 		) as $row) {
 			if ($name != "") {
 				return $row;
@@ -205,7 +222,7 @@ UNION SELECT view_name, 'view', 0, 0 FROM user_views" . ($name != "" ? " WHERE v
 	function is_view($table_status) {
 		return $table_status["Engine"] == "view";
 	}
-	
+
 	function fk_support($table_status) {
 		return true;
 	}
@@ -242,9 +259,11 @@ FROM user_ind_columns uic
 LEFT JOIN user_constraints uc ON uic.index_name = uc.constraint_name AND uic.table_name = uc.table_name
 WHERE uic.table_name = " . q($table) . "
 ORDER BY uc.constraint_type, uic.column_position", $connection2) as $row) {
-			$return[$row["INDEX_NAME"]]["type"] = ($row["CONSTRAINT_TYPE"] == "P" ? "PRIMARY" : ($row["CONSTRAINT_TYPE"] == "U" ? "UNIQUE" : "INDEX"));
-			$return[$row["INDEX_NAME"]]["columns"][] = $row["COLUMN_NAME"];
-			$return[$row["INDEX_NAME"]]["lengths"][] = ($row["CHAR_LENGTH"] && $row["CHAR_LENGTH"] != $row["COLUMN_LENGTH"] ? $row["CHAR_LENGTH"] : null);
+			$index_name = $row["INDEX_NAME"];
+			$return[$index_name]["type"] = ($row["CONSTRAINT_TYPE"] == "P" ? "PRIMARY" : ($row["CONSTRAINT_TYPE"] == "U" ? "UNIQUE" : "INDEX"));
+			$return[$index_name]["columns"][] = $row["COLUMN_NAME"];
+			$return[$index_name]["lengths"][] = ($row["CHAR_LENGTH"] && $row["CHAR_LENGTH"] != $row["COLUMN_LENGTH"] ? $row["CHAR_LENGTH"] : null);
+			$return[$index_name]["descs"][] = ($row["DESCEND"] ? '1' : null);
 		}
 		return $return;
 	}
@@ -253,7 +272,7 @@ ORDER BY uc.constraint_type, uic.column_position", $connection2) as $row) {
 		$rows = get_rows('SELECT text "select" FROM user_views WHERE view_name = ' . q($name));
 		return reset($rows);
 	}
-	
+
 	function collations() {
 		return array(); //!
 	}
@@ -266,19 +285,15 @@ ORDER BY uc.constraint_type, uic.column_position", $connection2) as $row) {
 		global $connection;
 		return h($connection->error); //! highlight sqltext from offset
 	}
-	
-	function exact_value($val) {
-		return q($val);
-	}
-	
+
 	function explain($connection, $query) {
 		$connection->query("EXPLAIN PLAN FOR $query");
 		return $connection->query("SELECT * FROM plan_table");
 	}
-	
+
 	function found_rows($table_status, $where) {
 	}
-	
+
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		$alter = $drop = array();
 		foreach ($fields as $field) {
@@ -300,11 +315,33 @@ ORDER BY uc.constraint_type, uic.column_position", $connection2) as $row) {
 			&& ($table == $name || queries("ALTER TABLE " . table($table) . " RENAME TO " . table($name)))
 		;
 	}
-	
+
 	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) {
 		return apply_queries("TRUNCATE TABLE", $tables);
 	}
@@ -317,36 +354,28 @@ ORDER BY uc.constraint_type, uic.column_position", $connection2) as $row) {
 		return apply_queries("DROP TABLE", $tables);
 	}
 
-	function begin() {
-		return true; // automatic start
-	}
-	
-	function insert_into($table, $set) {
-		return queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")"); //! no columns
-	}
-	
 	function last_id() {
 		return 0; //!
 	}
-	
+
 	function schemas() {
 		return get_vals("SELECT DISTINCT owner FROM dba_segments WHERE owner IN (SELECT username FROM dba_users WHERE default_tablespace NOT IN ('SYSTEM','SYSAUX'))");
 	}
-	
+
 	function get_schema() {
 		global $connection;
 		return $connection->result("SELECT sys_context('USERENV', 'SESSION_USER') FROM dual");
 	}
-	
+
 	function set_schema($scheme) {
 		global $connection;
 		return $connection->query("ALTER SESSION SET CURRENT_SCHEMA = " . idf_escape($scheme));
 	}
-	
+
 	function show_variables() {
 		return get_key_vals('SELECT name, display_value FROM v$parameter');
 	}
-	
+
 	function process_list() {
 		return get_rows('SELECT sess.process AS "process", sess.username AS "user", sess.schemaname AS "schema", sess.status AS "status", sess.wait_class AS "wait_class", sess.seconds_in_wait AS "seconds_in_wait", sql.sql_text AS "sql_text", sess.machine AS "machine", sess.port AS "port"
 FROM v$session sess LEFT OUTER JOIN v$sql sql
@@ -355,23 +384,23 @@ WHERE sess.type = \'USER\'
 ORDER BY PROCESS
 ');
 	}
-	
+
 	function show_status() {
 		$rows = get_rows('SELECT * FROM v$instance');
 		return reset($rows);
 	}
-	
+
 	function convert_field($field) {
 	}
-	
+
 	function unconvert_field($field, $return) {
 		return $return;
 	}
-	
+
 	function support($feature) {
-		return ereg("view|scheme|processlist|drop_col|variables|status", $feature); //!
+		return preg_match('~^(columns|database|drop_col|indexes|processlist|scheme|sql|status|table|variables|view|view_trigger)$~', $feature); //!
 	}
-	
+
 	$jush = "oracle";
 	$types = array();
 	$structured_types = array();
@@ -385,7 +414,7 @@ ORDER BY PROCESS
 		$structured_types[$key] = array_keys($val);
 	}
 	$unsigned = array();
-	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "");
+	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL");
 	$functions = array("length", "lower", "round", "upper");
 	$grouping = array("avg", "count", "count distinct", "max", "min", "sum");
 	$edit_functions = array(

adminer/drivers/pgsql.inc.php

@@ -7,15 +7,15 @@ if (isset($_GET["pgsql"])) {
 	if (extension_loaded("pgsql")) {
 		class Min_DB {
 			var $extension = "PgSQL", $_link, $_result, $_string, $_database = true, $server_info, $affected_rows, $error;
-			
+
 			function _error($errno, $error) {
 				if (ini_bool("html_errors")) {
 					$error = html_entity_decode(strip_tags($error));
 				}
-				$error = ereg_replace('^[^:]*: ', '', $error);
+				$error = preg_replace('~^[^:]*: ~', '', $error);
 				$this->error = $error;
 			}
-			
+
 			function connect($server, $username, $password) {
 				global $adminer;
 				$db = $adminer->database();
@@ -35,11 +35,11 @@ if (isset($_GET["pgsql"])) {
 				}
 				return (bool) $this->_link;
 			}
-			
+
 			function quote($string) {
 				return "'" . pg_escape_string($this->_link, $string) . "'"; //! bytea
 			}
-			
+
 			function select_db($database) {
 				global $adminer;
 				if ($database == $adminer->database()) {
@@ -51,11 +51,11 @@ if (isset($_GET["pgsql"])) {
 				}
 				return $return;
 			}
-			
+
 			function close() {
 				$this->_link = @pg_connect("$this->_string dbname='postgres'");
 			}
-			
+
 			function query($query, $unbuffered = false) {
 				$result = @pg_query($this->_link, $query);
 				$this->error = "";
@@ -68,20 +68,20 @@ if (isset($_GET["pgsql"])) {
 				}
 				return new Min_Result($result);
 			}
-			
+
 			function multi_query($query) {
 				return $this->_result = $this->query($query);
 			}
-			
+
 			function store_result() {
 				return $this->_result;
 			}
-			
+
 			function next_result() {
 				// PgSQL extension doesn't support multiple results
 				return false;
 			}
-			
+
 			function result($query, $field = 0) {
 				$result = $this->query($query);
 				if (!$result || !$result->num_rows) {
@@ -90,23 +90,23 @@ if (isset($_GET["pgsql"])) {
 				return pg_fetch_result($result->_result, 0, $field);
 			}
 		}
-		
+
 		class Min_Result {
 			var $_result, $_offset = 0, $num_rows;
-			
-			function Min_Result($result) {
+
+			function __construct($result) {
 				$this->_result = $result;
 				$this->num_rows = pg_num_rows($result);
 			}
-			
+
 			function fetch_assoc() {
 				return pg_fetch_assoc($this->_result);
 			}
-			
+
 			function fetch_row() {
 				return pg_fetch_row($this->_result);
 			}
-			
+
 			function fetch_field() {
 				$column = $this->_offset++;
 				$return = new stdClass;
@@ -119,16 +119,16 @@ if (isset($_GET["pgsql"])) {
 				$return->charsetnr = ($return->type == "bytea" ? 63 : 0); // 63 - binary
 				return $return;
 			}
-			
+
 			function __destruct() {
 				pg_free_result($this->_result);
 			}
 		}
-		
+
 	} elseif (extension_loaded("pdo_pgsql")) {
 		class Min_DB extends Min_PDO {
 			var $extension = "PDO_PgSQL";
-			
+
 			function connect($server, $username, $password) {
 				global $adminer;
 				$db = $adminer->database();
@@ -137,18 +137,46 @@ if (isset($_GET["pgsql"])) {
 				//! connect without DB in case of an error
 				return true;
 			}
-			
+
 			function select_db($database) {
 				global $adminer;
 				return ($adminer->database() == $database);
 			}
-			
+
 			function close() {
 			}
 		}
-		
+
 	}
-	
+
+
+
+	class Min_Driver extends Min_SQL {
+
+		function insertUpdate($table, $rows, $primary) {
+			global $connection;
+			foreach ($rows as $set) {
+				$update = array();
+				$where = array();
+				foreach ($set as $key => $val) {
+					$update[] = "$key = $val";
+					if (isset($primary[idf_unescape($key)])) {
+						$where[] = "$key = $val";
+					}
+				}
+				if (!(($where && queries("UPDATE " . table($table) . " SET " . implode(", ", $update) . " WHERE " . implode(" AND ", $where)) && $connection->affected_rows)
+					|| queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ")")
+				)) {
+					return false;
+				}
+			}
+			return true;
+		}
+
+	}
+
+
+
 	function idf_escape($idf) {
 		return '"' . str_replace('"', '""', $idf) . '"';
 	}
@@ -158,22 +186,30 @@ if (isset($_GET["pgsql"])) {
 	}
 
 	function connect() {
-		global $adminer;
+		global $adminer, $types, $structured_types;
 		$connection = new Min_DB;
 		$credentials = $adminer->credentials();
 		if ($connection->connect($credentials[0], $credentials[1], $credentials[2])) {
 			if ($connection->server_info >= 9) {
 				$connection->query("SET application_name = 'Adminer'");
+				if ($connection->server_info >= 9.2) {
+					$structured_types[lang('Strings')][] = "json";
+					$types["json"] = 4294967295;
+					if ($connection->server_info >= 9.4) {
+						$structured_types[lang('Strings')][] = "jsonb";
+						$types["jsonb"] = 4294967295;
+					}
+				}
 			}
 			return $connection;
 		}
 		return $connection->error;
 	}
-	
+
 	function get_databases() {
-		return get_vals("SELECT datname FROM pg_database ORDER BY datname");
+		return get_vals("SELECT datname FROM pg_database WHERE has_database_privilege(datname, 'CONNECT') ORDER BY datname");
 	}
-	
+
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
 		return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
 	}
@@ -181,7 +217,7 @@ if (isset($_GET["pgsql"])) {
 	function limit1($query, $where) {
 		return " $query$where";
 	}
-	
+
 	function db_collation($db, $collations) {
 		global $connection;
 		return $connection->result("SHOW LC_COLLATE"); //! respect $db
@@ -190,44 +226,58 @@ if (isset($_GET["pgsql"])) {
 	function engines() {
 		return array();
 	}
-	
+
 	function logged_user() {
 		global $connection;
 		return $connection->result("SELECT user");
 	}
-	
+
 	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) {
 		return array(); // would require reconnect
 	}
 
 	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 AS \"Oid\", reltuples as \"Rows\"
-FROM pg_class
-WHERE relkind IN ('r','v')
-AND relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema())"
-			. ($name != "" ? " AND relname = " . q($name) : "")
+		foreach (get_rows("SELECT c.relname AS \"Name\", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\", pg_relation_size(c.oid) AS \"Data_length\", pg_total_relation_size(c.oid) - pg_relation_size(c.oid) AS \"Index_length\", obj_description(c.oid, 'pg_class') AS \"Comment\", c.relhasoids::int AS \"Oid\", c.reltuples as \"Rows\", n.nspname
+FROM pg_class c
+JOIN pg_namespace n ON(n.nspname = current_schema() AND n.oid = c.relnamespace)
+WHERE relkind IN ('r', 'm', 'v')
+" . ($name != "" ? "AND relname = " . q($name) : "ORDER BY c.oid")
 		) as $row) { //! Index_length, Auto_increment
 			$return[$row["Name"]] = $row;
 		}
 		return ($name != "" ? $return[$name] : $return);
 	}
-	
+
 	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) {
 		return true;
 	}
-	
+
 	function fields($table) {
 		$return = array();
-		foreach (get_rows("SELECT a.attname AS field, format_type(a.atttypid, a.atttypmod) AS full_type, d.adsrc AS default, a.attnotnull, col_description(c.oid, a.attnum) AS comment
+		$aliases = array(
+			'timestamp without time zone' => 'timestamp',
+			'timestamp with time zone' => 'timestamptz',
+		);
+		foreach (get_rows("SELECT a.attname AS field, format_type(a.atttypid, a.atttypmod) AS full_type, d.adsrc AS default, a.attnotnull::int, col_description(c.oid, a.attnum) AS comment
 FROM pg_class c
 JOIN pg_namespace n ON c.relnamespace = n.oid
 JOIN pg_attribute a ON c.oid = a.attrelid
@@ -239,20 +289,28 @@ AND a.attnum > 0
 ORDER BY a.attnum"
 		) as $row) {
 			//! collation, primary
-			ereg('(.*)(\\((.*)\\))?', $row["full_type"], $match);
-			list(, $row["type"], , $row["length"]) = $match;
-			$row["full_type"] = $row["type"] . ($row["length"] ? "($row[length])" : "");
-			$row["null"] = ($row["attnotnull"] == "f");
-			$row["auto_increment"] = eregi("^nextval\\(", $row["default"]);
+			preg_match('~([^([]+)(\((.*)\))?([a-z ]+)?((\[[0-9]*])*)$~', $row["full_type"], $match);
+			list(, $type, $length, $row["length"], $addon, $array) = $match;
+			$row["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);
-			if (preg_match('~^(.*)::.+$~', $row["default"], $match)) {
-				$row["default"] = ($match[1][0] == "'" ? idf_unescape($match[1]) : $match[1]);
+			if (preg_match('~(.+)::[^)]+(.*)~', $row["default"], $match)) {
+				$row["default"] = ($match[1][0] == "'" ? idf_unescape($match[1]) : $match[1]) . $match[2];
 			}
 			$return[$row["field"]] = $row;
 		}
 		return $return;
 	}
-	
+
 	function indexes($table, $connection2 = null) {
 		global $connection;
 		if (!is_object($connection2)) {
@@ -261,31 +319,35 @@ ORDER BY a.attnum"
 		$return = array();
 		$table_oid = $connection2->result("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($table));
 		$columns = get_key_vals("SELECT attnum, attname FROM pg_attribute WHERE attrelid = $table_oid AND attnum > 0", $connection2);
-		foreach (get_rows("SELECT relname, indisunique, indisprimary, indkey FROM pg_index i, pg_class ci WHERE i.indrelid = $table_oid AND ci.oid = i.indexrelid", $connection2) as $row) {
-			$return[$row["relname"]]["type"] = ($row["indisprimary"] == "t" ? "PRIMARY" : ($row["indisunique"] == "t" ? "UNIQUE" : "INDEX"));
-			$return[$row["relname"]]["columns"] = array();
+		foreach (get_rows("SELECT relname, indisunique::int, indisprimary::int, indkey, indoption , (indpred IS NOT NULL)::int as indispartial FROM pg_index i, pg_class ci WHERE i.indrelid = $table_oid AND ci.oid = i.indexrelid", $connection2) as $row) {
+			$relname = $row["relname"];
+			$return[$relname]["type"] = ($row["indispartial"] ? "INDEX" : ($row["indisprimary"] ? "PRIMARY" : ($row["indisunique"] ? "UNIQUE" : "INDEX")));
+			$return[$relname]["columns"] = array();
 			foreach (explode(" ", $row["indkey"]) as $indkey) {
-				$return[$row["relname"]]["columns"][] = $columns[$indkey];
+				$return[$relname]["columns"][] = $columns[$indkey];
 			}
-			$return[$row["relname"]]["lengths"] = array();
+			$return[$relname]["descs"] = array();
+			foreach (explode(" ", $row["indoption"]) as $indoption) {
+				$return[$relname]["descs"][] = ($indoption & 1 ? '1' : null); // 1 - INDOPTION_DESC
+			}
+			$return[$relname]["lengths"] = array();
 		}
 		return $return;
 	}
-	
+
 	function foreign_keys($table) {
 		global $on_actions;
 		$return = array();
-		foreach (get_rows("SELECT conname, pg_get_constraintdef(oid) AS definition
+		foreach (get_rows("SELECT conname, condeferrable::int AS deferrable, pg_get_constraintdef(oid) AS definition
 FROM pg_constraint
 WHERE conrelid = (SELECT pc.oid FROM pg_class AS pc INNER JOIN pg_namespace AS pn ON (pn.oid = pc.relnamespace) WHERE pc.relname = " . q($table) . " AND pn.nspname = current_schema())
 AND contype = 'f'::char
 ORDER BY conkey, conname") as $row) {
 			if (preg_match('~FOREIGN KEY\s*\((.+)\)\s*REFERENCES (.+)\((.+)\)(.*)$~iA', $row['definition'], $match)) {
 				$row['source'] = array_map('trim', explode(',', $match[1]));
-				$row['table'] = $match[2];
-				if (preg_match('~(.+)\.(.+)~', $match[2], $match2)) {
-					$row['ns'] = $match2[1];
-					$row['table'] = $match2[2];
+				if (preg_match('~^(("([^"]|"")+"|[^"]+)\.)?"?("([^"]|"")+"|[^"]+)$~', $match[2], $match2)) {
+					$row['ns'] = str_replace('""', '"', preg_replace('~^"(.+)"$~', '\1', $match2[2]));
+					$row['table'] = str_replace('""', '"', preg_replace('~^"(.+)"$~', '\1', $match2[4]));
 				}
 				$row['target'] = array_map('trim', explode(',', $match[3]));
 				$row['on_delete'] = (preg_match("~ON DELETE ($on_actions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
@@ -295,21 +357,21 @@ ORDER BY conkey, conname") as $row) {
 		}
 		return $return;
 	}
-	
+
 	function view($name) {
 		global $connection;
-		return array("select" => $connection->result("SELECT pg_get_viewdef(" . q($name) . ")"));
+		return array("select" => trim($connection->result("SELECT pg_get_viewdef(" . q($name) . ")")));
 	}
-	
+
 	function collations() {
 		//! supported in CREATE DATABASE
 		return array();
 	}
-	
+
 	function information_schema($db) {
 		return ($db == "information_schema");
 	}
-	
+
 	function error() {
 		global $connection;
 		$return = h($connection->error);
@@ -318,30 +380,26 @@ ORDER BY conkey, conname") as $row) {
 		}
 		return nl_br($return);
 	}
-	
-	function exact_value($val) {
-		return q($val);
-	}
-	
+
 	function create_database($db, $collation) {
 		return queries("CREATE DATABASE " . idf_escape($db) . ($collation ? " ENCODING " . idf_escape($collation) : ""));
 	}
-	
+
 	function drop_databases($databases) {
 		global $connection;
 		$connection->close();
 		return apply_queries("DROP DATABASE", $databases, 'idf_escape');
 	}
-	
+
 	function rename_database($name, $collation) {
 		//! current database cannot be renamed
 		return queries("ALTER DATABASE " . idf_escape(DB) . " RENAME TO " . idf_escape($name));
 	}
-	
+
 	function auto_increment() {
 		return "";
 	}
-	
+
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		$alter = array();
 		$queries = array();
@@ -364,7 +422,7 @@ ORDER BY conkey, conname") as $row) {
 					}
 					$alter[] = "ALTER $column TYPE$val[1]";
 					if (!$val[6]) {
-						$alter[] = "ALTER $column " . ($val[3] ? "SET$val[3]" : "DROP DEFAULT"); //! quoting
+						$alter[] = "ALTER $column " . ($val[3] ? "SET$val[3]" : "DROP DEFAULT");
 						$alter[] = "ALTER $column " . ($val[2] == " NULL" ? "DROP NOT" : "SET") . $val[2];
 					}
 				}
@@ -395,77 +453,94 @@ ORDER BY conkey, conname") as $row) {
 		}
 		return true;
 	}
-	
+
 	function alter_indexes($table, $alter) {
 		$create = array();
 		$drop = array();
+		$queries = array();
 		foreach ($alter as $val) {
 			if ($val[0] != "INDEX") {
+				//! descending UNIQUE indexes results in syntax error
 				$create[] = ($val[2] == "DROP"
 					? "\nDROP CONSTRAINT " . idf_escape($val[1])
-					: "\nADD $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "") . $val[2]
+					: "\nADD" . ($val[1] != "" ? " CONSTRAINT " . idf_escape($val[1]) : "") . " $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "") . "(" . implode(", ", $val[2]) . ")"
 				);
 			} elseif ($val[2] == "DROP") {
 				$drop[] = idf_escape($val[1]);
-			} elseif (!queries("CREATE INDEX " . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . " $val[2]")) {
+			} else {
+				$queries[] = "CREATE INDEX " . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . " (" . implode(", ", $val[2]) . ")";
+			}
+		}
+		if ($create) {
+			array_unshift($queries, "ALTER TABLE " . table($table) . implode(",", $create));
+		}
+		if ($drop) {
+			array_unshift($queries, "DROP INDEX " . implode(", ", $drop));
+		}
+		foreach ($queries as $query) {
+			if (!queries($query)) {
 				return false;
 			}
 		}
-		return ((!$create || queries("ALTER TABLE " . table($table) . implode(",", $create)))
-			&& (!$drop || queries("DROP INDEX " . implode(", ", $drop)))
-		);
+		return true;
 	}
-	
+
 	function truncate_tables($tables) {
 		return queries("TRUNCATE " . implode(", ", array_map('table', $tables)));
 		return true;
 	}
-	
+
 	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)));
-	}
-	
-	function move_tables($tables, $views, $target) {
 		foreach ($tables as $table) {
-			if (!queries("ALTER TABLE " . table($table) . " SET SCHEMA " . idf_escape($target))) {
-				return false;
-			}
+				$status = table_status($table);
+				if (!queries("DROP " . strtoupper($status["Engine"]) . " " . table($table))) {
+					return false;
+				}
 		}
-		foreach ($views as $table) {
-			if (!queries("ALTER VIEW " . table($table) . " SET SCHEMA " . idf_escape($target))) {
+		return true;
+	}
+
+	function move_tables($tables, $views, $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;
 			}
 		}
 		return true;
 	}
-	
-	function trigger($name) {
+
+	function trigger($name, $table = null) {
 		if ($name == "") {
 			return array("Statement" => "EXECUTE PROCEDURE ()");
 		}
-		$rows = get_rows('SELECT trigger_name AS "Trigger", condition_timing AS "Timing", event_manipulation AS "Event", \'FOR EACH \' || action_orientation AS "Type", action_statement AS "Statement" FROM information_schema.triggers WHERE event_object_table = ' . q($_GET["trigger"]) . ' AND trigger_name = ' . q($name));
+		if ($table === null) {
+			$table = $_GET['trigger'];
+		}
+		$rows = get_rows('SELECT t.trigger_name AS "Trigger", t.action_timing AS "Timing", (SELECT STRING_AGG(event_manipulation, \' OR \') FROM information_schema.triggers WHERE event_object_table = t.event_object_table AND trigger_name = t.trigger_name ) AS "Events", t.event_manipulation AS "Event", \'FOR EACH \' || t.action_orientation AS "Type", t.action_statement AS "Statement" FROM information_schema.triggers t WHERE t.event_object_table = ' . q($table) . ' AND t.trigger_name = ' . q($name));
 		return reset($rows);
 	}
-	
+
 	function triggers($table) {
 		$return = array();
 		foreach (get_rows("SELECT * FROM information_schema.triggers WHERE event_object_table = " . q($table)) as $row) {
-			$return[$row["trigger_name"]] = array($row["condition_timing"], $row["event_manipulation"]);
+			$return[$row["trigger_name"]] = array($row["action_timing"], $row["event_manipulation"]);
 		}
 		return $return;
 	}
-	
+
 	function trigger_options() {
 		return array(
 			"Timing" => array("BEFORE", "AFTER"),
+			"Event" => array("INSERT", "UPDATE", "DELETE"),
 			"Type" => array("FOR EACH ROW", "FOR EACH STATEMENT"),
 		);
 	}
-	
+
 	/*
 	function routine($name, $type) {
 		//! there can be more functions with the same name differing only in parameters, it must be also passed to DROP FUNCTION
@@ -479,7 +554,7 @@ WHERE n.nspname = current_schema() AND p.proname = ' . q($name));
 		return $rows[0];
 	}
 	*/
-	
+
 	function routines() {
 		return get_rows('SELECT p.proname AS "ROUTINE_NAME", p.proargtypes AS "ROUTINE_TYPE", pg_catalog.format_type(p.prorettype, NULL) AS "DTD_IDENTIFIER"
 FROM pg_catalog.pg_namespace n
@@ -487,46 +562,23 @@ JOIN pg_catalog.pg_proc p ON p.pronamespace = n.oid
 WHERE n.nspname = current_schema()
 ORDER BY p.proname');
 	}
-	
+
 	function routine_languages() {
 		return get_vals("SELECT langname FROM pg_catalog.pg_language");
 	}
-	
-	function begin() {
-		return queries("BEGIN");
-	}
-	
-	function insert_into($table, $set) {
-		return queries("INSERT INTO " . table($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
-	}
-	
-	function insert_update($table, $set, $primary) {
-		global $connection;
-		$update = array();
-		$where = array();
-		foreach ($set as $key => $val) {
-			$update[] = "$key = $val";
-			if (isset($primary[idf_unescape($key)])) {
-				$where[] = "$key = $val";
-			}
-		}
-		return ($where && queries("UPDATE " . table($table) . " SET " . implode(", ", $update) . " WHERE " . implode(" AND ", $where)) && $connection->affected_rows)
-			|| queries("INSERT INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ")")
-		;
-	}
-	
+
 	function last_id() {
 		return 0; // there can be several sequences
 	}
-	
+
 	function explain($connection, $query) {
 		return $connection->query("EXPLAIN $query");
 	}
-	
+
 	function found_rows($table_status, $where) {
 		global $connection;
-		if (ereg(
-			" rows=([0-9]+)",
+		if (preg_match(
+			"~ rows=([0-9]+)~",
 			$connection->result("EXPLAIN SELECT * FROM " . idf_escape($table_status["Name"]) . ($where ? " WHERE " . implode(" AND ", $where) : "")),
 			$regs
 		)) {
@@ -534,7 +586,7 @@ ORDER BY p.proname');
 		}
 		return false;
 	}
-	
+
 	function types() {
 		return get_vals("SELECT typname
 FROM pg_type
@@ -543,16 +595,16 @@ AND typtype IN ('b','d','e')
 AND typelem = 0"
 		);
 	}
-	
+
 	function schemas() {
 		return get_vals("SELECT nspname FROM pg_namespace ORDER BY nspname");
 	}
-	
+
 	function get_schema() {
 		global $connection;
 		return $connection->result("SELECT current_schema()");
 	}
-	
+
 	function set_schema($schema) {
 		global $connection, $types, $structured_types;
 		$return = $connection->query("SET search_path TO " . idf_escape($schema));
@@ -564,39 +616,159 @@ AND typelem = 0"
 		}
 		return $return;
 	}
-	
+
+	/** Get SQL command to create table
+	* @param string
+	* @param bool
+	* @return string
+	*/
+	function create_sql($table, $auto_increment) {
+		global $connection;
+		$return = '';
+		$return_parts = array();
+		$sequences = array();
+
+		$status = table_status($table);
+		$fields = fields($table);
+		$indexes = indexes($table);
+		ksort($indexes);
+		$fkeys = foreign_keys($table);
+		ksort($fkeys);
+		$triggers = triggers($table);
+
+		if (!$status || empty($fields)) {
+			return false;
+		}
+
+		$return = "CREATE TABLE " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " (\n    ";
+
+		// fields' definitions
+		foreach ($fields as $field_name => $field) {
+			$part = idf_escape($field['field']) . ' ' . $field['full_type']
+				. (is_null($field['default']) ? "" : " DEFAULT $field[default]")
+				. ($field['attnotnull'] ? " NOT NULL" : "");
+			$return_parts[] = $part;
+
+			// sequences for fields
+			if (preg_match('~nextval\(\'([^\']+)\'\)~', $field['default'], $matches)) {
+				$sequence_name = $matches[1];
+				$sq = reset(get_rows("SELECT * FROM $sequence_name"));
+				$sequences[] = "CREATE SEQUENCE $sequence_name INCREMENT $sq[increment_by] MINVALUE $sq[min_value] MAXVALUE $sq[max_value] START " . ($auto_increment ? $sq['last_value'] : 1) . " CACHE $sq[cache_value];";
+			}
+		}
+
+		// adding sequences before table definition
+		if (!empty($sequences)) {
+			$return = implode("\n\n", $sequences) . "\n\n$return";
+		}
+
+		// primary + unique keys
+		foreach ($indexes as $index_name => $index) {
+			switch($index['type']) {
+				case 'UNIQUE': $return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " UNIQUE (" . implode(', ', array_map('idf_escape', $index['columns'])) . ")"; break;
+				case 'PRIMARY': $return_parts[] = "CONSTRAINT " . idf_escape($index_name) . " PRIMARY KEY (" . implode(', ', array_map('idf_escape', $index['columns'])) . ")"; break;
+			}
+		}
+
+		// foreign keys
+		foreach ($fkeys as $fkey_name => $fkey) {
+			$return_parts[] = "CONSTRAINT " . idf_escape($fkey_name) . " $fkey[definition] " . ($fkey['deferrable'] ? 'DEFERRABLE' : 'NOT DEFERRABLE');
+		}
+
+		$return .= implode(",\n    ", $return_parts) . "\n) WITH (oids = " . ($status['Oid'] ? 'true' : 'false') . ");";
+
+		// "basic" indexes after table definition
+		foreach ($indexes as $index_name => $index) {
+			if ($index['type'] == 'INDEX') {
+				$return .= "\n\nCREATE INDEX " . idf_escape($index_name) . " ON " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " USING btree (" . implode(', ', array_map('idf_escape', $index['columns'])) . ");";
+			}
+		}
+
+		// coments for table & fields
+		if ($status['Comment']) {
+			$return .= "\n\nCOMMENT ON TABLE " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " IS " . q($status['Comment']) . ";";
+		}
+
+		foreach ($fields as $field_name => $field) {
+			if ($field['comment']) {
+				$return .= "\n\nCOMMENT ON COLUMN " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . "." . idf_escape($field_name) . " IS " . q($field['comment']) . ";";
+			}
+		}
+
+		// triggers
+		foreach ($triggers as $trg_id => $trg) {
+			$trigger = trigger($trg_id, $status['Name']);
+			$return .= "\n\nCREATE TRIGGER " . idf_escape($trigger['Trigger']) . " $trigger[Timing] $trigger[Events] ON " . idf_escape($status["nspname"]) . "." . idf_escape($status['Name']) . " $trigger[Type] $trigger[Statement];";
+		}
+
+		return rtrim($return, ';');
+	}
+
+	/** Get SQL commands to create triggers
+	* @param string
+	* @param string
+	* @return string
+	*/
+	//@TODO
+	function trigger_sql($table, $style) {
+		$return = "";
+		//foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_\\")), null, "-- ") as $row) {
+		//    $return .= "\n" . ($style == 'CREATE+ALTER' ? "DROP TRIGGER IF EXISTS " . idf_escape($row["Trigger"]) . ";;\n" : "")
+		//    . "CREATE TRIGGER " . idf_escape($row["Trigger"]) . " $row[Timing] $row[Event] ON " . table($row["Table"]) . " FOR EACH ROW\n$row[Statement];;\n";
+		//}
+		//return $return;
+
+		return false;
+	}
+
+
 	function use_sql($database) {
 		return "\connect " . idf_escape($database);
 	}
-	
+
 	function show_variables() {
 		return get_key_vals("SHOW ALL");
 	}
 
 	function process_list() {
-		return get_rows("SELECT * FROM pg_stat_activity ORDER BY procpid");
+		global $connection;
+		return get_rows("SELECT * FROM pg_stat_activity ORDER BY " . ($connection->server_info < 9.2 ? "procpid" : "pid"));
 	}
-	
+
 	function show_status() {
 	}
-	
+
 	function convert_field($field) {
 	}
-	
+
 	function unconvert_field($field, $return) {
 		return $return;
 	}
-	
+
 	function support($feature) {
-		return ereg('^(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|kill|dump)$~', $feature); //! routine|
 	}
-	
+
+	function kill_process($val) {
+		return queries("SELECT pg_terminate_backend(" . number($val) . ")");
+	}
+
+	function connection_id(){
+		return "SELECT pg_backend_pid()";
+	}
+
+	function max_connections() {
+		global $connection;
+		return $connection->result("SHOW max_connections");
+	}
+
 	$jush = "pgsql";
 	$types = array();
 	$structured_types = array();
 	foreach (array( //! arrays
 		lang('Numbers') => array("smallint" => 5, "integer" => 10, "bigint" => 19, "boolean" => 1, "numeric" => 0, "real" => 7, "double precision" => 16, "money" => 20),
-		lang('Date and time') => array("date" => 13, "time" => 17, "timestamp" => 20, "interval" => 0),
+		lang('Date and time') => array("date" => 13, "time" => 17, "timestamp" => 20, "timestamptz" => 21, "interval" => 0),
 		lang('Strings') => array("character" => 0, "character varying" => 0, "text" => 0, "tsquery" => 0, "tsvector" => 0, "uuid" => 0, "xml" => 0),
 		lang('Binary') => array("bit" => 0, "bit varying" => 0, "bytea" => 0),
 		lang('Network') => array("cidr" => 43, "inet" => 43, "macaddr" => 17, "txid_snapshot" => 0),
@@ -606,7 +778,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 "" 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/simpledb.inc.php

@@ -0,0 +1,473 @@
+<?php
+$drivers["simpledb"] = "SimpleDB";
+
+if (isset($_GET["simpledb"])) {
+	$possible_drivers = array("SimpleXML");
+	define("DRIVER", "simpledb");
+
+	if (class_exists('SimpleXMLElement')) {
+		class Min_DB {
+			var $extension = "SimpleXML", $server_info = '2009-04-15', $error, $timeout, $next, $affected_rows, $_result;
+
+			function select_db($database) {
+				return ($database == "domain");
+			}
+
+			function query($query, $unbuffered = false) {
+				$params = array('SelectExpression' => $query, 'ConsistentRead' => 'true');
+				if ($this->next) {
+					$params['NextToken'] = $this->next;
+				}
+				$result = sdb_request_all('Select', 'Item', $params, $this->timeout); //! respect $unbuffered
+				if ($result === false) {
+					return $result;
+				}
+				if (preg_match('~^\s*SELECT\s+COUNT\(~i', $query)) {
+					$sum = 0;
+					foreach ($result as $item) {
+						$sum += $item->Attribute->Value;
+					}
+					$result = array((object) array('Attribute' => array((object) array(
+						'Name' => 'Count',
+						'Value' => $sum,
+					))));
+				}
+				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 quote($string) {
+				return "'" . str_replace("'", "''", $string) . "'";
+			}
+
+		}
+
+		class Min_Result {
+			var $num_rows, $_rows = array(), $_offset = 0;
+
+			function __construct($result) {
+				foreach ($result as $item) {
+					$row = array();
+					if ($item->Name != '') { // SELECT COUNT(*)
+						$row['itemName()'] = (string) $item->Name;
+					}
+					foreach ($item->Attribute as $attribute) {
+						$name = $this->_processValue($attribute->Name);
+						$value = $this->_processValue($attribute->Value);
+						if (isset($row[$name])) {
+							$row[$name] = (array) $row[$name];
+							$row[$name][] = $value;
+						} else {
+							$row[$name] = $value;
+						}
+					}
+					$this->_rows[] = $row;
+					foreach ($row as $key => $val) {
+						if (!isset($this->_rows[0][$key])) {
+							$this->_rows[0][$key] = null;
+						}
+					}
+				}
+				$this->num_rows = count($this->_rows);
+			}
+
+			function _processValue($element) {
+				return (is_object($element) && $element['encoding'] == 'base64' ? base64_decode($element) : (string) $element);
+			}
+
+			function fetch_assoc() {
+				$row = current($this->_rows);
+				if (!$row) {
+					return $row;
+				}
+				$return = array();
+				foreach ($this->_rows[0] as $key => $val) {
+					$return[$key] = $row[$key];
+				}
+				next($this->_rows);
+				return $return;
+			}
+
+			function fetch_row() {
+				$return = $this->fetch_assoc();
+				if (!$return) {
+					return $return;
+				}
+				return array_values($return);
+			}
+
+			function fetch_field() {
+				$keys = array_keys($this->_rows[0]);
+				return (object) array('name' => $keys[$this->_offset++]);
+			}
+
+		}
+	}
+
+
+
+	class Min_Driver extends Min_SQL {
+		public $primary = "itemName()";
+
+		function _chunkRequest($ids, $action, $params, $expand = array()) {
+			global $connection;
+			foreach (array_chunk($ids, 25) as $chunk) {
+				$params2 = $params;
+				foreach ($chunk as $i => $id) {
+					$params2["Item.$i.ItemName"] = $id;
+					foreach ($expand as $key => $val) {
+						$params2["Item.$i.$key"] = $val;
+					}
+				}
+				if (!sdb_request($action, $params2)) {
+					return false;
+				}
+			}
+			$connection->affected_rows = count($ids);
+			return true;
+		}
+
+		function _extractIds($table, $queryWhere, $limit) {
+			$return = array();
+			if (preg_match_all("~itemName\(\) = (('[^']*+')+)~", $queryWhere, $matches)) {
+				$return = array_map('idf_unescape', $matches[1]);
+			} else {
+				foreach (sdb_request_all('Select', 'Item', array('SelectExpression' => 'SELECT itemName() FROM ' . table($table) . $queryWhere . ($limit ? " LIMIT 1" : ""))) as $item) {
+					$return[] = $item->Name;
+				}
+			}
+			return $return;
+		}
+
+		function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+			global $connection;
+			$connection->next = $_GET["next"];
+			$return = parent::select($table, $select, $where, $group, $order, $limit, $page, $print);
+			$connection->next = 0;
+			return $return;
+		}
+
+		function delete($table, $queryWhere, $limit = 0) {
+			return $this->_chunkRequest(
+				$this->_extractIds($table, $queryWhere, $limit),
+				'BatchDeleteAttributes',
+				array('DomainName' => $table)
+			);
+		}
+
+		function update($table, $set, $queryWhere, $limit = 0, $separator = "\n") {
+			$delete = array();
+			$insert = array();
+			$i = 0;
+			$ids = $this->_extractIds($table, $queryWhere, $limit);
+			$id = idf_unescape($set["`itemName()`"]);
+			unset($set["`itemName()`"]);
+			foreach ($set as $key => $val) {
+				$key = idf_unescape($key);
+				if ($val == "NULL" || ($id != "" && array($id) != $ids)) {
+					$delete["Attribute." . count($delete) . ".Name"] = $key;
+				}
+				if ($val != "NULL") {
+					foreach ((array) $val as $k => $v) {
+						$insert["Attribute.$i.Name"] = $key;
+						$insert["Attribute.$i.Value"] = (is_array($val) ? $v : idf_unescape($v));
+						if (!$k) {
+							$insert["Attribute.$i.Replace"] = "true";
+						}
+						$i++;
+					}
+				}
+			}
+			$params = array('DomainName' => $table);
+			return (!$insert || $this->_chunkRequest(($id != "" ? array($id) : $ids), 'BatchPutAttributes', $params, $insert))
+				&& (!$delete || $this->_chunkRequest($ids, 'BatchDeleteAttributes', $params, $delete))
+			;
+		}
+
+		function insert($table, $set) {
+			$params = array("DomainName" => $table);
+			$i = 0;
+			foreach ($set as $name => $value) {
+				if ($value != "NULL") {
+					$name = idf_unescape($name);
+					if ($name == "itemName()") {
+						$params["ItemName"] = idf_unescape($value);
+					} else {
+						foreach ((array) $value as $val) {
+							$params["Attribute.$i.Name"] = $name;
+							$params["Attribute.$i.Value"] = (is_array($value) ? $val : idf_unescape($value));
+							$i++;
+						}
+					}
+				}
+			}
+			return sdb_request('PutAttributes', $params);
+		}
+
+		function insertUpdate($table, $rows, $primary) {
+			//! use one batch request
+			foreach ($rows as $set) {
+				if (!$this->update($table, $set, "WHERE `itemName()` = " . q($set["`itemName()`"]))) {
+					return false;
+				}
+			}
+			return true;
+		}
+
+		function begin() {
+			return false;
+		}
+
+		function commit() {
+			return false;
+		}
+
+		function rollback() {
+			return false;
+		}
+
+	}
+
+
+
+	function connect() {
+		return new Min_DB;
+	}
+
+	function support($feature) {
+		return preg_match('~sql~', $feature);
+	}
+
+	function logged_user() {
+		global $adminer;
+		$credentials = $adminer->credentials();
+		return $credentials[1];
+	}
+
+	function get_databases() {
+		return array("domain");
+	}
+
+	function collations() {
+		return array();
+	}
+
+	function db_collation($db, $collations) {
+	}
+
+	function tables_list() {
+		global $connection;
+		$return = array();
+		foreach (sdb_request_all('ListDomains', 'DomainName') as $table) {
+			$return[(string) $table] = 'table';
+		}
+		if ($connection->error && defined("PAGE_HEADER")) {
+			echo "<p class='error'>" . error() . "\n";
+		}
+		return $return;
+	}
+
+	function table_status($name = "", $fast = false) {
+		$return = array();
+		foreach (($name != "" ? array($name => true) : tables_list()) as $table => $type) {
+			$row = array("Name" => $table, "Auto_increment" => "");
+			if (!$fast) {
+				$meta = sdb_request('DomainMetadata', array('DomainName' => $table));
+				if ($meta) {
+					foreach (array(
+						"Rows" => "ItemCount",
+						"Data_length" => "ItemNamesSizeBytes",
+						"Index_length" => "AttributeValuesSizeBytes",
+						"Data_free" => "AttributeNamesSizeBytes",
+					) as $key => $val) {
+						$row[$key] = (string) $meta->$val;
+					}
+				}
+			}
+			if ($name != "") {
+				return $row;
+			}
+			$return[$table] = $row;
+		}
+		return $return;
+	}
+
+	function explain($connection, $query) {
+	}
+
+	function error() {
+		global $connection;
+		return h($connection->error);
+	}
+
+	function information_schema() {
+	}
+
+	function is_view($table_status) {
+	}
+
+	function indexes($table, $connection2 = null) {
+		return array(
+			array("type" => "PRIMARY", "columns" => array("itemName()")),
+		);
+	}
+
+	function fields($table) {
+		return fields_from_edit();
+	}
+
+	function foreign_keys($table) {
+		return array();
+	}
+
+	function table($idf) {
+		return idf_escape($idf);
+	}
+
+	function idf_escape($idf) {
+		return "`" . str_replace("`", "``", $idf) . "`";
+	}
+
+	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
+		return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" : "");
+	}
+
+	function unconvert_field($field, $return) {
+		return $return;
+	}
+
+	function fk_support($table_status) {
+	}
+
+	function engines() {
+		return array();
+	}
+
+	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
+		return ($table == "" && sdb_request('CreateDomain', array('DomainName' => $name)));
+	}
+
+	function drop_tables($tables) {
+		foreach ($tables as $table) {
+			if (!sdb_request('DeleteDomain', array('DomainName' => $table))) {
+				return false;
+			}
+		}
+		return true;
+	}
+
+	function count_tables($databases) {
+		foreach ($databases as $db) {
+			return array($db => count(tables_list()));
+		}
+	}
+
+	function found_rows($table_status, $where) {
+		return ($where ? null : $table_status["Rows"]);
+	}
+
+	function last_id() {
+	}
+
+	function hmac($algo, $data, $key, $raw_output = false) {
+		// can use hash_hmac() since PHP 5.1.2
+		$blocksize = 64;
+		if (strlen($key) > $blocksize) {
+			$key = pack("H*", $algo($key));
+		}
+		$key = str_pad($key, $blocksize, "\0");
+		$k_ipad = $key ^ str_repeat("\x36", $blocksize);
+		$k_opad = $key ^ str_repeat("\x5C", $blocksize);
+		$return = $algo($k_opad . pack("H*", $algo($k_ipad . $data)));
+		if ($raw_output) {
+			$return = pack("H*", $return);
+		}
+		return $return;
+	}
+
+	function sdb_request($action, $params = array()) {
+		global $adminer, $connection;
+		list($host, $params['AWSAccessKeyId'], $secret) = $adminer->credentials();
+		$params['Action'] = $action;
+		$params['Timestamp'] = gmdate('Y-m-d\TH:i:s+00:00');
+		$params['Version'] = '2009-04-15';
+		$params['SignatureVersion'] = 2;
+		$params['SignatureMethod'] = 'HmacSHA1';
+		ksort($params);
+		$query = '';
+		foreach ($params as $key => $val) {
+			$query .= '&' . rawurlencode($key) . '=' . rawurlencode($val);
+		}
+		$query = str_replace('%7E', '~', substr($query, 1));
+		$query .= "&Signature=" . urlencode(base64_encode(hmac('sha1', "POST\n" . preg_replace('~^https?://~', '', $host) . "\n/\n$query", $secret, true)));
+		@ini_set('track_errors', 1); // @ - may be disabled
+		$file = @file_get_contents((preg_match('~^https?://~', $host) ? $host : "http://$host"), false, stream_context_create(array('http' => array(
+			'method' => 'POST', // may not fit in URL with GET
+			'content' => $query,
+			'ignore_errors' => 1, // available since PHP 5.2.10
+		))));
+		if (!$file) {
+			$connection->error = $php_errormsg;
+			return false;
+		}
+		libxml_use_internal_errors(true);
+		$xml = simplexml_load_string($file);
+		if (!$xml) {
+			$error = libxml_get_last_error();
+			$connection->error = $error->message;
+			return false;
+		}
+		if ($xml->Errors) {
+			$error = $xml->Errors->Error;
+			$connection->error = "$error->Message ($error->Code)";
+			return false;
+		}
+		$connection->error = '';
+		$tag = $action . "Result";
+		return ($xml->$tag ? $xml->$tag : true);
+	}
+
+	function sdb_request_all($action, $tag, $params = array(), $timeout = 0) {
+		$return = array();
+		$start = ($timeout ? microtime(true) : 0);
+		$limit = (preg_match('~LIMIT\s+(\d+)\s*$~i', $params['SelectExpression'], $match) ? $match[1] : 0);
+		do {
+			$xml = sdb_request($action, $params);
+			if (!$xml) {
+				break;
+			}
+			foreach ($xml->$tag as $element) {
+				$return[] = $element;
+			}
+			if ($limit && count($return) >= $limit) {
+				$_GET["next"] = $xml->NextToken;
+				break;
+			}
+			if ($timeout && microtime(true) - $start > $timeout) {
+				return false;
+			}
+			$params['NextToken'] = $xml->NextToken;
+			if ($limit) {
+				$params['SelectExpression'] = preg_replace('~\d+\s*$~', $limit - count($return), $params['SelectExpression']);
+			}
+		} while ($xml->NextToken);
+		return $return;
+	}
+
+	$jush = "simpledb";
+	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "IS NOT NULL");
+	$functions = array();
+	$grouping = array("count");
+	$edit_functions = array(array("json"));
+}

adminer/drivers/sqlite.inc.php

@@ -5,22 +5,23 @@ $drivers["sqlite2"] = "SQLite 2";
 if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	$possible_drivers = array((isset($_GET["sqlite"]) ? "SQLite3" : "SQLite"), "PDO_SQLite");
 	define("DRIVER", (isset($_GET["sqlite"]) ? "sqlite" : "sqlite2"));
-	if (extension_loaded(isset($_GET["sqlite"]) ? "sqlite3" : "sqlite")) {
+	if (class_exists(isset($_GET["sqlite"]) ? "SQLite3" : "SQLiteDatabase")) {
 		if (isset($_GET["sqlite"])) {
-			
+
 			class Min_SQLite {
-				var $extension = "SQLite3", $server_info, $affected_rows, $error, $_link;
-				
-				function Min_SQLite($filename) {
+				var $extension = "SQLite3", $server_info, $affected_rows, $errno, $error, $_link;
+
+				function __construct($filename) {
 					$this->_link = new SQLite3($filename);
 					$version = $this->_link->version();
 					$this->server_info = $version["versionString"];
 				}
-				
+
 				function query($query) {
 					$result = @$this->_link->query($query);
 					$this->error = "";
 					if (!$result) {
+						$this->errno = $this->_link->lastErrorCode();
 						$this->error = $this->_link->lastErrorMsg();
 						return false;
 					} elseif ($result->numColumns()) {
@@ -29,18 +30,18 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 					$this->affected_rows = $this->_link->changes();
 					return true;
 				}
-				
+
 				function quote($string) {
 					return (is_utf8($string)
 						? "'" . $this->_link->escapeString($string) . "'"
 						: "x'" . reset(unpack('H*', $string)) . "'"
 					);
 				}
-				
+
 				function store_result() {
 					return $this->_result;
 				}
-				
+
 				function result($query, $field = 0) {
 					$result = $this->query($query);
 					if (!is_object($result)) {
@@ -50,22 +51,22 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 					return $row[$field];
 				}
 			}
-			
+
 			class Min_Result {
 				var $_result, $_offset = 0, $num_rows;
-				
-				function Min_Result($result) {
+
+				function __construct($result) {
 					$this->_result = $result;
 				}
-				
+
 				function fetch_assoc() {
 					return $this->_result->fetchArray(SQLITE3_ASSOC);
 				}
-				
+
 				function fetch_row() {
 					return $this->_result->fetchArray(SQLITE3_NUM);
 				}
-				
+
 				function fetch_field() {
 					$column = $this->_offset++;
 					$type = $this->_result->columnType($column);
@@ -75,22 +76,22 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 						"charsetnr" => ($type == SQLITE3_BLOB ? 63 : 0), // 63 - binary
 					);
 				}
-				
+
 				function __desctruct() {
 					return $this->_result->finalize();
 				}
 			}
-			
+
 		} else {
-			
+
 			class Min_SQLite {
 				var $extension = "SQLite", $server_info, $affected_rows, $error, $_link;
-				
-				function Min_SQLite($filename) {
+
+				function __construct($filename) {
 					$this->server_info = sqlite_libversion();
 					$this->_link = new SQLiteDatabase($filename);
 				}
-				
+
 				function query($query, $unbuffered = false) {
 					$method = ($unbuffered ? "unbufferedQuery" : "query");
 					$result = @$this->_link->$method($query, SQLITE_BOTH, $error);
@@ -104,15 +105,15 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 					}
 					return new Min_Result($result);
 				}
-				
+
 				function quote($string) {
 					return "'" . sqlite_escape_string($string) . "'";
 				}
-				
+
 				function store_result() {
 					return $this->_result;
 				}
-				
+
 				function result($query, $field = 0) {
 					$result = $this->query($query);
 					if (!is_object($result)) {
@@ -122,17 +123,17 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 					return $row[$field];
 				}
 			}
-			
+
 			class Min_Result {
 				var $_result, $_offset = 0, $num_rows;
-				
-				function Min_Result($result) {
+
+				function __construct($result) {
 					$this->_result = $result;
 					if (method_exists($result, 'numRows')) { // not available in unbuffered query
 						$this->num_rows = $result->numRows();
 					}
 				}
-				
+
 				function fetch_assoc() {
 					$row = $this->_result->fetch(SQLITE_ASSOC);
 					if (!$row) {
@@ -144,11 +145,11 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 					}
 					return $return;
 				}
-				
+
 				function fetch_row() {
 					return $this->_result->fetch(SQLITE_NUM);
 				}
-				
+
 				function fetch_field() {
 					$name = $this->_result->fieldName($this->_offset++);
 					$pattern = '(\\[.*]|"(?:[^"]|"")*"|(.+))';
@@ -162,47 +163,63 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 						"orgtable" => $table,
 					);
 				}
-				
+
 			}
-			
+
 		}
-		
+
 	} elseif (extension_loaded("pdo_sqlite")) {
 		class Min_SQLite extends Min_PDO {
 			var $extension = "PDO_SQLite";
-			
-			function Min_SQLite($filename) {
+
+			function __construct($filename) {
 				$this->dsn(DRIVER . ":$filename", "", "");
 			}
 		}
-		
+
 	}
 
 	if (class_exists("Min_SQLite")) {
 		class Min_DB extends Min_SQLite {
-			
-			function Min_DB() {
-				$this->Min_SQLite(":memory:");
+
+			function __construct() {
+				parent::__construct(":memory:");
 			}
-			
+
 			function select_db($filename) {
-				if (is_readable($filename) && $this->query("ATTACH " . $this->quote(ereg("(^[/\\\\]|:)", $filename) ? $filename : dirname($_SERVER["SCRIPT_FILENAME"]) . "/$filename") . " AS a")) { // is_readable - SQLite 3
-					$this->Min_SQLite($filename);
+				if (is_readable($filename) && $this->query("ATTACH " . $this->quote(preg_match("~(^[/\\\\]|:)~", $filename) ? $filename : dirname($_SERVER["SCRIPT_FILENAME"]) . "/$filename") . " AS a")) { // is_readable - SQLite 3
+					parent::__construct($filename);
 					return true;
 				}
 				return false;
 			}
-			
+
 			function multi_query($query) {
 				return $this->_result = $this->query($query);
 			}
-			
+
 			function next_result() {
 				return false;
 			}
 		}
 	}
-	
+
+
+
+	class Min_Driver extends Min_SQL {
+
+		function insertUpdate($table, $rows, $primary) {
+			$values = array();
+			foreach ($rows as $set) {
+				$values[] = "(" . implode(", ", $set) . ")";
+			}
+			return queries("REPLACE INTO " . table($table) . " (" . implode(", ", array_keys(reset($rows))) . ") VALUES\n" . implode(",\n", $values));
+		}
+
+	}
+
+
+
 	function idf_escape($idf) {
 		return '"' . str_replace('"', '""', $idf) . '"';
 	}
@@ -252,8 +269,8 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	function table_status($name = "") {
 		global $connection;
 		$return = array();
-		foreach (get_rows("SELECT name AS Name, type AS Engine FROM sqlite_master WHERE type IN ('table', 'view')" . ($name != "" ? " AND name = " . q($name) : "")) as $row) {
-			$row["Oid"] = "t";
+		foreach (get_rows("SELECT name AS Name, type AS Engine FROM sqlite_master WHERE type IN ('table', 'view') " . ($name != "" ? "AND name = " . q($name) : "ORDER BY name")) as $row) {
+			$row["Oid"] = 1;
 			$row["Auto_increment"] = "";
 			$row["Rows"] = $connection->result("SELECT COUNT(*) FROM " . idf_escape($row["Name"]));
 			$return[$row["Name"]] = $row;
@@ -267,51 +284,93 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	function is_view($table_status) {
 		return $table_status["Engine"] == "view";
 	}
-	
+
 	function fk_support($table_status) {
 		global $connection;
 		return !$connection->result("SELECT sqlite_compileoption_used('OMIT_FOREIGN_KEY')");
 	}
 
 	function fields($table) {
+		global $connection;
 		$return = array();
+		$primary = "";
 		foreach (get_rows("PRAGMA table_info(" . table($table) . ")") as $row) {
+			$name = $row["name"];
 			$type = strtolower($row["type"]);
 			$default = $row["dflt_value"];
-			$return[$row["name"]] = array(
-				"field" => $row["name"],
-				"type" => (eregi("int", $type) ? "integer" : (eregi("char|clob|text", $type) ? "text" : (eregi("blob", $type) ? "blob" : (eregi("real|floa|doub", $type) ? "real" : "numeric")))),
+			$return[$name] = array(
+				"field" => $name,
+				"type" => (preg_match('~int~i', $type) ? "integer" : (preg_match('~char|clob|text~i', $type) ? "text" : (preg_match('~blob~i', $type) ? "blob" : (preg_match('~real|floa|doub~i', $type) ? "real" : "numeric")))),
 				"full_type" => $type,
-				"default" => (ereg("'(.*)'", $default, $match) ? str_replace("''", "'", $match[1]) : ($default == "NULL" ? null : $default)),
+				"default" => (preg_match("~'(.*)'~", $default, $match) ? str_replace("''", "'", $match[1]) : ($default == "NULL" ? null : $default)),
 				"null" => !$row["notnull"],
-				"auto_increment" => eregi('^integer$', $type) && $row["pk"], //! possible false positive
 				"privileges" => array("select" => 1, "insert" => 1, "update" => 1),
 				"primary" => $row["pk"],
 			);
+			if ($row["pk"]) {
+				if ($primary != "") {
+					$return[$primary]["auto_increment"] = false;
+				} elseif (preg_match('~^integer$~i', $type)) {
+					$return[$name]["auto_increment"] = true;
+				}
+				$primary = $name;
+			}
+		}
+		$sql = $connection->result("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table));
+		preg_match_all('~(("[^"]*+")+|[a-z0-9_]+)\s+text\s+COLLATE\s+(\'[^\']+\'|\S+)~i', $sql, $matches, PREG_SET_ORDER);
+		foreach ($matches as $match) {
+			$name = str_replace('""', '"', preg_replace('~^"|"$~', '', $match[1]));
+			if ($return[$name]) {
+				$return[$name]["collation"] = trim($match[3], "'");
+			}
 		}
 		return $return;
 	}
 
 	function indexes($table, $connection2 = null) {
+		global $connection;
+		if (!is_object($connection2)) {
+			$connection2 = $connection;
+		}
 		$return = array();
-		$primary = array();
-		foreach (fields($table) as $field) {
-			if ($field["primary"]) {
-				$primary[] = $field["field"];
+		$sql = $connection2->result("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table));
+		if (preg_match('~\bPRIMARY\s+KEY\s*\((([^)"]+|"[^"]*")++)~i', $sql, $match)) {
+			$return[""] = array("type" => "PRIMARY", "columns" => array(), "lengths" => array(), "descs" => array());
+			preg_match_all('~((("[^"]*+")+)|(\S+))(\s+(ASC|DESC))?(,\s*|$)~i', $match[1], $matches, PREG_SET_ORDER);
+			foreach ($matches as $match) {
+				$return[""]["columns"][] = idf_unescape($match[2]) . $match[4];
+				$return[""]["descs"][] = (preg_match('~DESC~i', $match[5]) ? '1' : null);
 			}
 		}
-		if ($primary) {
-			$return[""] = array("type" => "PRIMARY", "columns" => $primary, "lengths" => array());
-		}
-		foreach (get_rows("PRAGMA index_list(" . table($table) . ")") as $row) {
-			if (!ereg("^sqlite_", $row["name"])) {
-				$return[$row["name"]]["type"] = ($row["unique"] ? "UNIQUE" : "INDEX");
-				$return[$row["name"]]["lengths"] = array();
-				foreach (get_rows("PRAGMA index_info(" . idf_escape($row["name"]) . ")") as $row1) {
-					$return[$row["name"]]["columns"][] = $row1["name"];
+		if (!$return) {
+			foreach (fields($table) as $name => $field) {
+				if ($field["primary"]) {
+					$return[""] = array("type" => "PRIMARY", "columns" => array($name), "lengths" => array(), "descs" => array(null));
 				}
 			}
 		}
+		$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"];
+			$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;
 	}
 
@@ -346,11 +405,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		global $connection;
 		return h($connection->error);
 	}
-	
-	function exact_value($val) {
-		return q($val);
-	}
-	
+
 	function check_sqlite_name($name) {
 		// avoid creating PHP files on unsecured servers
 		global $connection;
@@ -361,7 +416,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		}
 		return true;
 	}
-	
+
 	function create_database($db, $collation) {
 		global $connection;
 		if (file_exists($db)) {
@@ -371,16 +426,21 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		if (!check_sqlite_name($db)) {
 			return false;
 		}
-		$link = new Min_SQLite($db); //! exception handler
+		try {
+			$link = new Min_SQLite($db);
+		} catch (Exception $ex) {
+			$connection->error = $ex->getMessage();
+			return false;
+		}
 		$link->query('PRAGMA encoding = "UTF-8"');
 		$link->query('CREATE TABLE adminer (i)'); // otherwise creates empty file
 		$link->query('DROP TABLE adminer');
 		return true;
 	}
-	
+
 	function drop_databases($databases) {
 		global $connection;
-		$connection->Min_SQLite(":memory:"); // to unlock file, doesn't work in PDO on Windows
+		$connection->__construct(":memory:"); // to unlock file, doesn't work in PDO on Windows
 		foreach ($databases as $db) {
 			if (!@unlink($db)) {
 				$connection->error = lang('File exists.');
@@ -389,21 +449,21 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		}
 		return true;
 	}
-	
+
 	function rename_database($name, $collation) {
 		global $connection;
 		if (!check_sqlite_name($name)) {
 			return false;
 		}
-		$connection->Min_SQLite(":memory:");
+		$connection->__construct(":memory:");
 		$connection->error = lang('File exists.');
 		return @rename(DB, $name);
 	}
-	
+
 	function auto_increment() {
 		return " PRIMARY KEY" . (DRIVER == "sqlite" ? " AUTOINCREMENT" : "");
 	}
-	
+
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		$use_all_fields = ($table == "" || $foreign);
 		foreach ($fields as $field) {
@@ -414,81 +474,15 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		}
 		$alter = array();
 		$originals = array();
-		$primary_key = false;
 		foreach ($fields as $field) {
 			if ($field[1]) {
-				if ($field[1][6]) {
-					$primary_key = true;
-				}
-				$alter[] = ($use_all_fields ? "  " : "ADD ") . implode($field[1]);
+				$alter[] = ($use_all_fields ? $field[1] : "ADD " . implode($field[1]));
 				if ($field[0] != "") {
 					$originals[$field[0]] = $field[1][0];
 				}
 			}
 		}
-		if ($use_all_fields) {
-			if ($table != "") {
-				queries("BEGIN");
-				foreach (foreign_keys($table) as $foreign_key) {
-					$columns = array();
-					foreach ($foreign_key["source"] as $column) {
-						if (!$originals[$column]) {
-							continue 2;
-						}
-						$columns[] = $originals[$column];
-					}
-					$foreign[] = "  FOREIGN KEY (" . implode(", ", $columns) . ") REFERENCES "
-						. table($foreign_key["table"])
-						. " (" . implode(", ", array_map('idf_escape', $foreign_key["target"]))
-						. ") ON DELETE $foreign_key[on_delete] ON UPDATE $foreign_key[on_update]"
-					;
-				}
-				$indexes = array();
-				foreach (indexes($table) as $key_name => $index) {
-					$columns = array();
-					foreach ($index["columns"] as $column) {
-						if (!$originals[$column]) {
-							continue 2;
-						}
-						$columns[] = $originals[$column];
-					}
-					$columns = "(" . implode(", ", $columns) . ")";
-					if ($index["type"] != "PRIMARY") {
-						$indexes[] = array($index["type"], $key_name, $columns);
-					} elseif (!$primary_key) {
-						$foreign[] = "  PRIMARY KEY $columns";
-					}
-				}
-			}
-			$alter = array_merge($alter, $foreign);
-			if (!queries("CREATE TABLE " . table($table != "" ? "adminer_$name" : $name) . " (\n" . implode(",\n", $alter) . "\n)")) {
-				// implicit ROLLBACK to not overwrite $connection->error
-				return false;
-			}
-			if ($table != "") {
-				if ($originals && !queries("INSERT INTO " . table("adminer_$name") . " (" . implode(", ", $originals) . ") SELECT " . implode(", ", array_map('idf_escape', array_keys($originals))) . " FROM " . table($table))) {
-					return false;
-				}
-				$triggers = array();
-				foreach (triggers($table) as $trigger_name => $timing_event) {
-					$trigger = trigger($trigger_name);
-					$triggers[] = "CREATE TRIGGER " . idf_escape($trigger_name) . " " . implode(" ", $timing_event) . " ON " . table($name) . "\n$trigger[Statement]";
-				}
-				if (!queries("DROP TABLE " . table($table))) { // drop before creating indexes and triggers to allow using old names
-					return false;
-				}
-				queries("ALTER TABLE " . table("adminer_$name") . " RENAME TO " . table($name));
-				if (!alter_indexes($name, $indexes)) {
-					return false;
-				}
-				foreach ($triggers as $trigger) {
-					if (!queries($trigger)) {
-						return false;
-					}
-				}
-				queries("COMMIT");
-			}
-		} else {
+		if (!$use_all_fields) {
 			foreach ($alter as $val) {
 				if (!queries("ALTER TABLE " . table($table) . " $val")) {
 					return false;
@@ -497,134 +491,251 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			if ($table != $name && !queries("ALTER TABLE " . table($table) . " RENAME TO " . table($name))) {
 				return false;
 			}
+		} elseif (!recreate_table($table, $name, $alter, $originals, $foreign)) {
+			return false;
 		}
 		if ($auto_increment) {
 			queries("UPDATE sqlite_sequence SET seq = $auto_increment WHERE name = " . q($name)); // ignores error
 		}
 		return true;
 	}
-	
+
+	function recreate_table($table, $name, $fields, $originals, $foreign, $indexes = array()) {
+		if ($table != "") {
+			if (!$fields) {
+				foreach (fields($table) as $key => $field) {
+					$fields[] = process_field($field, $field);
+					$originals[$key] = idf_escape($key);
+				}
+			}
+			$primary_key = false;
+			foreach ($fields as $field) {
+				if ($field[6]) {
+					$primary_key = true;
+				}
+			}
+			$drop_indexes = array();
+			foreach ($indexes as $key => $val) {
+				if ($val[2] == "DROP") {
+					$drop_indexes[$val[1]] = true;
+					unset($indexes[$key]);
+				}
+			}
+			foreach (indexes($table) as $key_name => $index) {
+				$columns = array();
+				foreach ($index["columns"] as $key => $column) {
+					if (!$originals[$column]) {
+						continue 2;
+					}
+					$columns[] = $originals[$column] . ($index["descs"][$key] ? " DESC" : "");
+				}
+				if (!$drop_indexes[$key_name]) {
+					if ($index["type"] != "PRIMARY" || !$primary_key) {
+						$indexes[] = array($index["type"], $key_name, $columns);
+					}
+				}
+			}
+			foreach ($indexes as $key => $val) {
+				if ($val[0] == "PRIMARY") {
+					unset($indexes[$key]);
+					$foreign[] = "  PRIMARY KEY (" . implode(", ", $val[2]) . ")";
+				}
+			}
+			foreach (foreign_keys($table) as $key_name => $foreign_key) {
+				foreach ($foreign_key["source"] as $key => $column) {
+					if (!$originals[$column]) {
+						continue 2;
+					}
+					$foreign_key["source"][$key] = idf_unescape($originals[$column]);
+				}
+				if (!isset($foreign[" $key_name"])) {
+					$foreign[] = " " . format_foreign_key($foreign_key);
+				}
+			}
+			queries("BEGIN");
+		}
+		foreach ($fields as $key => $field) {
+			$fields[$key] = "  " . implode($field);
+		}
+		$fields = array_merge($fields, array_filter($foreign));
+		if (!queries("CREATE TABLE " . table($table != "" ? "adminer_$name" : $name) . " (\n" . implode(",\n", $fields) . "\n)")) {
+			// implicit ROLLBACK to not overwrite $connection->error
+			return false;
+		}
+		if ($table != "") {
+			if ($originals && !queries("INSERT INTO " . table("adminer_$name") . " (" . implode(", ", $originals) . ") SELECT " . implode(", ", array_map('idf_escape', array_keys($originals))) . " FROM " . table($table))) {
+				return false;
+			}
+			$triggers = array();
+			foreach (triggers($table) as $trigger_name => $timing_event) {
+				$trigger = trigger($trigger_name);
+				$triggers[] = "CREATE TRIGGER " . idf_escape($trigger_name) . " " . implode(" ", $timing_event) . " ON " . table($name) . "\n$trigger[Statement]";
+			}
+			if (!queries("DROP TABLE " . table($table))) { // drop before creating indexes and triggers to allow using old names
+				return false;
+			}
+			queries("ALTER TABLE " . table("adminer_$name") . " RENAME TO " . table($name));
+			if (!alter_indexes($name, $indexes)) {
+				return false;
+			}
+			foreach ($triggers as $trigger) {
+				if (!queries($trigger)) {
+					return false;
+				}
+			}
+			queries("COMMIT");
+		}
+		return true;
+	}
+
+	function index_sql($table, $type, $name, $columns) {
+		return "CREATE $type " . ($type != "INDEX" ? "INDEX " : "")
+			. idf_escape($name != "" ? $name : uniqid($table . "_"))
+			. " ON " . table($table)
+			. " $columns"
+		;
+	}
+
 	function alter_indexes($table, $alter) {
-		foreach ($alter as $val) {
+		foreach ($alter as $primary) {
+			if ($primary[0] == "PRIMARY") {
+				return recreate_table($table, $table, array(), array(), array(), $alter);
+			}
+		}
+		foreach (array_reverse($alter) as $val) {
 			if (!queries($val[2] == "DROP"
 				? "DROP INDEX " . idf_escape($val[1])
-				: "CREATE $val[0] " . ($val[0] != "INDEX" ? "INDEX " : "") . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . " $val[2]"
+				: index_sql($table, $val[0], $val[1], "(" . implode(", ", $val[2]) . ")")
 			)) {
 				return false;
 			}
 		}
 		return true;
 	}
-	
+
 	function truncate_tables($tables) {
 		return apply_queries("DELETE FROM", $tables);
 	}
-	
+
 	function drop_views($views) {
 		return apply_queries("DROP VIEW", $views);
 	}
-	
+
 	function drop_tables($tables) {
 		return apply_queries("DROP TABLE", $tables);
 	}
-	
+
 	function move_tables($tables, $views, $target) {
 		return false;
 	}
-	
+
 	function trigger($name) {
 		global $connection;
 		if ($name == "") {
 			return array("Statement" => "BEGIN\n\t;\nEND");
 		}
-		preg_match('~^CREATE\\s+TRIGGER\\s*(?:[^`"\\s]+|`[^`]*`|"[^"]*")+\\s*([a-z]+)\\s+([a-z]+)\\s+ON\\s*(?:[^`"\\s]+|`[^`]*`|"[^"]*")+\\s*(?:FOR\\s*EACH\\s*ROW\\s)?(.*)~is', $connection->result("SELECT sql FROM sqlite_master WHERE name = " . q($name)), $match);
-		return array("Timing" => strtoupper($match[1]), "Event" => strtoupper($match[2]), "Trigger" => $name, "Statement" => $match[3]);
+		$idf = '(?:[^`"\\s]+|`[^`]*`|"[^"]*")+';
+		$trigger_options = trigger_options();
+		preg_match(
+			"~^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
+		);
+		$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;
 	}
-	
+
 	function trigger_options() {
 		return array(
 			"Timing" => array("BEFORE", "AFTER", "INSTEAD OF"),
+			"Event" => array("INSERT", "UPDATE", "UPDATE OF", "DELETE"),
 			"Type" => array("FOR EACH ROW"),
 		);
 	}
-	
+
 	function routine($name, $type) {
 		// not supported by SQLite
 	}
-	
+
 	function routines() {
 		// not supported by SQLite
 	}
-	
+
 	function routine_languages() {
 		// not supported by SQLite
 	}
-	
+
 	function begin() {
 		return queries("BEGIN");
 	}
-	
-	function insert_into($table, $set) {
-		return queries("INSERT INTO " . table($table) . ($set ? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")" : "DEFAULT VALUES"));
-	}
-	
-	function insert_update($table, $set, $primary) {
-		return queries("REPLACE INTO " . table($table) . " (" . implode(", ", array_keys($set)) . ") VALUES (" . implode(", ", $set) . ")");
-	}
-	
+
 	function last_id() {
 		global $connection;
 		return $connection->result("SELECT LAST_INSERT_ROWID()");
 	}
-	
+
 	function explain($connection, $query) {
-		return $connection->query("EXPLAIN $query");
+		return $connection->query("EXPLAIN QUERY PLAN $query");
 	}
-	
+
 	function found_rows($table_status, $where) {
 	}
-	
+
 	function types() {
 		return array();
 	}
-	
+
 	function schemas() {
 		return array();
 	}
-	
+
 	function get_schema() {
 		return "";
 	}
-	
+
 	function set_schema($scheme) {
 		return true;
 	}
-	
+
 	function create_sql($table, $auto_increment) {
 		global $connection;
-		return $connection->result("SELECT sql FROM sqlite_master WHERE type = 'table' AND name = " . q($table));
+		$return = $connection->result("SELECT sql FROM sqlite_master WHERE type IN ('table', 'view') AND name = " . q($table));
+		foreach (indexes($table) as $name => $index) {
+			if ($name == '') {
+				continue;
+			}
+			$return .= ";\n\n" . index_sql($table, $index['type'], $name, "(" . implode(", ", array_map('idf_escape', $index['columns'])) . ")");
+		}
+		return $return;
 	}
-	
+
 	function truncate_sql($table) {
 		return "DELETE FROM " . table($table);
 	}
-	
+
 	function use_sql($database) {
 	}
-	
+
 	function trigger_sql($table, $style) {
 		return implode(get_vals("SELECT sql || ';;\n' FROM sqlite_master WHERE type = 'trigger' AND tbl_name = " . q($table)));
 	}
-	
+
 	function show_variables() {
 		global $connection;
 		$return = array();
@@ -633,7 +744,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		}
 		return $return;
 	}
-	
+
 	function show_status() {
 		$return = array();
 		foreach (get_vals("PRAGMA compile_options") as $option) {
@@ -642,23 +753,23 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		}
 		return $return;
 	}
-	
+
 	function convert_field($field) {
 	}
-	
+
 	function unconvert_field($field, $return) {
 		return $return;
 	}
-	
+
 	function support($feature) {
-		return ereg('^(view|trigger|variables|status|dump|move_col|drop_col)$', $feature);
+		return preg_match('~^(columns|database|drop_col|dump|indexes|move_col|sql|status|table|trigger|variables|view|view_trigger)$~', $feature);
 	}
-	
+
 	$jush = "sqlite";
 	$types = array("integer" => 0, "real" => 0, "numeric" => 0, "text" => 0, "blob" => 0);
 	$structured_types = array_keys($types);
 	$unsigned = array();
-	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", ""); // REGEXP can be user defined function
+	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL", "SQL"); // REGEXP can be user defined function
 	$functions = array("hex", "length", "lower", "round", "unixepoch", "upper");
 	$grouping = array("avg", "count", "count distinct", "group_concat", "max", "min", "sum");
 	$edit_functions = array(

adminer/dump.inc.php

@@ -1,25 +1,31 @@
 <?php
 $TABLE = $_GET["dump"];
 
-if ($_POST) {
+if ($_POST && !$error) {
 	$cookie = "";
 	foreach (array("output", "format", "db_style", "routines", "events", "table_style", "auto_increment", "triggers", "data_style") as $key) {
 		$cookie .= "&$key=" . urlencode($_POST[$key]);
 	}
 	cookie("adminer_export", substr($cookie, 1));
-	$ext = dump_headers(($TABLE != "" ? $TABLE : DB), (DB == "" || count((array) $_POST["tables"] + (array) $_POST["data"]) > 1));
-	$is_sql = ($_POST["format"] == "sql");
-	if ($is_sql) {
-		echo "-- Adminer $VERSION " . $drivers[DRIVER] . " dump
+	$tables = array_flip((array) $_POST["tables"]) + array_flip((array) $_POST["data"]);
+	$ext = dump_headers(
+		(count($tables) == 1 ? key($tables) : DB),
+		(DB == "" || count($tables) > 1));
+	$is_sql = preg_match('~sql~', $_POST["format"]);
 
-" . ($jush != "sql" ? "" : "SET NAMES utf8;
+	if ($is_sql) {
+		echo "-- Adminer $VERSION " . $drivers[DRIVER] . " dump\n\n";
+		if ($jush == "sql") {
+			echo "SET NAMES utf8;
+SET time_zone = '+00:00';
 " . ($_POST["data_style"] ? "SET foreign_key_checks = 0;
-SET time_zone = " . q($connection->result("SELECT @@time_zone")) . ";
 SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 " : "") . "
-");
+";
+			$connection->query("SET time_zone = '+00:00';");
+		}
 	}
-	
+
 	$style = $_POST["db_style"];
 	$databases = array(DB);
 	if (DB == "") {
@@ -28,124 +34,95 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 			$databases = explode("\n", rtrim(str_replace("\r", "", $databases), "\n"));
 		}
 	}
+
 	foreach ((array) $databases as $db) {
+		$adminer->dumpDatabase($db);
 		if ($connection->select_db($db)) {
-			if ($is_sql && ereg('CREATE', $style) && ($create = $connection->result("SHOW CREATE DATABASE " . idf_escape($db), 1))) {
+			if ($is_sql && preg_match('~CREATE~', $style) && ($create = $connection->result("SHOW CREATE DATABASE " . idf_escape($db), 1))) {
+				set_utf8mb4($create);
 				if ($style == "DROP+CREATE") {
 					echo "DROP DATABASE IF EXISTS " . idf_escape($db) . ";\n";
 				}
-				echo ($style == "CREATE+ALTER" ? preg_replace('~^CREATE DATABASE ~', '\\0IF NOT EXISTS ', $create) : $create) . ";\n";
+				echo "$create;\n";
 			}
 			if ($is_sql) {
 				if ($style) {
 					echo use_sql($db) . ";\n\n";
 				}
-				if (in_array("CREATE+ALTER", array($style, $_POST["table_style"]))) {
-					echo "SET @adminer_alter = '';\n\n";
-				}
 				$out = "";
+
 				if ($_POST["routines"]) {
 					foreach (array("FUNCTION", "PROCEDURE") as $routine) {
 						foreach (get_rows("SHOW $routine STATUS WHERE Db = " . q($db), null, "-- ") as $row) {
-							$out .= ($style != 'DROP+CREATE' ? "DROP $routine IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "")
-							. remove_definer($connection->result("SHOW CREATE $routine " . idf_escape($row["Name"]), 2)) . ";;\n\n";
+							$create = remove_definer($connection->result("SHOW CREATE $routine " . idf_escape($row["Name"]), 2));
+							set_utf8mb4($create);
+							$out .= ($style != 'DROP+CREATE' ? "DROP $routine IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "") . "$create;;\n\n";
 						}
 					}
 				}
+
 				if ($_POST["events"]) {
 					foreach (get_rows("SHOW EVENTS", null, "-- ") as $row) {
-						$out .= ($style != 'DROP+CREATE' ? "DROP EVENT IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "")
-						. remove_definer($connection->result("SHOW CREATE EVENT " . idf_escape($row["Name"]), 3)) . ";;\n\n";
+						$create = remove_definer($connection->result("SHOW CREATE EVENT " . idf_escape($row["Name"]), 3));
+						set_utf8mb4($create);
+						$out .= ($style != 'DROP+CREATE' ? "DROP EVENT IF EXISTS " . idf_escape($row["Name"]) . ";;\n" : "") . "$create;;\n\n";
 					}
 				}
+
 				if ($out) {
 					echo "DELIMITER ;;\n\n$out" . "DELIMITER ;\n\n";
 				}
 			}
-			
+
 			if ($_POST["table_style"] || $_POST["data_style"]) {
 				$views = array();
-				foreach (table_status() as $table_status) {
-					$table = (DB == "" || in_array($table_status["Name"], (array) $_POST["tables"]));
-					$data = (DB == "" || in_array($table_status["Name"], (array) $_POST["data"]));
+				foreach (table_status('', true) as $name => $table_status) {
+					$table = (DB == "" || in_array($name, (array) $_POST["tables"]));
+					$data = (DB == "" || in_array($name, (array) $_POST["data"]));
 					if ($table || $data) {
-						if (!is_view($table_status)) {
-							if ($ext == "tar") {
-								ob_start();
-							}
-							$adminer->dumpTable($table_status["Name"], ($table ? $_POST["table_style"] : ""));
-							if ($data) {
-								$adminer->dumpData($table_status["Name"], $_POST["data_style"], "SELECT * FROM " . table($table_status["Name"]));
-							}
-							if ($is_sql && $_POST["triggers"] && $table && ($triggers = trigger_sql($table_status["Name"], $_POST["table_style"]))) {
-								echo "\nDELIMITER ;;\n$triggers\nDELIMITER ;\n";
-							}
-							if ($ext == "tar") {
-								echo tar_file((DB != "" ? "" : "$db/") . "$table_status[Name].csv", ob_get_clean());
-							} elseif ($is_sql) {
-								echo "\n";
-							}
+						if ($ext == "tar") {
+							$tmp_file = new TmpFile;
+							ob_start(array($tmp_file, 'write'), 1e5);
+						}
+
+						$adminer->dumpTable($name, ($table ? $_POST["table_style"] : ""), (is_view($table_status) ? 2 : 0));
+						if (is_view($table_status)) {
+							$views[] = $name;
+						} elseif ($data) {
+							$fields = fields($name);
+							$adminer->dumpData($name, $_POST["data_style"], "SELECT *" . convert_fields($fields, $fields) . " FROM " . table($name));
+						}
+						if ($is_sql && $_POST["triggers"] && $table && ($triggers = trigger_sql($name, $_POST["table_style"]))) {
+							echo "\nDELIMITER ;;\n$triggers\nDELIMITER ;\n";
+						}
+
+						if ($ext == "tar") {
+							ob_end_flush();
+							tar_file((DB != "" ? "" : "$db/") . "$name.csv", $tmp_file);
 						} elseif ($is_sql) {
-							$views[] = $table_status["Name"];
+							echo "\n";
 						}
 					}
 				}
+
 				foreach ($views as $view) {
-					$adminer->dumpTable($view, $_POST["table_style"], true);
+					$adminer->dumpTable($view, $_POST["table_style"], 1);
 				}
+
 				if ($ext == "tar") {
 					echo pack("x512");
 				}
 			}
-			
-			if ($style == "CREATE+ALTER" && $is_sql) {
-				// drop old tables
-				$query = "SELECT TABLE_NAME, ENGINE, TABLE_COLLATION, TABLE_COMMENT FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE()";
-				echo "DELIMITER ;;
-CREATE PROCEDURE adminer_alter (INOUT alter_command text) BEGIN
-	DECLARE _table_name, _engine, _table_collation varchar(64);
-	DECLARE _table_comment varchar(64);
-	DECLARE done bool DEFAULT 0;
-	DECLARE tables CURSOR FOR $query;
-	DECLARE CONTINUE HANDLER FOR NOT FOUND SET done = 1;
-	OPEN tables;
-	REPEAT
-		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 "
-				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 "
-				ELSE
-					SET alter_command = CONCAT(alter_command, 'DROP TABLE `', REPLACE(_table_name, '`', '``'), '`;\\n');
-			END CASE;
-		END IF;
-	UNTIL done END REPEAT;
-	CLOSE tables;
-END;;
-DELIMITER ;
-CALL adminer_alter(@adminer_alter);
-DROP PROCEDURE adminer_alter;
-";
-			}
-			if (in_array("CREATE+ALTER", array($style, $_POST["table_style"])) && $is_sql) {
-				echo "SELECT @adminer_alter;\n";
-			}
 		}
 	}
+
 	if ($is_sql) {
 		echo "-- " . $connection->result("SELECT NOW()") . "\n";
 	}
 	exit;
 }
 
-page_header(lang('Export'), "", ($_GET["export"] != "" ? array("table" => $_GET["export"]) : array()), DB);
+page_header(lang('Export'), $error, ($_GET["export"] != "" ? array("table" => $_GET["export"]) : array()), h(DB));
 ?>
 
 <form action="" method="post">
@@ -154,9 +131,7 @@ page_header(lang('Export'), "", ($_GET["export"] != "" ? array("table" => $_GET[
 $db_style = array('', 'USE', 'DROP+CREATE', 'CREATE');
 $table_style = array('', 'DROP+CREATE', 'CREATE');
 $data_style = array('', 'TRUNCATE+INSERT', 'INSERT');
-if ($jush == "sql") {
-	$db_style[] = 'CREATE+ALTER';
-	$table_style[] = 'CREATE+ALTER';
+if ($jush == "sql") { //! use insertUpdate() in all drivers
 	$data_style[] = 'INSERT+UPDATE';
 }
 parse_str($_COOKIE["adminer_export"], $row);
@@ -167,20 +142,26 @@ if (!isset($row["events"])) { // backwards compatibility
 	$row["routines"] = $row["events"] = ($_GET["dump"] == "");
 	$row["triggers"] = $row["table_style"];
 }
+
 echo "<tr><th>" . lang('Output') . "<td>" . html_select("output", $adminer->dumpOutput(), $row["output"], 0) . "\n"; // 0 - radio
+
 echo "<tr><th>" . lang('Format') . "<td>" . html_select("format", $adminer->dumpFormat(), $row["format"], 0) . "\n"; // 0 - radio
+
 echo ($jush == "sqlite" ? "" : "<tr><th>" . lang('Database') . "<td>" . html_select('db_style', $db_style, $row["db_style"])
 	. (support("routine") ? checkbox("routines", 1, $row["routines"], lang('Routines')) : "")
 	. (support("event") ? checkbox("events", 1, $row["events"], lang('Events')) : "")
 );
+
 echo "<tr><th>" . lang('Tables') . "<td>" . html_select('table_style', $table_style, $row["table_style"])
 	. checkbox("auto_increment", 1, $row["auto_increment"], lang('Auto Increment'))
 	. (support("trigger") ? checkbox("triggers", 1, $row["triggers"], lang('Triggers')) : "")
 ;
+
 echo "<tr><th>" . lang('Data') . "<td>" . html_select('data_style', $data_style, $row["data_style"]);
 ?>
 </table>
 <p><input type="submit" value="<?php echo lang('Export'); ?>">
+<input type="hidden" name="token" value="<?php echo $token; ?>">
 
 <table cellspacing="0">
 <?php
@@ -188,32 +169,37 @@ $prefixes = array();
 if (DB != "") {
 	$checked = ($TABLE != "" ? "" : " checked");
 	echo "<thead><tr>";
-	echo "<th style='text-align: left;'><label><input type='checkbox' id='check-tables'$checked onclick='formCheck(this, /^tables\\[/);'>" . lang('Tables') . "</label>";
-	echo "<th style='text-align: right;'><label>" . lang('Data') . "<input type='checkbox' id='check-data'$checked onclick='formCheck(this, /^data\\[/);'></label>";
+	echo "<th style='text-align: left;'><label class='block'><input type='checkbox' id='check-tables'$checked onclick='formCheck(this, /^tables\\[/);'>" . lang('Tables') . "</label>";
+	echo "<th style='text-align: right;'><label class='block'>" . lang('Data') . "<input type='checkbox' id='check-data'$checked onclick='formCheck(this, /^data\\[/);'></label>";
 	echo "</thead>\n";
+
 	$views = "";
-	//! defer number of rows to JavaScript
-	foreach (table_status() as $table_status) {
-		$name = $table_status["Name"];
-		$prefix = ereg_replace("_.*", "", $name);
+	$tables_list = tables_list();
+	foreach ($tables_list as $name => $type) {
+		$prefix = preg_replace('~_.*~', '', $name);
 		$checked = ($TABLE == "" || $TABLE == (substr($TABLE, -1) == "%" ? "$prefix%" : $name)); //! % may be part of table name
-		$print = "<tr><td>" . checkbox("tables[]", $name, $checked, $name, "checkboxClick(event, this); formUncheck('check-tables');");
-		if (is_view($table_status)) {
+		$print = "<tr><td>" . checkbox("tables[]", $name, $checked, $name, "checkboxClick(event, this); formUncheck('check-tables');", "block");
+		if ($type !== null && !preg_match('~table~i', $type)) {
 			$views .= "$print\n";
 		} else {
-			echo "$print<td align='right'><label>" . ($table_status["Engine"] == "InnoDB" && $table_status["Rows"] ? "~ " : "") . $table_status["Rows"] . checkbox("data[]", $name, $checked, "", "checkboxClick(event, this); formUncheck('check-data');") . "</label>\n";
+			echo "$print<td align='right'><label class='block'><span id='Rows-" . h($name) . "'></span>" . checkbox("data[]", $name, $checked, "", "checkboxClick(event, this); formUncheck('check-data');") . "</label>\n";
 		}
 		$prefixes[$prefix]++;
 	}
 	echo $views;
+
+	if ($tables_list) {
+		echo "<script type='text/javascript'>ajaxSetHtml('" . js_escape(ME) . "script=db');</script>\n";
+	}
+
 } else {
-	echo "<thead><tr><th style='text-align: left;'><label><input type='checkbox' id='check-databases'" . ($TABLE == "" ? " checked" : "") . " onclick='formCheck(this, /^databases\\[/);'>" . lang('Database') . "</label></thead>\n";
+	echo "<thead><tr><th style='text-align: left;'><label class='block'><input type='checkbox' id='check-databases'" . ($TABLE == "" ? " checked" : "") . " onclick='formCheck(this, /^databases\\[/);'>" . lang('Database') . "</label></thead>\n";
 	$databases = $adminer->databases();
 	if ($databases) {
 		foreach ($databases as $db) {
 			if (!information_schema($db)) {
-				$prefix = ereg_replace("_.*", "", $db);
-				echo "<tr><td>" . checkbox("databases[]", $db, $TABLE == "" || $TABLE == "$prefix%", $db, "formUncheck('check-databases');") . "</label>\n";
+				$prefix = preg_replace('~_.*~', '', $db);
+				echo "<tr><td>" . checkbox("databases[]", $db, $TABLE == "" || $TABLE == "$prefix%", $db, "formUncheck('check-databases');", "block") . "\n";
 				$prefixes[$prefix]++;
 			}
 		}

adminer/edit.inc.php

@@ -1,51 +1,64 @@
 <?php
 $TABLE = $_GET["edit"];
-$where = (isset($_GET["select"]) ? (count($_POST["check"]) == 1 ? where_check($_POST["check"][0]) : "") : where($_GET));
-$update = (isset($_GET["select"]) ? $_POST["edit"] : $where);
 $fields = fields($TABLE);
+$where = (isset($_GET["select"]) ? (count($_POST["check"]) == 1 ? where_check($_POST["check"][0], $fields) : "") : where($_GET, $fields));
+$update = (isset($_GET["select"]) ? $_POST["edit"] : $where);
 foreach ($fields as $name => $field) {
 	if (!isset($field["privileges"][$update ? "update" : "insert"]) || $adminer->fieldName($field) == "") {
 		unset($fields[$name]);
 	}
 }
+
 if ($_POST && !$error && !isset($_GET["select"])) {
 	$location = $_POST["referer"];
 	if ($_POST["insert"]) { // continue edit or insert
 		$location = ($update ? null : $_SERVER["REQUEST_URI"]);
-	} elseif (!ereg('^.+&select=.+$', $location)) {
+	} elseif (!preg_match('~^.+&select=.+$~', $location)) {
 		$location = ME . "select=" . urlencode($TABLE);
 	}
+
+	$indexes = indexes($TABLE);
+	$unique_array = unique_array($_GET["where"], $indexes);
+	$query_where = "\nWHERE $where";
+
 	if (isset($_POST["delete"])) {
-		query_redirect("DELETE" . limit1("FROM " . table($TABLE), " WHERE $where"), $location, lang('Item has been deleted.'));
+		queries_redirect(
+			$location,
+			lang('Item has been deleted.'),
+			$driver->delete($TABLE, $query_where, !$unique_array)
+		);
+
 	} else {
 		$set = array();
 		foreach ($fields as $name => $field) {
 			$val = process_input($field);
 			if ($val !== false && $val !== null) {
-				$set[idf_escape($name)] = ($update ? "\n" . idf_escape($name) . " = $val" : $val);
+				$set[idf_escape($name)] = $val;
 			}
 		}
+
 		if ($update) {
 			if (!$set) {
 				redirect($location);
 			}
-			query_redirect("UPDATE" . limit1(table($TABLE) . " SET" . implode(",", $set), "\nWHERE $where"), $location, lang('Item has been updated.'));
+			queries_redirect(
+				$location,
+				lang('Item has been updated.'),
+				$driver->update($TABLE, $set, $query_where, !$unique_array)
+			);
+			if (is_ajax()) {
+				page_headers();
+				page_messages($error);
+				exit;
+			}
 		} else {
-			$result = insert_into($TABLE, $set);
+			$result = $driver->insert($TABLE, $set);
 			$last_id = ($result ? last_id() : 0);
 			queries_redirect($location, lang('Item%s has been inserted.', ($last_id ? " $last_id" : "")), $result); //! link
 		}
 	}
 }
 
-$table_name = $adminer->tableName(table_status($TABLE));
-page_header(
-	($update ? lang('Edit') : lang('Insert')),
-	$error,
-	array("select" => array($TABLE, $table_name)),
-	$table_name //! two calls of h()
-);
-
 $row = null;
 if ($_POST["save"]) {
 	$row = (array) $_POST["fields"];
@@ -57,65 +70,44 @@ if ($_POST["save"]) {
 			if ($_POST["clone"] && $field["auto_increment"]) {
 				$as = "''";
 			}
-			if ($jush == "sql" && ereg("enum|set", $field["type"])) {
+			if ($jush == "sql" && preg_match("~enum|set~", $field["type"])) {
 				$as = "1*" . idf_escape($name);
 			}
 			$select[] = ($as ? "$as AS " : "") . idf_escape($name);
 		}
 	}
 	$row = array();
+	if (!support("table")) {
+		$select = array("*");
+	}
 	if ($select) {
-		$rows = get_rows("SELECT" . limit(implode(", ", $select) . " FROM " . table($TABLE), " WHERE $where", (isset($_GET["select"]) ? 2 : 1)));
-		$row = (isset($_GET["select"]) && count($rows) != 1 ? null : reset($rows));
+		$result = $driver->select($TABLE, $select, array($where), $select, array(), (isset($_GET["select"]) ? 2 : 1));
+		$row = $result->fetch_assoc();
+		if (!$row) { // MySQLi returns null
+			$row = false;
+		}
+		if (isset($_GET["select"]) && (!$row || $result->fetch_assoc())) { // $result->num_rows != 1 isn't available in all drivers
+			$row = null;
+		}
 	}
 }
 
-if ($row === false) {
-	echo "<p class='error'>" . lang('No rows.') . "\n";
+if (!support("table") && !$fields) {
+	if (!$where) { // insert
+		$result = $driver->select($TABLE, array("*"), $where, array("*"));
+		$row = ($result ? $result->fetch_assoc() : false);
+		if (!$row) {
+			$row = array($driver->primary => "");
+		}
+	}
+	if ($row) {
+		foreach ($row as $key => $val) {
+			if (!$where) {
+				$row[$key] = null;
+			}
+			$fields[$key] = array("field" => $key, "null" => ($key != $driver->primary), "auto_increment" => ($key == $driver->primary));
+		}
+	}
 }
-?>
 
-<form action="" method="post" enctype="multipart/form-data" id="form">
-<?php
-if ($fields) {
-	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)];
-		$value = ($row !== null
-			? ($row[$name] != "" && $jush == "sql" && ereg("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 !== null ? $default : $field["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 ($field["type"] == "timestamp" && $value == "CURRENT_TIMESTAMP") {
-			$value = "";
-			$function = "now";
-		}
-		input($field, $value, $function);
-		echo "\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') : lang('Save and insert next')) . "' title='Ctrl+Shift+Enter'>\n";
-	}
-}
-echo ($update ? "<input type='submit' name='delete' value='" . lang('Delete') . "' onclick=\"return confirm('" . lang('Are you sure?') . "');\">\n"
-	: ($_POST || !$fields ? "" : "<script type='text/javascript'>document.getElementById('form').getElementsByTagName('td')[1].firstChild.focus();</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/event.inc.php

@@ -2,31 +2,32 @@
 $EVENT = $_GET["event"];
 $intervals = array("YEAR", "QUARTER", "MONTH", "DAY", "HOUR", "MINUTE", "WEEK", "SECOND", "YEAR_MONTH", "DAY_HOUR", "DAY_MINUTE", "DAY_SECOND", "HOUR_MINUTE", "HOUR_SECOND", "MINUTE_SECOND");
 $statuses = array("ENABLED" => "ENABLE", "DISABLED" => "DISABLE", "SLAVESIDE_DISABLED" => "DISABLE ON SLAVE");
+$row = $_POST;
 
 if ($_POST && !$error) {
 	if ($_POST["drop"]) {
 		query_redirect("DROP EVENT " . idf_escape($EVENT), substr(ME, 0, -1), lang('Event has been dropped.'));
-	} elseif (in_array($_POST["INTERVAL_FIELD"], $intervals) && isset($statuses[$_POST["STATUS"]])) {
-		$schedule = "\nON SCHEDULE " . ($_POST["INTERVAL_VALUE"]
-			? "EVERY " . q($_POST["INTERVAL_VALUE"]) . " $_POST[INTERVAL_FIELD]"
-			. ($_POST["STARTS"] ? " STARTS " . q($_POST["STARTS"]) : "")
-			. ($_POST["ENDS"] ? " ENDS " . q($_POST["ENDS"]) : "") //! ALTER EVENT doesn't drop ENDS - MySQL bug #39173
-			: "AT " . q($_POST["STARTS"])
-			) . " ON COMPLETION" . ($_POST["ON_COMPLETION"] ? "" : " NOT") . " PRESERVE"
+	} elseif (in_array($row["INTERVAL_FIELD"], $intervals) && isset($statuses[$row["STATUS"]])) {
+		$schedule = "\nON SCHEDULE " . ($row["INTERVAL_VALUE"]
+			? "EVERY " . q($row["INTERVAL_VALUE"]) . " $row[INTERVAL_FIELD]"
+			. ($row["STARTS"] ? " STARTS " . q($row["STARTS"]) : "")
+			. ($row["ENDS"] ? " ENDS " . q($row["ENDS"]) : "") //! ALTER EVENT doesn't drop ENDS - MySQL bug #39173
+			: "AT " . q($row["STARTS"])
+			) . " ON COMPLETION" . ($row["ON_COMPLETION"] ? "" : " NOT") . " PRESERVE"
 		;
+		
 		queries_redirect(substr(ME, 0, -1), ($EVENT != "" ? lang('Event has been altered.') : lang('Event has been created.')), queries(($EVENT != ""
 			? "ALTER EVENT " . idf_escape($EVENT) . $schedule
-			. ($EVENT != $_POST["EVENT_NAME"] ? "\nRENAME TO " . idf_escape($_POST["EVENT_NAME"]) : "")
-			: "CREATE EVENT " . idf_escape($_POST["EVENT_NAME"]) . $schedule
-			) . "\n" . $statuses[$_POST["STATUS"]] . " COMMENT " . q($_POST["EVENT_COMMENT"])
-			. rtrim(" DO\n$_POST[EVENT_DEFINITION]", ";") . ";"
+			. ($EVENT != $row["EVENT_NAME"] ? "\nRENAME TO " . idf_escape($row["EVENT_NAME"]) : "")
+			: "CREATE EVENT " . idf_escape($row["EVENT_NAME"]) . $schedule
+			) . "\n" . $statuses[$row["STATUS"]] . " COMMENT " . q($row["EVENT_COMMENT"])
+			. rtrim(" DO\n$row[EVENT_DEFINITION]", ";") . ";"
 		));
 	}
 }
 
 page_header(($EVENT != "" ? lang('Alter event') . ": " . h($EVENT) : lang('Create event')), $error);
 
-$row = $_POST;
 if (!$row && $EVENT != "") {
 	$rows = get_rows("SELECT * FROM information_schema.EVENTS WHERE EVENT_SCHEMA = " . q(DB) . " AND EVENT_NAME = " . q($EVENT));
 	$row = reset($rows);
@@ -35,10 +36,10 @@ if (!$row && $EVENT != "") {
 
 <form action="" method="post">
 <table cellspacing="0">
-<tr><th><?php echo lang('Name'); ?><td><input name="EVENT_NAME" value="<?php echo h($row["EVENT_NAME"]); ?>" maxlength="64">
-<tr><th><?php echo lang('Start'); ?><td><input name="STARTS" value="<?php echo h("$row[EXECUTE_AT]$row[STARTS]"); ?>">
-<tr><th><?php echo lang('End'); ?><td><input name="ENDS" value="<?php echo h($row["ENDS"]); ?>">
-<tr><th><?php echo lang('Every'); ?><td><input name="INTERVAL_VALUE" value="<?php echo h($row["INTERVAL_VALUE"]); ?>" size="6"> <?php echo html_select("INTERVAL_FIELD", $intervals, $row["INTERVAL_FIELD"]); ?>
+<tr><th><?php echo lang('Name'); ?><td><input name="EVENT_NAME" value="<?php echo h($row["EVENT_NAME"]); ?>" maxlength="64" autocapitalize="off">
+<tr><th title="datetime"><?php echo lang('Start'); ?><td><input name="STARTS" value="<?php echo h("$row[EXECUTE_AT]$row[STARTS]"); ?>">
+<tr><th title="datetime"><?php echo lang('End'); ?><td><input name="ENDS" value="<?php echo h($row["ENDS"]); ?>">
+<tr><th><?php echo lang('Every'); ?><td><input type="number" name="INTERVAL_VALUE" value="<?php echo h($row["INTERVAL_VALUE"]); ?>" class="size"> <?php echo html_select("INTERVAL_FIELD", $intervals, $row["INTERVAL_FIELD"]); ?>
 <tr><th><?php echo lang('Status'); ?><td><?php echo html_select("STATUS", $statuses, $row["STATUS"]); ?>
 <tr><th><?php echo lang('Comment'); ?><td><input name="EVENT_COMMENT" value="<?php echo h($row["EVENT_COMMENT"]); ?>" maxlength="64">
 <tr><th>&nbsp;<td><?php echo checkbox("ON_COMPLETION", "PRESERVE", $row["ON_COMPLETION"] == "PRESERVE", lang('On completion preserve')); ?>

adminer/file.inc.php

@@ -6,16 +6,20 @@ if ($_SERVER["HTTP_IF_MODIFIED_SINCE"]) {
 
 header("Expires: " . gmdate("D, d M Y H:i:s", time() + 365*24*60*60) . " GMT");
 header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Cache-Control: immutable");
 
 if ($_GET["file"] == "favicon.ico") {
 	header("Content-Type: image/x-icon");
-	echo compile_file('../adminer/static/favicon.ico');
+	echo lzw_decompress(compile_file('../adminer/static/favicon.ico', 'lzw_compress'));
 } elseif ($_GET["file"] == "default.css") {
 	header("Content-Type: text/css; charset=utf-8");
-	echo lzw_decompress(compile_file('../adminer/static/default.css', 'minify_css'));
+	echo lzw_decompress(compile_file('../adminer/static/default.css;../externals/jush/jush.css', 'minify_css'));
 } elseif ($_GET["file"] == "functions.js") {
 	header("Content-Type: text/javascript; charset=utf-8");
 	echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js', 'minify_js'));
+} elseif ($_GET["file"] == "jush.js") {
+	header("Content-Type: text/javascript; charset=utf-8");
+	echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.js;../externals/jush/modules/jush-js.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
 } else {
 	header("Content-Type: image/gif");
 	switch ($_GET["file"]) {

adminer/foreign.inc.php

@@ -1,50 +1,57 @@
 <?php
 $TABLE = $_GET["foreign"];
+$name = $_GET["name"];
+$row = $_POST;
+
 if ($_POST && !$error && !$_POST["add"] && !$_POST["change"] && !$_POST["change-js"]) {
-	if ($_POST["drop"]) {
-		query_redirect("ALTER TABLE " . table($TABLE) . "\nDROP " . ($jush == "sql" ? "FOREIGN KEY " : "CONSTRAINT ") . idf_escape($_GET["name"]), ME . "table=" . urlencode($TABLE), lang('Foreign key has been dropped.'));
-	} else {
-		$source = array_filter($_POST["source"], 'strlen');
-		ksort($source); // enforce input order
+	$message = ($_POST["drop"] ? lang('Foreign key has been dropped.') : ($name != "" ? lang('Foreign key has been altered.') : lang('Foreign key has been created.')));
+	$location = ME . "table=" . urlencode($TABLE);
+	
+	if (!$_POST["drop"]) {
+		$row["source"] = array_filter($row["source"], 'strlen');
+		ksort($row["source"]); // enforce input order
 		$target = array();
-		foreach ($source as $key => $val) {
-			$target[$key] = $_POST["target"][$key];
+		foreach ($row["source"] as $key => $val) {
+			$target[$key] = $row["target"][$key];
+		}
+		$row["target"] = $target;
+	}
+	
+	if ($jush == "sqlite") {
+		queries_redirect($location, $message, recreate_table($TABLE, $TABLE, array(), array(), array(" $name" => ($_POST["drop"] ? "" : " " . format_foreign_key($row)))));
+	} else {
+		$alter = "ALTER TABLE " . table($TABLE);
+		$drop = "\nDROP " . ($jush == "sql" ? "FOREIGN KEY " : "CONSTRAINT ") . idf_escape($name);
+		if ($_POST["drop"]) {
+			query_redirect($alter . $drop, $location, $message);
+		} else {
+			query_redirect($alter . ($name != "" ? "$drop," : "") . "\nADD" . format_foreign_key($row), $location, $message);
+			$error = lang('Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.') . "<br>$error"; //! no partitioning
 		}
-		query_redirect("ALTER TABLE " . table($TABLE)
-			. ($_GET["name"] != "" ? "\nDROP " . ($jush == "sql" ? "FOREIGN KEY " : "CONSTRAINT ") . idf_escape($_GET["name"]) . "," : "")
-			. "\nADD FOREIGN KEY (" . implode(", ", array_map('idf_escape', $source)) . ") REFERENCES " . table($_POST["table"]) . " (" . implode(", ", array_map('idf_escape', $target)) . ")" //! reuse $_GET["name"] - check in older MySQL versions
-			. (ereg("^($on_actions)\$", $_POST["on_delete"]) ? " ON DELETE $_POST[on_delete]" : "")
-			. (ereg("^($on_actions)\$", $_POST["on_update"]) ? " ON UPDATE $_POST[on_update]" : "")
-		, ME . "table=" . urlencode($TABLE), ($_GET["name"] != "" ? lang('Foreign key has been altered.') : lang('Foreign key has been created.')));
-		$error = lang('Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.') . "<br>$error"; //! no partitioning
 	}
 }
 
-page_header(lang('Foreign key'), $error, array("table" => $TABLE), $TABLE);
+page_header(lang('Foreign key'), $error, array("table" => $TABLE), h($TABLE));
 
-$row = array("table" => $TABLE, "source" => array(""));
 if ($_POST) {
-	$row = $_POST;
 	ksort($row["source"]);
 	if ($_POST["add"]) {
 		$row["source"][] = "";
 	} elseif ($_POST["change"] || $_POST["change-js"]) {
 		$row["target"] = array();
 	}
-} elseif ($_GET["name"] != "") {
+} elseif ($name != "") {
 	$foreign_keys = foreign_keys($TABLE);
-	$row = $foreign_keys[$_GET["name"]];
+	$row = $foreign_keys[$name];
 	$row["source"][] = "";
+} else {
+	$row["table"] = $TABLE;
+	$row["source"] = array("");
 }
 
 $source = array_keys(fields($TABLE)); //! no text and blob
 $target = ($TABLE === $row["table"] ? $source : array_keys(fields($row["table"])));
-$referencable = array();
-foreach (table_status() as $name => $table_status) {
-	if (fk_support($table_status)) {
-		$referencable[] = $name;
-	}
-}
+$referencable = array_keys(array_filter(table_status('', true), 'fk_support'));
 ?>
 
 <form action="" method="post">
@@ -55,13 +62,13 @@ foreach (table_status() as $name => $table_status) {
 <input type="hidden" name="change-js" value="">
 <noscript><p><input type="submit" name="change" value="<?php echo lang('Change'); ?>"></noscript>
 <table cellspacing="0">
-<thead><tr><th><?php echo lang('Source'); ?><th><?php echo lang('Target'); ?></thead>
+<thead><tr><th id="label-source"><?php echo lang('Source'); ?><th id="label-target"><?php echo lang('Target'); ?></thead>
 <?php
 $j = 0;
 foreach ($row["source"] as $key => $val) {
 	echo "<tr>";
-	echo "<td>" . html_select("source[" . (+$key) . "]", array(-1 => "") + $source, $val, ($j == count($row["source"]) - 1 ? "foreignAddRow(this);" : 1));
-	echo "<td>" . html_select("target[" . (+$key) . "]", $target, $row["target"][$key]);
+	echo "<td>" . html_select("source[" . (+$key) . "]", array(-1 => "") + $source, $val, ($j == count($row["source"]) - 1 ? "foreignAddRow(this);" : 1), "label-source");
+	echo "<td>" . html_select("target[" . (+$key) . "]", $target, $row["target"][$key], 1, "label-target");
 	$j++;
 }
 ?>
@@ -69,10 +76,16 @@ foreach ($row["source"] as $key => $val) {
 <p>
 <?php echo lang('ON DELETE'); ?>: <?php echo html_select("on_delete", array(-1 => "") + explode("|", $on_actions), $row["on_delete"]); ?>
  <?php echo lang('ON UPDATE'); ?>: <?php echo html_select("on_update", array(-1 => "") + explode("|", $on_actions), $row["on_update"]); ?>
+<?php echo doc_link(array(
+	'sql' => "innodb-foreign-key-constraints.html",
+	'pgsql' => "sql-createtable.html#SQL-CREATETABLE-REFERENCES",
+	'mssql' => "ms174979.aspx",
+	'oracle' => "clauses002.htm#sthref2903",
+)); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <noscript><p><input type="submit" name="add" value="<?php echo lang('Add column'); ?>"></noscript>
 <?php } ?>
-<?php if ($_GET["name"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if ($name != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/include/auth.inc.php

@@ -1,10 +1,11 @@
 <?php
 $connection = '';
 
-$token = $_SESSION["token"];
-if (!$_SESSION["token"]) {
+$has_token = $_SESSION["token"];
+if (!$has_token) {
 	$_SESSION["token"] = rand(1, 1e6); // defense against cross-site request forgery
 }
+$token = get_token(); ///< @var string CSRF protection
 
 $permanent = array();
 if ($_COOKIE["adminer_permanent"]) {
@@ -14,27 +15,72 @@ 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
-	$_SESSION["pwds"][$auth["driver"]][$auth["server"]][$auth["username"]] = $auth["password"];
-	$_SESSION["db"][$auth["driver"]][$auth["server"]][$auth["username"]][$auth["db"]] = true;
+	$vendor = $auth["driver"];
+	$server = $auth["server"];
+	$username = $auth["username"];
+	$password = (string) $auth["password"];
+	$db = $auth["db"];
+	set_password($vendor, $server, $username, $password);
+	$_SESSION["db"][$vendor][$server][$username][$db] = true;
 	if ($auth["permanent"]) {
-		$key = base64_encode($auth["driver"]) . "-" . base64_encode($auth["server"]) . "-" . base64_encode($auth["username"]) . "-" . base64_encode($auth["db"]);
-		$private = $adminer->permanentLogin();
-		$permanent[$key] = "$key:" . base64_encode($private ? encrypt_string($auth["password"], $private) : "");
+		$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 != $auth["driver"]
-		|| SERVER != $auth["server"]
-		|| $_GET["username"] !== $auth["username"] // "0" == "00"
-		|| DB != $auth["db"]
+		|| DRIVER != $vendor
+		|| SERVER != $server
+		|| $_GET["username"] !== $username // "0" == "00"
+		|| DB != $db
 	) {
-		redirect(auth_url($auth["driver"], $auth["server"], $auth["username"], $auth["db"]));
+		redirect(auth_url($vendor, $server, $username, $db));
 	}
+	
 } elseif ($_POST["logout"]) {
-	if ($token && $_POST["token"] != $token) {
+	if ($has_token && !verify_token()) {
 		page_header(lang('Logout'), lang('Invalid CSRF token. Send the form again.'));
 		page_footer("db");
 		exit;
@@ -43,48 +89,59 @@ if ($auth) {
 			set_session($key, null);
 		}
 		unset_permanent();
-		redirect(substr(preg_replace('~(username|db|ns)=[^&]*&~', '', ME), 0, -1), lang('Logout successful.'));
+		redirect(substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1), lang('Logout successful.'));
 	}
+	
 } elseif ($permanent && !$_SESSION["pwds"]) {
 	session_regenerate_id();
-	$private = $adminer->permanentLogin(); // try to decode even if not set
+	$private = $adminer->permanentLogin();
 	foreach ($permanent as $key => $val) {
 		list(, $cipher) = explode(":", $val);
-		list($driver, $server, $username, $db) = array_map('base64_decode', explode("-", $key));
-		$_SESSION["pwds"][$driver][$server][$username] = decrypt_string(base64_decode($cipher), $private);
-		$_SESSION["db"][$driver][$server][$username][$db] = true;
+		list($vendor, $server, $username, $db) = array_map('base64_decode', explode("-", $key));
+		set_password($vendor, $server, $username, decrypt_string(base64_decode($cipher), $private));
+		$_SESSION["db"][$vendor][$server][$username][$db] = true;
 	}
 }
 
 function unset_permanent() {
 	global $permanent;
 	foreach ($permanent as $key => $val) {
-		list($driver, $server, $username) = array_map('base64_decode', explode("-", $key));
-		if ($driver == DRIVER && $server == SERVER && $db == $_GET["username"]) {
+		list($vendor, $server, $username, $db) = array_map('base64_decode', explode("-", $key));
+		if ($vendor == DRIVER && $server == SERVER && $username == $_GET["username"] && $db == DB) {
 			unset($permanent[$key]);
 		}
 	}
 	cookie("adminer_permanent", implode(" ", $permanent));
 }
 
-function auth_error($exception = null) {
-	global $connection, $adminer, $token;
+/** Renders an error message and a login form
+* @param string plain text
+* @return null exits
+*/
+function auth_error($error) {
+	global $adminer, $has_token;
 	$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 (($_COOKIE[$session_name] || $_GET[$session_name]) && !$token) {
+	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 {
-			$password = &get_session("pwds");
+			add_invalid_login();
+			$password = get_password();
 			if ($password !== null) {
-				$error = h($exception ? $exception->getMessage() : (is_string($connection) ? $connection : lang('Invalid credentials.')));
-				$password = null;
+				if ($password === false) {
+					$error .= '<br>' . lang('Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.', '<code>permanentLogin()</code>');
+				}
+				set_password(DRIVER, SERVER, $_GET["username"], 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);
 	echo "<form action='' method='post'>\n";
 	$adminer->loginForm();
@@ -93,6 +150,7 @@ function auth_error($exception = null) {
 	echo "</div>\n";
 	echo "</form>\n";
 	page_footer("auth");
+	exit;
 }
 
 if (isset($_GET["username"])) {
@@ -105,16 +163,41 @@ if (isset($_GET["username"])) {
 	}
 	$connection = connect();
 }
-if (is_string($connection) || !$adminer->login($_GET["username"], get_session("pwds"))) {
-	auth_error();
-	exit;
+
+$driver = new Min_Driver($connection);
+
+if (!is_object($connection) || ($login = $adminer->login($_GET["username"], get_password())) !== true) {
+	auth_error((is_string($connection) ? h($connection) : (is_string($login) ? $login : lang('Invalid credentials.'))));
 }
 
-$token = $_SESSION["token"]; ///< @var string CSRF protection
 if ($auth && $_POST["token"]) {
 	$_POST["token"] = $token; // reset token after explicit login
 }
-$error = ($_POST ///< @var string
-	? ($_POST["token"] == $token ? "" : lang('Invalid CSRF token. Send the form again.'))
-	: ($_SERVER["REQUEST_METHOD"] != "POST" ? "" : lang('Too big POST data. Reduce the data or increase the %s configuration directive.', '"post_max_size"')) // posted form with no data means that post_max_size exceeded because Adminer always sends token at least
-);
+
+$error = ''; ///< @var string
+if ($_POST) {
+	if (!verify_token()) {
+		$ini = "max_input_vars";
+		$max_vars = ini_get($ini);
+		if (extension_loaded("suhosin")) {
+			foreach (array("suhosin.request.max_vars", "suhosin.post.max_vars") as $key) {
+				$val = ini_get($key);
+				if ($val && (!$max_vars || $val < $max_vars)) {
+					$ini = $key;
+					$max_vars = $val;
+				}
+			}
+		}
+		$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('If you did not send this request from Adminer then close this page.')
+		);
+	}
+	
+} elseif ($_SERVER["REQUEST_METHOD"] == "POST") {
+	// posted form with no data means that post_max_size exceeded because Adminer always sends token at least
+	$error = lang('Too big POST data. Reduce the data or increase the %s configuration directive.', "'post_max_size'");
+	if (isset($_GET["sql"])) {
+		$error .= ' ' . lang('You can upload a big SQL file via FTP and import it from server.');
+	}
+}

adminer/include/bootstrap.inc.php

@@ -4,7 +4,7 @@ error_reporting(6135); // errors and warnings
 include "../adminer/include/coverage.inc.php";
 
 // disable filter.default
-$filter = !ereg('^(unsafe_raw)?$', ini_get("filter.default"));
+$filter = !preg_match('~^(unsafe_raw)?$~', ini_get("filter.default"));
 if ($filter || ini_get("filter.default_flags")) {
 	foreach (array('_GET', '_POST', '_COOKIE', '_SERVER') as $val) {
 		$unsafe = filter_input_array(constant("INPUT$val"), FILTER_UNSAFE_RAW);
@@ -14,6 +14,10 @@ if ($filter || ini_get("filter.default_flags")) {
 	}
 }
 
+if (function_exists("mb_internal_encoding")) {
+	mb_internal_encoding("8bit");
+}
+
 // used only in compiled file
 if (isset($_GET["file"])) {
 	include "../adminer/file.inc.php";
@@ -21,10 +25,10 @@ if (isset($_GET["file"])) {
 
 include "../adminer/include/functions.inc.php";
 
-global $adminer, $connection, $drivers, $edit_functions, $enum_length, $error, $functions, $grouping, $HTTPS, $inout, $jush, $LANG, $langs, $on_actions, $permanent, $structured_types, $token, $translations, $types, $unsigned, $VERSION; // allows including Adminer inside a function
+global $adminer, $connection, $drivers, $edit_functions, $enum_length, $error, $functions, $grouping, $HTTPS, $inout, $jush, $LANG, $langs, $on_actions, $permanent, $structured_types, $has_token, $token, $translations, $types, $unsigned, $VERSION; // allows including Adminer inside a function
 
 if (!$_SERVER["REQUEST_URI"]) { // IIS 5 compatibility
-	$_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"]; 
+	$_SERVER["REQUEST_URI"] = $_SERVER["ORIG_PATH_INFO"];
 }
 if (!strpos($_SERVER["REQUEST_URI"], '?') && $_SERVER["QUERY_STRING"] != "") { // IIS 7 compatibility
 	$_SERVER["REQUEST_URI"] .= "?$_SERVER[QUERY_STRING]";
@@ -32,6 +36,7 @@ if (!strpos($_SERVER["REQUEST_URI"], '?') && $_SERVER["QUERY_STRING"] != "") { /
 $HTTPS = $_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off");
 
 @ini_set("session.use_trans_sid", false); // protect links in export, @ - may be disabled
+session_cache_limiter(""); // to allow restarting session and to not send Cache-Control: no-store
 if (!defined("SID")) {
 	session_name("adminer_sid"); // use specific session name to get own namespace
 	$params = array(0, preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]), "", $HTTPS);
@@ -44,7 +49,7 @@ if (!defined("SID")) {
 
 // disable magic quotes to be able to use database escaping function
 remove_slashes(array(&$_GET, &$_POST, &$_COOKIE), $filter);
-if (function_exists("set_magic_quotes_runtime")) { // removed in PHP 6
+if (get_magic_quotes_runtime()) {
 	set_magic_quotes_runtime(false);
 }
 @set_time_limit(0); // @ - can be disabled
@@ -54,10 +59,15 @@ if (function_exists("set_magic_quotes_runtime")) { // removed in PHP 6
 include "../adminer/include/lang.inc.php";
 include "../adminer/lang/$LANG.inc.php";
 include "../adminer/include/pdo.inc.php";
+include "../adminer/include/driver.inc.php";
 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";
 include "../adminer/drivers/mysql.inc.php"; // must be included as last driver
 
 define("SERVER", $_GET[DRIVER]); // read from pgsql=localhost
@@ -76,11 +86,10 @@ include "../adminer/include/xxtea.inc.php";
 include "../adminer/include/auth.inc.php";
 
 if (!ini_bool("session.use_cookies") || @ini_set("session.use_cookies", false) !== false) { // @ - may be disabled
-	session_cache_limiter(""); // to allow restarting session
 	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,8 +1,8 @@
 <?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);
 	} else {
 		if ($_POST["db"] && !$error) {
@@ -10,55 +10,75 @@ function connect_error() {
 		}
 		
 		page_header(lang('Select database'), $error, false);
-		echo "<p><a href='" . h(ME) . "database='>" . lang('Create new database') . "</a>\n";
+		echo "<p class='links'>\n";
 		foreach (array(
+			'database' => lang('Create database'),
 			'privileges' => lang('Privileges'),
 			'processlist' => lang('Process list'),
 			'variables' => lang('Variables'),
 			'status' => lang('Status'),
+			'replication' => lang('Replication'),
 		) as $key => $val) {
 			if (support($key)) {
 				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";
-		$refresh = "<a href='" . h(ME) . "refresh=1'>" . lang('Refresh') . "</a>\n";
 		$databases = $adminer->databases();
 		if ($databases) {
 			$scheme = support("scheme");
 			$collations = collations();
 			echo "<form action='' method='post'>\n";
-			echo "<table cellspacing='0' class='checkable' onclick='tableClick(event);'>\n";
-			echo "<thead><tr><td>&nbsp;<th>" . lang('Database') . "<td>" . lang('Collation') . "<td>" . lang('Tables') . "</thead>\n";
-			foreach ($databases as $db) {
+			echo "<table cellspacing='0' class='checkable' onclick='tableClick(event);' ondblclick='tableClick(event, true);'>\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('" . h(js_escape(ME)) . "script=connect');\">" . lang('Compute') . "</a>"
+				. "</thead>\n"
+			;
+			
+			$databases = ($_GET["dbsize"] ? count_tables($databases) : array_flip($databases));
+			
+			foreach ($databases as $db => $tables) {
 				$root = h(ME) . "db=" . urlencode($db);
-				echo "<tr" . odd() . "><td>" . checkbox("db[]", $db, in_array($db, (array) $_POST["db"]));
-				echo "<th><a href='$root'>" . h($db) . "</a>";
-				echo "<td><a href='$root" . ($scheme ? "&amp;ns=" : "") . "&amp;database=' title='" . lang('Alter database') . "'>" . nbsp(db_collation($db, $collations)) . "</a>";
-				echo "<td align='right'><a href='$root&amp;schema=' id='tables-" . h($db) . "' title='" . lang('Database schema') . "'>?</a>";
+				$id = h("Db-" . $db);
+				echo "<tr" . odd() . ">" . (support("database") ? "<td>" . checkbox("db[]", $db, in_array($db, (array) $_POST["db"]), "", "", "", $id) : "");
+				echo "<th><a href='$root' id='$db'>" . 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') . "'>" . ($_GET["dbsize"] ? $tables : "?") . "</a>";
+				echo "<td align='right' id='size-" . h($db) . "'>" . ($_GET["dbsize"] ? db_size($db) : "?");
 				echo "\n";
 			}
+			
 			echo "</table>\n";
+			echo (support("database")
+				? "<fieldset><legend>" . lang('Selected') . " <span id='selected'></span></legend><div>\n"
+					. "<input type='hidden' name='all' value='' onclick=\"selectCount('selected', formChecked(this, /^db/));\">\n" // used by trCheck()
+					. "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n"
+					. "</div></fieldset>\n"
+				: ""
+			);
 			echo "<script type='text/javascript'>tableCheck();</script>\n";
-			echo "<p><input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm("formChecked(this, /db/)") . ">\n";
 			echo "<input type='hidden' name='token' value='$token'>\n";
-			echo $refresh;
 			echo "</form>\n";
-		} else {
-			echo "<p>$refresh";
 		}
 	}
+	
 	page_footer("db");
-	if ($databases) {
-		echo "<script type='text/javascript'>ajaxSetHtml('" . js_escape(ME) . "script=connect');</script>\n";
-	}
 }
 
 if (isset($_GET["status"])) {
 	$_GET["variables"] = $_GET["status"];
 }
-if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]) || isset($_GET["processlist"]) || isset($_GET["privileges"]) || isset($_GET["user"]) || isset($_GET["variables"]) || $_GET["script"] == "connect" || $_GET["script"] == "kill")) {
+if (isset($_GET["import"])) {
+	$_GET["sql"] = $_GET["import"];
+}
+
+if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET["dump"]) || isset($_GET["database"]) || isset($_GET["processlist"]) || isset($_GET["privileges"]) || isset($_GET["user"]) || isset($_GET["replication"]) || isset($_GET["variables"]) || $_GET["script"] == "connect" || $_GET["script"] == "kill")) {
 	if (DB != "" || $_GET["refresh"]) {
 		restart_session();
 		set_session("dbs", null);
@@ -72,6 +92,7 @@ if (support("scheme") && DB != "" && $_GET["ns"] !== "") {
 		redirect(preg_replace('~ns=[^&]*&~', '', ME) . "ns=" . get_schema());
 	}
 	if (!set_schema($_GET["ns"])) {
+		header("HTTP/1.1 404 Not Found");
 		page_header(lang('Schema') . ": " . h($_GET["ns"]), lang('Invalid schema.'), true);
 		page_footer("ns");
 		exit;

adminer/include/design.inc.php

@@ -2,47 +2,52 @@
 /** Print HTML header
 * @param string used in title, breadcrumb and heading, should be HTML escaped
 * @param string
-* @param mixed array("key" => "link=desc", "key2" => array("link", "desc")), null for nothing, false for driver only, true for driver and server
-* @param string used after colon in title and heading, will be HTML escaped
+* @param mixed array("key" => "link", "key2" => array("link", "desc")), null for nothing, false for driver only, true for driver and server
+* @param string used after colon in title and heading, should be HTML escaped
 * @return null
 */
 function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
-	global $LANG, $adminer, $connection, $drivers;
-	header("Content-Type: text/html; charset=utf-8");
-	if ($adminer->headers()) {
-		header("X-Frame-Options: deny"); // ClickJacking protection in IE8, Safari 4, Chrome 2, Firefox 3.6.9
-		header("X-XSS-Protection: 0"); // prevents introducing XSS in IE8 by removing safe parts of the page
+	global $LANG, $VERSION, $adminer, $drivers, $jush;
+	page_headers();
+	if (is_ajax() && $error) {
+		page_messages($error);
+		exit;
 	}
-	$title_all = $title . ($title2 != "" ? ": " . h($title2) : "");
+	$title_all = $title . ($title2 != "" ? ": $title2" : "");
 	$title_page = strip_tags($title_all . (SERVER != "" && SERVER != "localhost" ? h(" - " . SERVER) : "") . " - " . $adminer->name());
 	?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
+<!DOCTYPE html>
 <html lang="<?php echo $LANG; ?>" dir="<?php echo lang('ltr'); ?>">
 <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="origin-when-crossorigin">
 <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>
 <script type="text/javascript" src="static/editing.js"></script>
 <?php if ($adminer->head()) { ?>
-<link rel="shortcut icon" type="image/x-icon" href="../adminer/static/favicon.ico" id="favicon">
+<link rel="shortcut icon" type="image/x-icon" href="../adminer/static/favicon.ico">
+<link rel="apple-touch-icon" href="../adminer/static/favicon.ico">
 <?php if (file_exists("adminer.css")) { ?>
 <link rel="stylesheet" type="text/css" href="adminer.css">
 <?php } ?>
 <?php } ?>
 
-<body class="<?php echo lang('ltr'); ?> nojs" onkeydown="bodyKeydown(event);" onclick="bodyClick(event);" onload="bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>');<?php echo (isset($_COOKIE["adminer_version"]) ? "" : " verifyVersion();"); ?>">
+<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>
+
 <div id="content">
 <?php
 	if ($breadcrumb !== null) {
-		$link = substr(preg_replace('~(username|db|ns)=[^&]*&~', '', ME), 0, -1);
+		$link = substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1);
 		echo '<p id="breadcrumb"><a href="' . h($link ? $link : ".") . '">' . $drivers[DRIVER] . '</a> &raquo; ';
-		$link = substr(preg_replace('~(db|ns)=[^&]*&~', '', ME), 0, -1);
+		$link = substr(preg_replace('~\b(db|ns)=[^&]*&~', '', ME), 0, -1);
 		$server = (SERVER != "" ? h(SERVER) : lang('Server'));
 		if ($breadcrumb === false) {
 			echo "$server\n";
@@ -56,9 +61,9 @@ document.body.className = document.body.className.replace(/ nojs/, ' js');
 					echo '<a href="' . h(substr(ME, 0, -1)) . '">' . h($_GET["ns"]) . '</a> &raquo; ';
 				}
 				foreach ($breadcrumb as $key => $val) {
-					$desc = (is_array($val) ? $val[1] : $val);
+					$desc = (is_array($val) ? $val[1] : h($val));
 					if ($desc != "") {
-						echo '<a href="' . h(ME . "$key=") . urlencode(is_array($val) ? $val[0] : $val) . '">' . h($desc) . '</a> &raquo; ';
+						echo "<a href='" . h(ME . "$key=") . urlencode(is_array($val) ? $val[0] : $val) . "'>$desc</a> &raquo; ";
 					}
 				}
 			}
@@ -66,22 +71,44 @@ 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");
+	if (DB != "" && $databases && !in_array(DB, $databases, true)) {
+		$databases = null;
+	}
+	stop_session();
+	define("PAGE_HEADER", 1);
+}
+
+/** Send HTTP headers
+* @return null
+*/
+function page_headers() {
+	global $adminer;
+	header("Content-Type: text/html; charset=utf-8");
+	header("Cache-Control: no-cache");
+	if ($adminer->headers()) {
+		header("X-Frame-Options: deny"); // ClickJacking protection in IE8, Safari 4, Chrome 2, Firefox 3.6.9
+		header("X-XSS-Protection: 0"); // prevents introducing XSS in IE8 by removing safe parts of the page
+	}
+}
+
+/** Print flash and error messages
+* @param string
+* @return null
+*/
+function page_messages($error) {
 	$uri = preg_replace('~^[^?]*~', '', $_SERVER["REQUEST_URI"]);
 	$messages = $_SESSION["messages"][$uri];
 	if ($messages) {
 		echo "<div class='message'>" . implode("</div>\n<div class='message'>", $messages) . "</div>\n";
 		unset($_SESSION["messages"][$uri]);
 	}
-	$databases = &get_session("dbs");
-	if (DB != "" && $databases && !in_array(DB, $databases, true)) {
-		$databases = null;
-	}
-	stop_session();
 	if ($error) {
 		echo "<div class='error'>$error</div>\n";
 	}
-	define("PAGE_HEADER", 1);
 }
 
 /** Print HTML footer
@@ -89,13 +116,22 @@ document.body.className = document.body.className.replace(/ nojs/, ' js');
 * @return null
 */
 function page_footer($missing = "") {
-	global $adminer;
+	global $adminer, $token;
 	?>
 </div>
 
 <?php switch_lang(); ?>
+<?php if ($missing != "auth") { ?>
+<form action="" method="post">
+<p class="logout">
+<input type="submit" name="logout" value="<?php echo lang('Logout'); ?>" id="logout">
+<input type="hidden" name="token" value="<?php echo $token; ?>">
+</p>
+</form>
+<?php } ?>
 <div id="menu">
 <?php $adminer->navigation($missing); ?>
 </div>
+<script type="text/javascript">setupSubmitHighlight(document);</script>
 <?php
 }

adminer/include/driver.inc.php

@@ -0,0 +1,110 @@
+<?php
+
+/*abstract*/ class Min_SQL {
+	var $_conn;
+	
+	/** Create object for performing database operations
+	* @param Min_DB
+	*/
+	function __construct($connection) {
+		$this->_conn = $connection;
+	}
+	
+	/** Select data from table
+	* @param string
+	* @param array result of $adminer->selectColumnsProcess()[0]
+	* @param array result of $adminer->selectSearchProcess()
+	* @param array result of $adminer->selectColumnsProcess()[1]
+	* @param array result of $adminer->selectOrderProcess()
+	* @param int result of $adminer->selectLimitProcess()
+	* @param int index of page starting at zero
+	* @param bool whether to print the query
+	* @return Min_Result
+	*/
+	function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+		global $adminer, $jush;
+		$is_group = (count($group) < count($select));
+		$query = $adminer->selectQueryBuild($select, $where, $group, $order, $limit, $page);
+		if (!$query) {
+			$query = "SELECT" . limit(
+				($_GET["page"] != "last" && +$limit && $group && $is_group && $jush == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . implode(", ", $select) . "\nFROM " . table($table),
+				($where ? "\nWHERE " . implode(" AND ", $where) : "") . ($group && $is_group ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : ""),
+				($limit != "" ? +$limit : null),
+				($page ? $limit * $page : 0),
+				"\n"
+			);
+		}
+		$start = microtime(true);
+		$return = $this->_conn->query($query);
+		if ($print) {
+			echo $adminer->selectQuery($query, format_time($start));
+		}
+		return $return;
+	}
+	
+	/** Delete data from table
+	* @param string
+	* @param string " WHERE ..."
+	* @param int 0 or 1
+	* @return bool
+	*/
+	function delete($table, $queryWhere, $limit = 0) {
+		$query = "FROM " . table($table);
+		return queries("DELETE" . ($limit ? limit1($query, $queryWhere) : " $query$queryWhere"));
+	}
+	
+	/** Update data in table
+	* @param string
+	* @param array escaped columns in keys, quoted data in values
+	* @param string " WHERE ..."
+	* @param int 0 or 1
+	* @param string
+	* @return bool
+	*/
+	function update($table, $set, $queryWhere, $limit = 0, $separator = "\n") {
+		$values = array();
+		foreach ($set as $key => $val) {
+			$values[] = "$key = $val";
+		}
+		$query = table($table) . " SET$separator" . implode(",$separator", $values);
+		return queries("UPDATE" . ($limit ? limit1($query, $queryWhere) : " $query$queryWhere"));
+	}
+	
+	/** Insert data into table
+	* @param string
+	* @param array escaped columns in keys, quoted data in values
+	* @return bool
+	*/
+	function insert($table, $set) {
+		return queries("INSERT INTO " . table($table) . ($set
+			? " (" . implode(", ", array_keys($set)) . ")\nVALUES (" . implode(", ", $set) . ")"
+			: " DEFAULT VALUES"
+		));
+	}
+	
+	/** Insert or update data in table
+	* @param string
+	* @param array
+	* @param array of arrays with escaped columns in keys and quoted data in values
+	* @return bool
+	*/
+	/*abstract*/ function insertUpdate($table, $rows, $primary) {
+		return false;
+	}
+	
+	/** Begin transaction
+	* @return bool
+	*/
+	function begin() {
+		return queries("BEGIN");
+	}
+	
+	function commit() {
+		return queries("COMMIT");
+	}
+	
+	function rollback() {
+		return queries("ROLLBACK");
+	}
+	
+}

adminer/include/editing.inc.php

@@ -2,11 +2,12 @@
 /** Print select result
 * @param Min_Result
 * @param Min_DB connection to examine indexes
-* @param string base link for <th> fields
-* @param array 
-* @return null
+* @param array
+* @param int
+* @return array $orgtables
 */
-function select($result, $connection2 = null, $href = "", $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
 	$columns = array(); // orgtable => array(column => ) - not selected columns in primary key
@@ -14,7 +15,7 @@ function select($result, $connection2 = null, $href = "", $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>";
@@ -24,7 +25,7 @@ function select($result, $connection2 = null, $href = "", $orgtables = array())
 				$orgtable = $field->orgtable;
 				$orgname = $field->orgname;
 				$return[$field->table] = $orgtable;
-				if ($href) { // MySQL EXPLAIN
+				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
 					$links[$j] = ($name == "table" ? "table=" : ($name == "possible_keys" ? "indexes=" : null));
 				} elseif ($orgtable != "") {
 					if (!isset($indexes[$orgtable])) {
@@ -48,8 +49,9 @@ function select($result, $connection2 = null, $href = "", $orgtables = array())
 					$blobs[$j] = true;
 				}
 				$types[$j] = $field->type;
-				$name = h($name);
-				echo "<th" . ($orgtable != "" || $field->name != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . ($href ? "<a href='$href" . strtolower($name) . "' target='_blank' rel='noreferrer'>$name</a>" : $name);
+				echo "<th" . ($orgtable != "" || $field->name != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($name)
+					. ($orgtables ? doc_link(array('sql' => "explain-output.html#explain_" . strtolower($name))) : "")
+				;
 			}
 			echo "</thead>\n";
 		}
@@ -68,7 +70,7 @@ function select($result, $connection2 = null, $href = "", $orgtables = array())
 				}
 			}
 			if (isset($links[$key]) && !$columns[$links[$key]]) {
-				if ($href) { // MySQL EXPLAIN
+				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
 					$table = $row[array_search("table=", $links)];
 					$link = $links[$key] . urlencode($orgtables[$table] != "" ? $orgtables[$table] : $table);
 				} else {
@@ -92,7 +94,7 @@ function select($result, $connection2 = null, $href = "", $orgtables = array())
 */
 function referencable_primary($self) {
 	$return = array(); // table_name => field
-	foreach (table_status() as $table_name => $table) {
+	foreach (table_status('', true) as $table_name => $table) {
 		if ($table_name != $self && fk_support($table)) {
 			foreach (fields($table_name) as $field) {
 				if ($field["primary"]) {
@@ -110,16 +112,17 @@ 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) {
-	echo "<textarea name='$name' rows='$rows' cols='$cols' class='sqlarea' spellcheck='false' wrap='off' onkeydown='return textareaKeydown(this, event);'>"; // spellcheck, wrap - not valid before HTML5
+	global $jush;
+	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);
@@ -127,15 +130,6 @@ function textarea($name, $value, $rows = 10, $cols = 80) {
 	echo "</textarea>";
 }
 
-/** Format time difference
-* @param string output of microtime()
-* @param string output of microtime()
-* @return string HTML code
-*/
-function format_time($start, $end) {
-	return " <span class='time'>(" . lang('%.3f s', max(0, array_sum(explode(" ", $end)) - array_sum(explode(" ", $start)))) . ")</span>";
-}
-
 /** Print table columns for type edit
 * @param string
 * @param array
@@ -145,12 +139,22 @@ function format_time($start, $end) {
 */
 function edit_type($key, $field, $collations, $foreign_keys = array()) {
 	global $structured_types, $types, $unsigned, $on_actions;
+	$type = $field["type"];
 	?>
-<td><select name="<?php echo $key; ?>[type]" class="type" onfocus="lastType = selectValue(this);" onchange="editingTypeChange(this);"><?php echo optionlist((!$field["type"] || isset($types[$field["type"]]) ? array() : array($field["type"])) + $structured_types + ($foreign_keys ? array(lang('Foreign keys') => $foreign_keys) : array()), $field["type"]); ?></select>
-<td><input name="<?php echo $key; ?>[length]" value="<?php echo h($field["length"]); ?>" size="3" onfocus="editingLengthFocus(this);"><td class="options"><?php
-	echo "<select name='$key" . "[collation]'" . (ereg('(char|text|enum|set)$', $field["type"]) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
-	echo ($unsigned ? "<select name='$key" . "[unsigned]'" . (!$field["type"] || ereg('(int|float|double|decimal)$', $field["type"]) ? "" : " class='hidden'") . '><option>' . optionlist($unsigned, $field["unsigned"]) . '</select>' : '');
-	echo ($foreign_keys ? "<select name='$key" . "[on_delete]'" . (ereg("`", $field["type"]) ? "" : " class='hidden'") . "><option value=''>(" . lang('ON DELETE') . ")" . optionlist(explode("|", $on_actions), $field["on_delete"]) . "</select> " : " "); // space for IE
+<td><select name="<?php echo h($key); ?>[type]" class="type" onfocus="lastType = selectValue(this);" onchange="editingTypeChange(this);"<?php echo on_help("getTarget(event).value", 1); ?> aria-labelledby="label-type"><?php
+if ($type && !isset($types[$type]) && !isset($foreign_keys[$type])) {
+	array_unshift($structured_types, $type);
+}
+if ($foreign_keys) {
+	$structured_types[lang('Foreign keys')] = $foreign_keys;
+}
+echo optionlist($structured_types, $type);
+?></select>
+<td><input name="<?php echo h($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();" aria-labelledby="label-length"><td class="options"><?php //! type="number" with enabled JavaScript
+	echo "<select name='" . h($key) . "[collation]'" . (preg_match('~(char|text|enum|set)$~', $type) ? "" : " class='hidden'") . '><option value="">(' . lang('collation') . ')' . optionlist($collations, $field["collation"]) . '</select>';
+	echo ($unsigned ? "<select name='" . h($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='" . h($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='" . h($key) . "[on_delete]'" . (preg_match("~`~", $type) ? "" : " class='hidden'") . "><option value=''>(" . lang('ON DELETE') . ")" . optionlist(explode("|", $on_actions), $field["on_delete"]) . "</select> " : " "); // space for IE
 }
 
 /** Filter length value including enums
@@ -159,7 +163,10 @@ function edit_type($key, $field, $collations, $foreign_keys = array()) {
 */
 function process_length($length) {
 	global $enum_length;
-	return (preg_match("~^\\s*(?:$enum_length)(?:\\s*,\\s*(?:$enum_length))*\\s*\$~", $length) && preg_match_all("~$enum_length~", $length, $matches) ? implode(",", $matches[0]) : preg_replace('~[^0-9,+-]~', '', $length));
+	return (preg_match("~^\\s*\\(?\\s*$enum_length(?:\\s*,\\s*$enum_length)*+\\s*\\)?\\s*\$~", $length) && preg_match_all("~$enum_length~", $length, $matches)
+		? "(" . implode(",", $matches[0]) . ")"
+		: preg_replace('~^[0-9].*~', '(\0)', preg_replace('~[^-0-9,+()[\]]~', '', $length))
+	);
 }
 
 /** Create SQL string from field type
@@ -170,9 +177,9 @@ function process_length($length) {
 function process_type($field, $collate = "COLLATE") {
 	global $unsigned;
 	return " $field[type]"
-		. ($field["length"] != "" ? "(" . process_length($field["length"]) . ")" : "")
-		. (ereg('int|float|double|decimal', $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
-		. (ereg('char|text|enum|set', $field["type"]) && $field["collation"] ? " $collate " . q($field["collation"]) : "")
+		. process_length($field["length"])
+		. (preg_match('~(^|[^o])int|float|double|decimal~', $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
+		. (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " $collate " . q($field["collation"]) : "")
 	;
 }
 
@@ -182,12 +189,19 @@ function process_type($field, $collate = "COLLATE") {
 * @return array array("field", "type", "NULL", "DEFAULT", "ON UPDATE", "COMMENT", "AUTO_INCREMENT")
 */
 function process_field($field, $type_field) {
+	global $jush;
+	$default = $field["default"];
 	return array(
 		idf_escape(trim($field["field"])),
 		process_type($type_field),
 		($field["null"] ? " NULL" : " NOT NULL"), // NULL for timestamp
-		(isset($field["default"]) ? " DEFAULT " . (($field["type"] == "timestamp" && eregi('^CURRENT_TIMESTAMP$', $field["default"])) || ($field["type"] == "bit" && ereg("^([0-9]+|b'[0-1]+')\$", $field["default"])) ? $field["default"] : q($field["default"])) : ""),
-		($field["on_update"] ? " ON UPDATE $field[on_update]" : ""),
+		(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)) : ""),
+		(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),
 	);
@@ -204,7 +218,7 @@ function type_class($type) {
 		'binary' => 'blob',
 		'enum' => 'set',
 	) as $key => $val) {
-		if (ereg("$key|$val", $type)) {
+		if (preg_match("~$key|$val~", $type)) {
 			return " class='$key'";
 		}
 	}
@@ -214,25 +228,30 @@ function type_class($type) {
 * @param array
 * @param array
 * @param string TABLE or PROCEDURE
-* @param int number of fields allowed by Suhosin
 * @param array returned by referencable_primary()
 * @param bool display comments column
 * @return null
 */
-function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0, $foreign_keys = array(), $comments = false) {
-	global $inout;
+function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = array(), $comments = false) {
+	global $connection, $inout;
+	$fields = array_values($fields);
 	?>
 <thead><tr class="wrap">
 <?php if ($type == "PROCEDURE") { ?><td>&nbsp;<?php } ?>
-<th><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?>
-<td><?php echo lang('Type'); ?><textarea id="enum-edit" rows="4" cols="12" wrap="off" style="display: none;" onblur="editingLengthBlur(this);"></textarea>
-<td><?php echo lang('Length'); ?>
-<td><?php echo lang('Options'); ?>
+<th id="label-name"><?php echo ($type == "TABLE" ? lang('Column name') : lang('Parameter name')); ?>
+<td id="label-type"><?php echo lang('Type'); ?><textarea id="enum-edit" rows="4" cols="12" wrap="off" style="display: none;" onblur="editingLengthBlur(this);"></textarea>
+<td id="label-length"><?php echo lang('Length'); ?>
+<td><?php echo lang('Options'); /* no label required, options have their own label */ ?>
 <?php if ($type == "TABLE") { ?>
-<td>NULL
-<td><input type="radio" name="auto_increment_col" value=""><acronym title="<?php echo lang('Auto Increment'); ?>">AI</acronym>
-<td<?php echo ($_POST["defaults"] ? "" : " class='hidden'"); ?>><?php echo lang('Default values'); ?>
-<?php echo (support("comment") ? "<td" . ($comments ? "" : " class='hidden'") . ">" . lang('Comment') : ""); ?>
+<td id="label-null">NULL
+<td><input type="radio" name="auto_increment_col" value=""><acronym id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</acronym><?php echo doc_link(array(
+	'sql' => "example-auto-increment.html",
+	'sqlite' => "autoinc.html",
+	'pgsql' => "datatype.html#DATATYPE-SERIAL",
+	'mssql' => "ms186775.aspx",
+)); ?>
+<td id="label-default"><?php echo lang('Default value'); ?>
+<?php echo (support("comment") ? "<td id='label-comment'" . ($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>
 </thead>
@@ -245,32 +264,32 @@ function edit_fields($fields, $collations, $type = "TABLE", $allowed = 0, $forei
 		?>
 <tr<?php echo ($display ? "" : " style='display: none;'"); ?>>
 <?php echo ($type == "PROCEDURE" ? "<td>" . html_select("fields[$i][inout]", explode("|", $inout), $field["inout"]) : ""); ?>
-<th><?php if ($display) { ?><input name="fields[<?php echo $i; ?>][field]" value="<?php echo h($field["field"]); ?>" onchange="<?php echo ($field["field"] != "" || count($fields) > 1 ? "" : "editingAddRow(this, $allowed); "); ?>editingNameChange(this);" maxlength="64"><?php } ?><input type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo h($orig); ?>">
+<th><?php if ($display) { ?><input name="fields[<?php echo $i; ?>][field]" value="<?php echo h($field["field"]); ?>" onchange="editingNameChange(this);<?php echo ($field["field"] != "" || count($fields) > 1 ? '' : ' editingAddRow(this);" onkeyup="if (this.value) editingAddRow(this);'); ?>" maxlength="64" autocapitalize="off" aria-labelledby="label-name"><?php } ?>
+<input type="hidden" name="fields[<?php echo $i; ?>][orig]" value="<?php echo h($orig); ?>">
 <?php edit_type("fields[$i]", $field, $collations, $foreign_keys); ?>
 <?php if ($type == "TABLE") { ?>
-<td><?php echo checkbox("fields[$i][null]", 1, $field["null"]); ?>
-<td><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php if ($field["auto_increment"]) { ?> checked<?php } ?> onclick="var field = this.form['fields[' + this.value + '][field]']; if (!field.value) { field.value = 'id'; field.onchange(); }">
-<td<?php echo ($_POST["defaults"] ? "" : " class='hidden'"); ?>><?php echo checkbox("fields[$i][has_default]", 1, $field["has_default"]); ?><input name="fields[<?php echo $i; ?>][default]" value="<?php echo h($field["default"]); ?>" onchange="this.previousSibling.checked = true;">
-<?php echo (support("comment") ? "<td" . ($comments ? "" : " class='hidden'") . "><input name='fields[$i][comment]' value='" . h($field["comment"]) . "' maxlength='255'>" : ""); ?>
+<td><?php echo checkbox("fields[$i][null]", 1, $field["null"], "", "", "block", "label-null"); ?>
+<td><label class="block"><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php if ($field["auto_increment"]) { ?> checked<?php } ?> onclick="var field = this.form['fields[' + this.value + '][field]']; if (!field.value) { field.value = 'id'; field.onchange(); }" aria-labelledby="label-ai"></label><td><?php
+echo checkbox("fields[$i][has_default]", 1, $field["has_default"], "", "", "", "label-default"); ?><input name="fields[<?php echo $i; ?>][default]" value="<?php echo h($field["default"]); ?>" onkeyup="keyupChange.call(this);" onchange="this.previousSibling.checked = true;" aria-labelledby="label-default">
+<?php echo (support("comment") ? "<td" . ($comments ? "" : " class='hidden'") . "><input name='fields[$i][comment]' value='" . h($field["comment"]) . "' maxlength='" . ($connection->server_info >= 5.5 ? 1024 : 255) . "' aria-labelledby='label-comment'>" : ""); ?>
 <?php } ?>
 <?php
 		echo "<td>";
 		echo (support("move_col") ?
-			"<input type='image' class='icon' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "' onclick='return !editingAddRow(this, $allowed, 1);'>&nbsp;"
-			. "<input type='image' class='icon' name='up[$i]' src='../adminer/static/up.gif' alt='^' title='" . lang('Move up') . "'>&nbsp;"
-			. "<input type='image' class='icon' name='down[$i]' src='../adminer/static/down.gif' alt='v' title='" . lang('Move down') . "'>&nbsp;"
+			"<input type='image' class='icon' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "' onclick='return !editingAddRow(this, 1);'>&nbsp;"
+			. "<input type='image' class='icon' name='up[$i]' src='../adminer/static/up.gif' alt='^' title='" . lang('Move up') . "' onclick='return !editingMoveRow(this, 1);'>&nbsp;"
+			. "<input type='image' class='icon' name='down[$i]' src='../adminer/static/down.gif' alt='v' title='" . lang('Move down') . "' onclick='return !editingMoveRow(this, 0);'>&nbsp;"
 		: "");
-		echo ($orig == "" || support("drop_col") ? "<input type='image' class='icon' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "' onclick='return !editingRemoveRow(this);'>" : "");
+		echo ($orig == "" || support("drop_col") ? "<input type='image' class='icon' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "' onclick=\"return !editingRemoveRow(this, 'fields\$1[field]');\">" : "");
 		echo "\n";
 	}
 }
 
 /** Move fields up and down or add field
 * @param array
-* @return null
+* @return bool
 */
 function process_fields(&$fields) {
-	ksort($fields);
 	$offset = 0;
 	if ($_POST["up"]) {
 		$last = 0;
@@ -285,8 +304,7 @@ function process_fields(&$fields) {
 			}
 			$offset++;
 		}
-	}
-	if ($_POST["down"]) {
+	} elseif ($_POST["down"]) {
 		$found = false;
 		foreach ($fields as $key => $field) {
 			if (isset($field["field"]) && $found) {
@@ -299,11 +317,13 @@ function process_fields(&$fields) {
 			}
 			$offset++;
 		}
-	}
-	$fields = array_values($fields);
-	if ($_POST["add"]) {
+	} elseif ($_POST["add"]) {
+		$fields = array_values($fields);
 		array_splice($fields, key($_POST["add"]), 0, array(array()));
+	} elseif (!$_POST["drop_col"]) {
+		return false;
 	}
+	return true;
 }
 
 /** Callback used in routine()
@@ -336,48 +356,117 @@ function grant($grant, $privileges, $columns, $on) {
 }
 
 /** Drop old object and create a new one
-* @param string drop query
-* @param string create query
+* @param string drop old object query
+* @param string create new object query
+* @param string drop new object query
+* @param string create test object query
+* @param string drop test object query
 * @param string
 * @param string
 * @param string
 * @param string
 * @param string
-* @return bool dropped
+* @param string
+* @return null redirect in success
 */
-function drop_create($drop, $create, $location, $message_drop, $message_alter, $message_create, $name) {
+function drop_create($drop, $create, $drop_created, $test, $drop_test, $location, $message_drop, $message_alter, $message_create, $old_name, $new_name) {
 	if ($_POST["drop"]) {
-		return query_redirect($drop, $location, $message_drop, true, !$_POST["dropped"]);
+		query_redirect($drop, $location, $message_drop);
+	} elseif ($old_name == "") {
+		query_redirect($create, $location, $message_create);
+	} elseif ($old_name != $new_name) {
+		$created = queries($create);
+		queries_redirect($location, $message_alter, $created && queries($drop));
+		if ($created) {
+			queries($drop_created);
+		}
+	} else {
+		queries_redirect(
+			$location,
+			$message_alter,
+			queries($test) && queries($drop_test) && queries($drop) && queries($create)
+		);
 	}
-	$dropped = $name != "" && ($_POST["dropped"] || queries($drop));
-	$created = queries($create);
-	if (!queries_redirect($location, ($name != "" ? $message_alter : $message_create), $created) && $dropped) {
-		redirect(null, $message_drop);
+}
+
+/** Generate SQL query for creating trigger
+* @param string
+* @param array result of trigger()
+* @return string
+*/
+function create_trigger($on, $row) {
+	global $jush;
+	$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)
+		. rtrim(" $row[Type]\n$row[Statement]", ";")
+		. ";"
+	;
+}
+
+/** Generate SQL query for creating routine
+* @param string "PROCEDURE" or "FUNCTION"
+* @param array result of routine()
+* @return string
+*/
+function create_routine($routine, $row) {
+	global $inout;
+	$set = array();
+	$fields = (array) $row["fields"];
+	ksort($fields); // enforce fields order
+	foreach ($fields as $field) {
+		if ($field["field"] != "") {
+			$set[] = (preg_match("~^($inout)\$~", $field["inout"]) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
+		}
 	}
-	return $dropped;
+	return "CREATE $routine "
+		. idf_escape(trim($row["name"]))
+		. " (" . implode(", ", $set) . ")"
+		. (isset($_GET["function"]) ? " RETURNS" . process_type($row["returns"], "CHARACTER SET") : "")
+		. ($row["language"] ? " LANGUAGE $row[language]" : "")
+		. rtrim("\n$row[definition]", ";")
+		. ";"
+	;
 }
 
 /** Remove current user definer from SQL command
- * @param string
- * @return string
- */
+* @param string
+* @return string
+*/
 function remove_definer($query) {
 	return preg_replace('~^([A-Z =]+) DEFINER=`' . preg_replace('~@(.*)~', '`@`(%|\\1)', logged_user()) . '`~', '\\1', $query); //! proper escaping of user
 }
 
-/** Get string to add a file in TAR
-* @param string
-* @param string
+/** Format foreign key to use in SQL query
+* @param array ("table" => string, "source" => array, "target" => array, "on_delete" => one of $on_actions, "on_update" => one of $on_actions)
 * @return string
 */
-function tar_file($filename, $contents) {
-	$return = pack("a100a8a8a8a12a12", $filename, 644, 0, 0, decoct(strlen($contents)), decoct(time()));
+function format_foreign_key($foreign_key) {
+	global $on_actions;
+	return " FOREIGN KEY (" . implode(", ", array_map('idf_escape', $foreign_key["source"])) . ") REFERENCES " . table($foreign_key["table"])
+		. " (" . implode(", ", array_map('idf_escape', $foreign_key["target"])) . ")" //! reuse $name - check in older MySQL versions
+		. (preg_match("~^($on_actions)\$~", $foreign_key["on_delete"]) ? " ON DELETE $foreign_key[on_delete]" : "")
+		. (preg_match("~^($on_actions)\$~", $foreign_key["on_update"]) ? " ON UPDATE $foreign_key[on_update]" : "")
+	;
+}
+
+/** Add a file to TAR
+* @param string
+* @param TmpFile
+* @return null prints the output
+*/
+function tar_file($filename, $tmp_file) {
+	$return = pack("a100a8a8a8a12a12", $filename, 644, 0, 0, decoct($tmp_file->size), decoct(time()));
 	$checksum = 8*32; // space for checksum itself
 	for ($i=0; $i < strlen($return); $i++) {
 		$checksum += ord($return[$i]);
 	}
 	$return .= sprintf("%06o", $checksum) . "\0 ";
-	return $return . str_repeat("\0", 512 - strlen($return)) . $contents . str_repeat("\0", 511 - (strlen($contents) + 511) % 512);
+	echo $return;
+	echo str_repeat("\0", 512 - strlen($return));
+	$tmp_file->send();
+	echo str_repeat("\0", 511 - ($tmp_file->size + 511) % 512);
 }
 
 /** Get INI bytes value
@@ -393,3 +482,57 @@ function ini_bytes($ini) {
 	}
 	return $val;
 }
+
+/** Create link to database documentation
+* @param array $jush => $path
+* @return string HTML code
+*/
+function doc_link($paths) {
+	global $jush, $connection;
+	$urls = array(
+		'sql' => "http://dev.mysql.com/doc/refman/" . substr($connection->server_info, 0, 3) . "/en/",
+		'sqlite' => "http://www.sqlite.org/",
+		'pgsql' => "http://www.postgresql.org/docs/" . substr($connection->server_info, 0, 3) . "/static/",
+		'mssql' => "http://msdn.microsoft.com/library/",
+		'oracle' => "http://download.oracle.com/docs/cd/B19306_01/server.102/b14200/",
+	);
+	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);
+}
+
+/** Print SET NAMES if utf8mb4 might be needed
+* @param string
+* @return null
+*/
+function set_utf8mb4($create) {
+  global $connection;
+	static $set = false;
+	if (!$set && preg_match('~\butf8mb4~i', $create)) { // possible false positive
+		$set = true;
+		echo "SET NAMES " . charset($connection) . ";\n\n";
+	}
+}

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
@@ -61,16 +69,24 @@ function remove_slashes($process, $filter = false) {
 */
 function bracket_escape($idf, $back = false) {
 	// escape brackets inside name="x[]"
-	static $trans = array(':' => ':1', ']' => ':2', '[' => ':3');
+	static $trans = array(':' => ':1', ']' => ':2', '[' => ':3', '"' => ':4');
 	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
@@ -95,14 +111,18 @@ function nl_br($string) {
 * @param bool
 * @param string
 * @param string
-* @param bool
+* @param string
+* @param string
 * @return string
 */
-function checkbox($name, $value, $checked, $label = "", $onclick = "", $jsonly = false) {
-	static $id = 0;
-	$id++;
-	$return = "<input type='checkbox' name='$name' value='" . h($value) . "'" . ($checked ? " checked" : "") . ($onclick ? ' onclick="' . h($onclick) . '"' : '') . ($jsonly ? " class='jsonly'" : "") . " id='checkbox-$id'>";
-	return ($label != "" ? "<label for='checkbox-$id'>$return" . h($label) . "</label>" : $return);
+function checkbox($name, $value, $checked, $label = "", $onclick = "", $class = "", $labelled_by = "") {
+	$return = "<input type='checkbox' name='$name' value='" . h($value) . "'"
+		. ($checked ? " checked" : "")
+		. ($labelled_by ? " aria-labelledby='$labelled_by'" : "")
+		. ($onclick ? ' onclick="' . h($onclick) . '"' : '')
+		. ">"
+	;
+	return ($label != "" || $class ? "<label" . ($class ? " class='$class'" : "") . ">$return" . h($label) . "</label>" : $return);
 }
 
 /** Generate list of HTML options
@@ -134,11 +154,15 @@ function optionlist($options, $selected = null, $use_keys = false) {
 * @param array
 * @param string
 * @param string true for no onchange, false for radio
+* @param string
 * @return string
 */
-function html_select($name, $options, $value = "", $onchange = true) {
+function html_select($name, $options, $value = "", $onchange = true, $labelled_by = "") {
 	if ($onchange) {
-		return "<select name='" . h($name) . "'" . (is_string($onchange) ? ' onchange="' . h($onchange) . '"' : "") . ">" . optionlist($options, $value) . "</select>";
+		return "<select name='" . h($name) . "'"
+			. (is_string($onchange) ? ' onchange="' . h($onchange) . '"' : "")
+			. ($labelled_by ? " aria-labelledby='$labelled_by'" : "")
+			. ">" . optionlist($options, $value) . "</select>";
 	}
 	$return = "";
 	foreach ($options as $key => $val) {
@@ -147,12 +171,25 @@ function html_select($name, $options, $value = "", $onchange = true) {
 	return $return;
 }
 
+/** Generate HTML <select> or <input> if $options are empty
+ * @param string
+ * @param array
+ * @param string
+ * @param string
+ * @return string
+ */
+function select_input($attrs, $options, $value = "", $placeholder = "") {
+	return ($options
+		? "<select$attrs><option value=''>$placeholder" . optionlist($options, $value, true) . "</select>"
+		: "<input$attrs size='10' value='" . h($value) . "' placeholder='$placeholder'>"
+	);
+}
+
 /** Get onclick confirmation
-* @param string JavaScript expression
 * @return string
 */
-function confirm($count = "") {
-	return " onclick=\"return confirm('" . lang('Are you sure?') . ($count ? " (' + $count + ')" : "") . "');\"";
+function confirm() {
+	return " onclick=\"return confirm('" . lang('Are you sure?') . "');\"";
 }
 
 /** Print header for hidden fieldset (close by </div></fieldset>)
@@ -168,10 +205,11 @@ function print_fieldset($id, $legend, $visible = false, $onclick = "") {
 
 /** Return class='active' if $bold is true
 * @param bool
+* @param string
 * @return string
 */
-function bold($bold) {
-	return ($bold ? " class='active'" : "");
+function bold($bold, $class = "") {
+	return ($bold ? " class='active $class'" : ($class ? " class='$class'" : ""));
 }
 
 /** Generate class for odd rows
@@ -205,7 +243,7 @@ function json_row($key, $val = null) {
 		echo "{";
 	}
 	if ($key != "") {
-		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\"\\") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\") . '"' : 'undefined');
+		echo ($first ? "" : ",") . "\n\t\"" . addcslashes($key, "\r\n\t\"\\/") . '": ' . ($val !== null ? '"' . addcslashes($val, "\r\n\"\\/") . '"' : 'null');
 		$first = false;
 	} else {
 		echo "\n}\n";
@@ -219,7 +257,7 @@ function json_row($key, $val = null) {
 */
 function ini_bool($ini) {
 	$val = ini_get($ini);
-	return (eregi('^(on|true|yes)$', $val) || (int) $val); // boolean values set by php_value are strings
+	return (preg_match('~^(on|true|yes)$~i', $val) || (int) $val); // boolean values set by php_value are strings
 }
 
 /** Check if SID is neccessary
@@ -233,6 +271,34 @@ function sid() {
 	return $return;
 }
 
+/** 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
@@ -262,15 +328,18 @@ function get_vals($query, $column = 0) {
 /** Get keys from first column and values from second
 * @param string
 * @param Min_DB
+* @param float
 * @return array
 */
-function get_key_vals($query, $connection2 = null) {
+function get_key_vals($query, $connection2 = null, $timeout = 0) {
 	global $connection;
 	if (!is_object($connection2)) {
 		$connection2 = $connection;
 	}
 	$return = array();
+	$connection2->timeout = $timeout;
 	$result = $connection2->query($query);
+	$connection2->timeout = 0;
 	if (is_object($result)) {
 		while ($row = $result->fetch_row()) {
 			$return[$row[0]] = $row[1];
@@ -303,11 +372,11 @@ function get_rows($query, $connection2 = null, $error = "<p class='error'>") {
 /** Find unique identifier of a row
 * @param array
 * @param array result of indexes()
-* @return array
+* @return array or null if there is no unique identifier
 */
 function unique_array($row, $indexes) {
 	foreach ($indexes as $index) {
-		if (ereg("PRIMARY|UNIQUE", $index["type"])) {
+		if (preg_match("~PRIMARY|UNIQUE~", $index["type"])) {
 			$return = array();
 			foreach ($index["columns"] as $key) {
 				if (!isset($row[$key])) { // NULL is ambiguous
@@ -318,73 +387,102 @@ function unique_array($row, $indexes) {
 			return $return;
 		}
 	}
-	$return = array();
-	foreach ($row as $key => $val) {
-		if (!preg_match('~^(COUNT\\((\\*|(DISTINCT )?`(?:[^`]|``)+`)\\)|(AVG|GROUP_CONCAT|MAX|MIN|SUM)\\(`(?:[^`]|``)+`\\))$~', $key)) { //! columns looking like functions
-			$return[$key] = $val;
-		}
+}
+
+/** 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 $return;
+	return idf_escape($key);
 }
 
 /** Create SQL condition from parsed query string
 * @param array parsed query string
+* @param array
 * @return string
 */
-function where($where) {
-	global $jush;
+function where($where, $fields = array()) {
+	global $connection, $jush;
 	$return = array();
 	foreach ((array) $where["where"] as $key => $val) {
-		$return[] = idf_escape(bracket_escape($key, 1)) // 1 - back
-			. (($jush == "sql" && ereg('\\.', $val)) || $jush == "mssql" ? " LIKE " . exact_value(addcslashes($val, "%_\\")) : " = " . exact_value($val)) // LIKE because of floats, but slow with ints, in MS SQL because of text
+		$key = bracket_escape($key, 1); // 1 - back
+		$column = escape_key($key);
+		$return[] = $column
+			. ($jush == "sql" && preg_match('~^[0-9]*\\.[0-9]*$~', $val) ? " LIKE " . q(addcslashes($val, "%_\\"))
+				: ($jush == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $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('~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[] = idf_escape($key) . " IS NULL";
+		$return[] = escape_key($key) . " IS NULL";
 	}
 	return implode(" AND ", $return);
 }
 
 /** Create SQL condition from query string
 * @param string
+* @param array
 * @return string
 */
-function where_check($val) {
+function where_check($val, $fields = array()) {
 	parse_str($val, $check);
 	remove_slashes(array(&$check));
-	return where($check);
+	return where($check, $fields);
 }
 
 /** Create query string where condition from value
 * @param int condition order
 * @param string column identifier
 * @param string
-* @return string
+* @param string
 * @return string
 */
 function where_link($i, $column, $value, $operator = "=") {
 	return "&where%5B$i%5D%5Bcol%5D=" . urlencode($column) . "&where%5B$i%5D%5Bop%5D=" . urlencode(($value !== null ? $operator : "IS NULL")) . "&where%5B$i%5D%5Bval%5D=" . urlencode($value);
 }
 
-/** Set cookie valid for 1 month
+/** Get select clause for convertible fields
+* @param array
+* @param array
+* @param array
+* @return string
+*/
+function convert_fields($columns, $fields, $select = array()) {
+	$return = "";
+	foreach ($columns as $key => $val) {
+		if ($select && !in_array(idf_escape($key), $select)) {
+			continue;
+		}
+		$as = convert_field($fields[$key]);
+		if ($as) {
+			$return .= ", $as AS " . idf_escape($key);
+		}
+	}
+	return $return;
+}
+
+/** Set cookie valid on current path
 * @param string
 * @param string
+* @param int number of seconds, 0 for session cookie
 * @return bool
 */
-function cookie($name, $value) {
+function cookie($name, $value, $lifetime = 2592000) { // 2592000 - 30 days
 	global $HTTPS;
-	$params = array(
-		$name,
-		(ereg("\n", $value) ? "" : $value), // HTTP Response Splitting protection in PHP < 5.1.2
-		time() + 2592000, // 2592000 - 30 days
-		preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]),
-		"",
-		$HTTPS
-	);
-	if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
-		$params[] = true; // HttpOnly
-	}
-	return call_user_func_array('setcookie', $params);
+	return header("Set-Cookie: $name=" . urlencode($value)
+		. ($lifetime ? "; expires=" . gmdate("D, d M Y H:i:s", time() + $lifetime) . " GMT" : "")
+		. "; path=" . preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"])
+		. ($HTTPS ? "; secure" : "")
+		. "; HttpOnly; SameSite=lax",
+		false);
 }
 
 /** Restart stopped session
@@ -429,12 +527,12 @@ function set_session($key, $val) {
 * @param string
 * @return string
 */
-function auth_url($driver, $server, $username, $db = null) {
+function auth_url($vendor, $server, $username, $db = null) {
 	global $drivers;
 	preg_match('~([^?]*)\\??(.*)~', remove_from_uri(implode("|", array_keys($drivers)) . "|username|" . ($db !== null ? "db|" : "") . session_name()), $match);
 	return "$match[1]?"
 		. (sid() ? SID . "&" : "")
-		. ($driver != "server" || $server != "" ? urlencode($driver) . "=" . urlencode($server) . "&" : "")
+		. ($vendor != "server" || $server != "" ? urlencode($vendor) . "=" . urlencode($server) . "&" : "")
 		. "username=" . urlencode($username)
 		. ($db != "" ? "&db=" . urlencode($db) : "")
 		. ($match[2] ? "&$match[2]" : "")
@@ -474,16 +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;
 	if ($execute) {
+		$start = microtime(true);
 		$failed = !$connection->query($query);
+		$time = format_time($start);
 	}
 	$sql = "";
 	if ($query) {
-		$sql = $adminer->messageQuery("$query;");
+		$sql = $adminer->messageQuery($query, $time);
 	}
 	if ($failed) {
 		$error = error() . $sql;
@@ -496,17 +597,21 @@ 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);
 	}
-	$queries[] = (ereg(';$', $query) ? "DELIMITER ;;\n$query;\nDELIMITER " : $query);
+	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);
 }
 
@@ -532,7 +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 elapsed time
+* @param float output of microtime(true)
+* @return string HTML code
+*/
+function format_time($start) {
+	return lang('%.3f s', max(0, microtime(true) - $start));
 }
 
 /** Remove parameter from query string
@@ -545,10 +659,14 @@ function remove_from_uri($param = "") {
 
 /** Generate page number for pagination
 * @param int
+* @param int
 * @return string
 */
 function pagination($page, $current) {
-	return " " . ($page == $current ? $page + 1 : '<a href="' . h(remove_from_uri("page") . ($page ? "&page=$page" : "")) . '">' . ($page + 1) . "</a>");
+	return " " . ($page == $current
+		? $page + 1
+		: '<a href="' . h(remove_from_uri("page") . ($page ? "&page=$page" . ($_GET["next"] ? "&next=" . urlencode($_GET["next"]) : "") : "")) . '">' . ($page + 1) . "</a>"
+	);
 }
 
 /** Get file contents from $_FILES
@@ -558,21 +676,36 @@ function pagination($page, $current) {
 */
 function get_file($key, $decompress = false) {
 	$file = $_FILES[$key];
-	if (!$file || $file["error"]) {
-		return $file["error"];
+	if (!$file) {
+		return null;
 	}
-	$return = file_get_contents($decompress && ereg('\\.gz$', $file["name"]) ? "compress.zlib://$file[tmp_name]"
-		: ($decompress && ereg('\\.bz2$', $file["name"]) ? "compress.bzip2://$file[tmp_name]"
-		: $file["tmp_name"]
-	)); //! may not be reachable because of open_basedir
-	if ($decompress) {
-		$start = substr($return, 0, 3);
-		if (function_exists("iconv") && ereg("^\xFE\xFF|^\xFF\xFE", $start, $regs)) { // not ternary operator to save memory
-			$return = iconv("utf-16", "utf-8", $return);
-		} elseif ($start == "\xEF\xBB\xBF") { // UTF-8 BOM
-			$return = substr($return, 3);
+	foreach ($file as $key => $val) {
+		$file[$key] = (array) $val;
+	}
+	$return = '';
+	foreach ($file["error"] as $key => $error) {
+		if ($error) {
+			return $error;
+		}
+		$name = $file["name"][$key];
+		$tmp_name = $file["tmp_name"][$key];
+		$content = file_get_contents($decompress && preg_match('~\\.gz$~', $name)
+			? "compress.zlib://$tmp_name"
+			: $tmp_name
+		); //! may not be reachable because of open_basedir
+		if ($decompress) {
+			$start = substr($content, 0, 3);
+			if (function_exists("iconv") && preg_match("~^\xFE\xFF|^\xFF\xFE~", $start, $regs)) { // not ternary operator to save memory
+				$content = iconv("utf-16", "utf-8", $content);
+			} elseif ($start == "\xEF\xBB\xBF") { // UTF-8 BOM
+				$content = substr($content, 3);
+			}
+			$return .= $content . "\n\n";
+		} else {
+			$return .= $content;
 		}
 	}
+	//! support SQL files not ending with semicolon
 	return $return;
 }
 
@@ -611,12 +744,20 @@ function is_utf8($val) {
 * @return string escaped string with appended ...
 */
 function shorten_utf8($string, $length = 80, $suffix = "") {
-	if (!preg_match("(^(" . repeat_pattern("[\t\r\n -\x{FFFF}]", $length) . ")($)?)u", $string, $match)) { // ~s causes trash in $match[2] under some PHP versions, (.|\n) is slow
+	if (!preg_match("(^(" . repeat_pattern("[\t\r\n -\x{10FFFF}]", $length) . ")($)?)u", $string, $match)) { // ~s causes trash in $match[2] under some PHP versions, (.|\n) is slow
 		preg_match("(^(" . repeat_pattern("[\t\r\n -~]", $length) . ")($)?)", $string, $match);
 	}
 	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
@@ -633,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) . '">';
 		}
 	}
 }
@@ -652,6 +795,16 @@ function hidden_fields_get() {
 	echo '<input type="hidden" name="username" value="' . h($_GET["username"]) . '">';
 }
 
+/** Get status of a single table and fall back to name on error
+* @param string
+* @param bool
+* @return array
+*/
+function table_status1($table, $fast = false) {
+	$return = table_status($table, $fast);
+	return ($return ? $return : array("Name" => $table));
+}
+
 /** Find out foreign keys for each column
 * @param string
 * @return array array($col => array())
@@ -694,9 +847,17 @@ function enum_input($type, $attrs, $field, $value, $empty = null) {
 * @return null
 */
 function input($field, $value, $function) {
-	global $types, $adminer, $jush;
+	global $connection, $types, $adminer, $jush;
 	$name = h(bracket_escape($field["field"]));
 	echo "<td class='function'>";
+	if (is_array($value) && !$function) {
+		$args = array($value);
+		if (version_compare(PHP_VERSION, 5.4) >= 0) {
+			$args[] = JSON_PRETTY_PRINT;
+		}
+		$value = call_user_func_array('json_encode', $args); //! requires PHP 5.2
+		$function = "json";
+	}
 	$reset = ($jush == "mssql" && $field["auto_increment"]);
 	if ($reset && !$_POST["save"]) {
 		$function = null;
@@ -713,12 +874,19 @@ function input($field, $value, $function) {
 			}
 			$first++;
 		}
-		$onchange = ($first ? " onchange=\"var f = this.form['function[" . h(js_escape(bracket_escape($field["field"]))) . "]']; if ($first > f.selectedIndex) f.selectedIndex = $first;\"" : "");
+		$onchange = ($first ? " onchange=\"var f = this.form['function[" . h(js_escape(bracket_escape($field["field"]))) . "]']; if ($first > f.selectedIndex) f.selectedIndex = $first;\" onkeyup='keyupChange.call(this);'" : "");
 		$attrs .= $onchange;
-		echo (count($functions) > 1 ? html_select("function[$name]", $functions, $function === null || in_array($function, $functions) || isset($functions[$function]) ? $function : "", "functionChange(this);") : nbsp(reset($functions))) . '<td>';
+		$has_function = (in_array($function, $functions) || isset($functions[$function]));
+		echo (count($functions) > 1
+			? "<select name='function[$name]' onchange='functionChange(this);'" . on_help("getTarget(event).value.replace(/^SQL\$/, '')", 1) . ">" . optionlist($functions, $function === null || $has_function ? $function : "") . "</select>"
+			: nbsp(reset($functions))
+		) . '<td>';
 		$input = $adminer->editInput($_GET["edit"], $field, $attrs, $value); // usage in call is without a table
 		if ($input != "") {
 			echo $input;
+		} elseif (preg_match('~bool~', $field["type"])) {
+			echo "<input type='hidden'$attrs value='0'>" .
+				"<input type='checkbox'" . (in_array(strtolower($value), array('1',  't',  'true',  'y',  'yes',  'on')) ? " checked='checked'" : "") . "$attrs value='1'>";
 		} elseif ($field["type"] == "set") { //! 64 bits
 			preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
 			foreach ($matches[1] as $i => $val) {
@@ -726,9 +894,9 @@ function input($field, $value, $function) {
 				$checked = (is_int($value) ? ($value >> $i) & 1 : in_array($val, explode(",", $value), true));
 				echo " <label><input type='checkbox' name='fields[$name][$i]' value='" . (1 << $i) . "'" . ($checked ? ' checked' : '') . "$onchange>" . h($adminer->editVal($val, $field)) . '</label>';
 			}
-		} elseif (ereg('blob|bytea|raw|file', $field["type"]) && ini_bool("file_uploads")) {
+		} elseif (preg_match('~blob|bytea|raw|file~', $field["type"]) && ini_bool("file_uploads")) {
 			echo "<input type='file' name='fields-$name'$onchange>";
-		} elseif (($text = ereg('text|lob', $field["type"])) || ereg("\n", $value)) {
+		} elseif (($text = preg_match('~text|lob~', $field["type"])) || preg_match("~\n~", $value)) {
 			if ($text && $jush != "sqlite") {
 				$attrs .= " cols='50' rows='12'";
 			} else {
@@ -736,17 +904,28 @@ function input($field, $value, $function) {
 				$attrs .= " cols='30' rows='$rows'" . ($rows == 1 ? " style='height: 1.2em;'" : ""); // 1.2em - line-height
 			}
 			echo "<textarea$attrs>" . h($value) . '</textarea>';
+		} elseif ($function == "json" || preg_match('~^jsonb?$~', $field["type"])) {
+			echo "<textarea$attrs cols='50' rows='12' class='jush-js'>" . h($value) . '</textarea>';
 		} else {
 			// int(3) is only a display hint
-			$maxlength = (!ereg('int', $field["type"]) && preg_match('~^(\\d+)(,(\\d+))?$~', $field["length"], $match) ? ((ereg("binary", $field["type"]) ? 2 : 1) * $match[1] + ($match[3] ? 1 : 0) + ($match[2] && !$field["unsigned"] ? 1 : 0)) : ($types[$field["type"]] ? $types[$field["type"]] + ($field["unsigned"] ? 0 : 1) : 0));
-			echo "<input value='" . h($value) . "'" . ($maxlength ? " maxlength='$maxlength'" : "") . (ereg('char|binary', $field["type"]) && $maxlength > 20 ? " size='40'" : "") . "$attrs>";
+			$maxlength = (!preg_match('~int~', $field["type"]) && preg_match('~^(\\d+)(,(\\d+))?$~', $field["length"], $match) ? ((preg_match("~binary~", $field["type"]) ? 2 : 1) * $match[1] + ($match[3] ? 1 : 0) + ($match[2] && !$field["unsigned"] ? 1 : 0)) : ($types[$field["type"]] ? $types[$field["type"]] + ($field["unsigned"] ? 0 : 1) : 0));
+			if ($jush == 'sql' && $connection->server_info >= 5.6 && preg_match('~time~', $field["type"])) {
+				$maxlength += 7; // microtime
+			}
+			// type='date' and type='time' display localized value which may be confusing, type='datetime' uses 'T' as date and time separator
+			echo "<input"
+				. ((!$has_function || $function === "") && preg_match('~(?<!o)int~', $field["type"]) && !preg_match('~\[\]~', $field["full_type"]) ? " type='number'" : "")
+				. " value='" . h($value) . "'" . ($maxlength ? " data-maxlength='$maxlength'" : "")
+				. (preg_match('~char|binary~', $field["type"]) && $maxlength > 20 ? " size='40'" : "")
+				. "$attrs>"
+			;
 		}
 	}
 }
 
 /** Process edit input field
 * @param one field from fields()
-* @return string
+* @return string or false to leave the original value
 */
 function process_input($field) {
 	global $adminer;
@@ -774,7 +953,15 @@ function process_input($field) {
 	if ($field["type"] == "set") {
 		return array_sum((array) $value);
 	}
-	if (ereg('blob|bytea|raw|file', $field["type"]) && ini_bool("file_uploads")) {
+	if ($function == "json") {
+		$function = "";
+		$value = json_decode($value, true);
+		if (!is_array($value)) {
+			return false; //! report errors
+		}
+		return $value;
+	}
+	if (preg_match('~blob|bytea|raw|file~', $field["type"]) && ini_bool("file_uploads")) {
 		$file = get_file("fields-$idf");
 		if (!is_string($file)) {
 			return false; //! report errors
@@ -784,6 +971,31 @@ function process_input($field) {
 	return $adminer->processInput($field, $value, $function);
 }
 
+/** Compute fields() from $_POST edit data
+* @return array
+*/
+function fields_from_edit() {
+	global $driver;
+	$return = array();
+	foreach ((array) $_POST["field_keys"] as $key => $val) {
+		if ($val != "") {
+			$val = bracket_escape($val);
+			$_POST["function"][$val] = $_POST["field_funs"][$key];
+			$_POST["fields"][$val] = $_POST["field_vals"][$key];
+		}
+	}
+	foreach ((array) $_POST["fields"] as $key => $val) {
+		$name = bracket_escape($key, 1); // 1 - back
+		$return[$name] = array(
+			"field" => $name,
+			"privileges" => array("insert" => 1, "update" => 1),
+			"null" => 1,
+			"auto_increment" => ($key == $driver->primary),
+		);
+	}
+	return $return;
+}
+
 /** Print results of search in all tables
 * @uses $_GET["where"][0]
 * @uses $_POST["tables"]
@@ -794,7 +1006,7 @@ function search_tables() {
 	$_GET["where"][0]["op"] = "LIKE %%";
 	$_GET["where"][0]["val"] = $_POST["query"];
 	$found = false;
-	foreach (table_status() as $table => $table_status) {
+	foreach (table_status('', true) as $table => $table_status) {
 		$name = $adminer->tableName($table_status);
 		if (isset($table_status["Engine"]) && $name != "" && (!$_POST["tables"] || in_array($table, $_POST["tables"]))) {
 			$result = $connection->query("SELECT" . limit("1 FROM " . table($table), " WHERE " . implode(" AND ", $adminer->selectSearchProcess(fields($table), array())), 1));
@@ -822,9 +1034,11 @@ function dump_headers($identifier, $multi_table = false) {
 	$return = $adminer->dumpHeaders($identifier, $multi_table);
 	$output = $_POST["output"];
 	if ($output != "text") {
-		header("Content-Disposition: attachment; filename=" . $adminer->dumpFilename($identifier) . ".$return" . ($output != "file" && !ereg('[^0-9a-z]', $output) ? ".$output" : ""));
+		header("Content-Disposition: attachment; filename=" . $adminer->dumpFilename($identifier) . ".$return" . ($output != "file" && !preg_match('~[^0-9a-z]~', $output) ? ".$output" : ""));
 	}
 	session_write_close();
+	ob_flush();
+	flush();
 	return $return;
 }
 
@@ -850,37 +1064,101 @@ 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
-* @return string or false if the file can not be created
+/** Get path of the temporary directory
+* @return string
 */
-function password_file() {
-	$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
-	if ($return) {
+	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) {
-		$return = md5(uniqid(mt_rand(), true));
+		chmod($filename, 0660);
+		$return = rand_string();
 		fwrite($fp, $return);
 		fclose($fp);
 	}
 	return $return;
 }
 
+/** Get a random string
+* @return string 32 hexadecimal characters
+*/
+function rand_string() {
+	return md5(uniqid(mt_rand(), true));
+}
+
+/** Format value to use in select
+* @param string
+* @param string
+* @param array
+* @param int
+* @return string HTML
+*/
+function select_value($val, $link, $field, $text_length) {
+	global $adminer, $HTTPS;
+	if (is_array($val)) {
+		$return = "";
+		foreach ($val as $k => $v) {
+			$return .= "<tr>"
+				. ($val != array_values($val) ? "<th>" . h($k) : "")
+				. "<td>" . select_value($v, $link, $field, $text_length)
+			;
+		}
+		return "<table cellspacing='0'>$return</table>";
+	}
+	if (!$link) {
+		$link = $adminer->selectLink($val, $field);
+	}
+	if ($link === null) {
+		if (is_mail($val)) {
+			$link = "mailto:$val";
+		}
+		if ($protocol = is_url($val)) {
+			$link = (($protocol == "http" && $HTTPS) || preg_match('~WebKit|Firefox~i', $_SERVER["HTTP_USER_AGENT"]) // WebKit supports noreferrer since 2009, Firefox since version 38
+				? $val // HTTP links from HTTPS pages don't receive Referer automatically
+				: "https://www.adminer.org/redirect/?url=" . urlencode($val) // intermediate page to hide Referer
+			);
+		}
+	}
+	$return = $adminer->editVal($val, $field);
+	if ($return !== null) {
+		if ($return === "") { // === - may be int
+			$return = "&nbsp;";
+		} 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);
+		}
+	}
+	return $adminer->selectVal($return, $link, $field, $val);
+}
+
 /** Check whether the string is e-mail address
 * @param string
 * @return bool
@@ -889,7 +1167,7 @@ function is_mail($email) {
 	$atom = '[-a-z0-9!#$%&\'*+/=?^_`{|}~]'; // characters of local-name
 	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component
 	$pattern = "$atom+(\\.$atom+)*@($domain?\\.)+$domain";
-	return preg_match("(^$pattern(,\\s*$pattern)*\$)i", $email);
+	return is_string($email) && preg_match("(^$pattern(,\\s*$pattern)*\$)i", $email);
 }
 
 /** Check whether the string is URL address
@@ -901,21 +1179,46 @@ function is_url($string) {
 	return (preg_match("~^(https?)://($domain?\\.)+$domain(:\\d+)?(/.*)?(\\?.*)?(#.*)?\$~i", $string, $match) ? strtolower($match[1]) : ""); //! restrict path, query and fragment characters
 }
 
+/** Check if field should be shortened
+* @param array
+* @return bool
+*/
+function is_shortable($field) {
+	return preg_match('~char|text|lob|geometry|point|linestring|polygon|string|bytea~', $field["type"]);
+}
+
+/** Get query to compute number of found rows
+* @param string
+* @param array
+* @param bool
+* @param array
+* @return string
+*/
+function count_rows($table, $where, $is_group, $group) {
+	global $jush;
+	$query = " FROM " . table($table) . ($where ? " WHERE " . implode(" AND ", $where) : "");
+	return ($is_group && ($jush == "sql" || count($group) == 1)
+		? "SELECT COUNT(DISTINCT " . implode(", ", $group) . ")$query"
+		: "SELECT COUNT(*)" . ($is_group ? " FROM (SELECT 1$query$group_by) x" : $query)
+	);
+}
+
 /** Run query which can be killed by AJAX call after timing out
 * @param string
-* @return Min_Result
+* @return array of strings
 */
 function slow_query($query) {
 	global $adminer, $token;
 	$db = $adminer->database();
+	$timeout = $adminer->queryTimeout();
 	if (support("kill") && is_object($connection2 = connect()) && ($db == "" || $connection2->select_db($db))) {
-		$kill = $connection2->result("SELECT CONNECTION_ID()"); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
+		$kill = $connection2->result(connection_id()); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
 		?>
 <script type="text/javascript">
 var timeout = setTimeout(function () {
 	ajax('<?php echo js_escape(ME); ?>script=kill', function () {
 	}, 'token=<?php echo $token; ?>&kill=<?php echo $kill; ?>');
-}, <?php echo 1000 * $adminer->queryTimeout(); ?>);
+}, <?php echo 1000 * $timeout; ?>);
 </script>
 <?php
 	} else {
@@ -923,7 +1226,7 @@ var timeout = setTimeout(function () {
 	}
 	ob_flush();
 	flush();
-	$return = @get_key_vals($query, $connection2); // @ - may be killed
+	$return = @get_key_vals($query, $connection2, $timeout); // @ - may be killed
 	if ($connection2) {
 		echo "<script type='text/javascript'>clearTimeout(timeout);</script>\n";
 		ob_flush();
@@ -932,6 +1235,22 @@ var timeout = setTimeout(function () {
 	return array_keys($return);
 }
 
+/** Generate BREACH resistant CSRF token
+* @return string
+*/
+function get_token() {
+	$rand = rand(1, 1e6);
+	return ($rand ^ $_SESSION["token"]) . ":$rand";
+}
+
+/** Verify if supplied CSRF token is valid
+* @return bool
+*/
+function verify_token() {
+	list($token, $rand) = explode(":", $_POST["token"]);
+	return ($rand ^ $_SESSION["token"]) == $token;
+}
+
 // used in compiled version
 function lzw_decompress($binary) {
 	// convert binary string to codes
@@ -969,3 +1288,109 @@ function lzw_decompress($binary) {
 	}
 	return $return;
 }
+
+/** Return events to display help on mouse over
+* @param string JS expression
+* @param bool JS expression
+* @return string
+*/
+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

@@ -3,33 +3,44 @@
 
 $langs = array(
 	'en' => 'English', // Jakub Vrána - http://www.vrana.cz
-	'cs' => 'Čeština', // Jakub Vrána - http://www.vrana.cz
-	'sk' => 'Slovenčina', // Ivan Suchy - http://www.ivansuchy.com, Juraj Krivda - http://www.jstudio.cz
-	'nl' => 'Nederlands', // Maarten Balliauw - http://blog.maartenballiauw.be
-	'es' => 'Español', // Klemens Häckel - http://clickdimension.wordpress.com
-	'de' => 'Deutsch', // Klemens Häckel - http://clickdimension.wordpress.com
-	'fr' => 'Français', // Francis Gagné, Aurélien Royer
-	'it' => 'Italiano', // Alessandro Fiorotto, Paolo Asperti
-	'et' => 'Eesti', // Priit Kallas
-	'hu' => 'Magyar', // Borsos Szilárd (Borsosfi) - http://www.borsosfi.hu, info@borsosfi.hu
-	'pl' => 'Polski', // Radosław Kowalewski - http://srsbiz.pl/
-	'ca' => 'Català', // Joan Llosas
-	'pt' => 'Português', // Gian Live - gian@live.com, Davi Alexandre davi@davialexandre.com.br
-	'sl' => 'Slovenski', // Matej Ferlan - www.itdinamik.com, matej.ferlan@itdinamik.com
-	'lt' => 'Lietuvių', // Paulius Leščinskas - http://www.lescinskas.lt
-	'tr' => 'Türkçe', // Bilgehan Korkmaz - turktron.com
-	'ro' => 'Limba Română', // .nick .messing - dot.nick.dot.messing@gmail.com
-	'id' => 'Bahasa Indonesia', // Ivan Lanin - http://ivan.lanin.org
-	'ru' => 'Русский язык', // Maksim Izmaylov
-	'uk' => 'Українська', // Valerii Kryzhov
-	'sr' => 'Српски', // Nikola Radovanović - cobisimo@gmail.com
-	'zh' => '简体中文', // Mr. Lodar
-	'zh-tw' => '繁體中文', // http://tzangms.com
-	'ja' => '日本語', // Hitoshi Ozawa - http://sourceforge.jp/projects/oss-ja-jpn/releases/
-	'ta' => 'த‌மிழ்', // G. Sampath Kumar, Chennai, India, sampathkumar11@gmail.com
-	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com
 	'ar' => 'العربية', // Y.M Amine - Algeria - nbr7@live.fr
-	'fa' => 'فارسی', // mojtaba barghbani - Iran - mbarghbani@gmail.com
+	'bg' => 'Български', // Deyan Delchev
+	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com
+	'bs' => 'Bosanski', // Emir Kurtovic
+	'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
+	'el' => 'Ελληνικά', // Dimitrios T. Tanis - jtanis@tanisfood.gr
+	'es' => 'Español', // Klemens Häckel - http://clickdimension.wordpress.com
+	'et' => 'Eesti', // Priit Kallas
+	'fa' => 'فارسی', // mojtaba barghbani - Iran - mbarghbani@gmail.com, Nima Amini - http://nimlog.com
+	'fi' => 'Suomi', // Finnish - Kari Eveli - http://www.lexitec.fi/
+	'fr' => 'Français', // Francis Gagné, Aurélien Royer
+	'gl' => 'Galego', // Eduardo Penabad Ramos
+	'hu' => 'Magyar', // Borsos Szilárd (Borsosfi) - http://www.borsosfi.hu, info@borsosfi.hu
+	'id' => 'Bahasa Indonesia', // Ivan Lanin - http://ivan.lanin.org
+	'it' => 'Italiano', // Alessandro Fiorotto, Paolo Asperti
+	'ja' => '日本語', // Hitoshi Ozawa - http://sourceforge.jp/projects/oss-ja-jpn/releases/
+	'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, RobertoPC - http://www.robertopc.com.br
+	'ro' => 'Limba Română', // .nick .messing - dot.nick.dot.messing@gmail.com
+	'ru' => 'Русский', // Maksim Izmaylov; Andre Polykanine - https://github.com/Oire/
+	'sk' => 'Slovenčina', // Ivan Suchy - http://www.ivansuchy.com, Juraj Krivda - http://www.jstudio.cz
+	'sl' => 'Slovenski', // Matej Ferlan - www.itdinamik.com, matej.ferlan@itdinamik.com
+	'sr' => 'Српски', // Nikola Radovanović - cobisimo@gmail.com
+	'ta' => 'த‌மிழ்', // G. Sampath Kumar, Chennai, India, sampathkumar11@gmail.com
+	'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
 );
 
 /** Get current language
@@ -52,11 +63,11 @@ function lang($idf, $number = null) {
 		$pos = ($number == 1 ? 0
 			: ($LANG == 'cs' || $LANG == 'sk' ? ($number && $number < 5 ? 1 : 2) // different forms for 1, 2-4, other
 			: ($LANG == 'fr' ? (!$number ? 0 : 1) // different forms for 0-1, other
-			: ($LANG == 'pl' ? ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2) // different forms for 1, 2-4, other
+			: ($LANG == 'pl' ? ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2) // different forms for 1, 2-4 except 12-14, other
 			: ($LANG == 'sl' ? ($number % 100 == 1 ? 0 : ($number % 100 == 2 ? 1 : ($number % 100 == 3 || $number % 100 == 4 ? 2 : 3))) // different forms for 1, 2, 3-4, other
 			: ($LANG == 'lt' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1, 12-19, other
-			: ($LANG == 'ru' || $LANG == 'sr' || $LANG == 'uk' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1, 2-4, other
-			: 1
+			: ($LANG == 'bs' || $LANG == 'ru' || $LANG == 'sr' || $LANG == 'uk' ? ($number % 10 == 1 && $number % 100 != 11 ? 0 : ($number % 10 > 1 && $number % 10 < 5 && $number / 10 % 10 != 1 ? 1 : 2)) // different forms for 1 except 11, 2-4 except 12-14, other
+			: 1 // different forms for 1, other
 		))))))); // http://www.gnu.org/software/gettext/manual/html_node/Plural-forms.html
 		$translation = $translation[$pos];
 	}
@@ -64,21 +75,21 @@ 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);
 }
 
 function switch_lang() {
-	global $LANG, $langs, $token;
+	global $LANG, $langs;
 	echo "<form action='' method='post'>\n<div id='lang'>";
 	echo lang('Language') . ": " . html_select("lang", $langs, $LANG, "this.form.submit();");
 	echo " <input type='submit' value='" . lang('Use') . "' class='hidden'>\n";
-	echo "<input type='hidden' name='token' value='$token'>\n";
+	echo "<input type='hidden' name='token' value='" . get_token() . "'>\n"; // $token may be empty in auth.inc.php
 	echo "</div>\n</form>\n";
 }
 
-if (isset($_POST["lang"]) && $_SESSION["token"] == $_POST["token"]) { // $token and $error not yet available
+if (isset($_POST["lang"]) && verify_token()) { // $error not yet available
 	cookie("adminer_lang", $_POST["lang"]);
 	$_SESSION["lang"] = $_POST["lang"]; // cookies may be disabled
 	$_SESSION["translations"] = array(); // used in compiled version

adminer/include/pdo.inc.php

@@ -2,22 +2,24 @@
 // PDO can be used in several database drivers
 if (extension_loaded('pdo')) {
 	/*abstract*/ class Min_PDO extends PDO {
-		var $_result, $server_info, $affected_rows, $error;
+		var $_result, $server_info, $affected_rows, $errno, $error;
 		
 		function __construct() {
 			global $adminer;
-			$pos = array_search("", $adminer->operators);
+			$pos = array_search("SQL", $adminer->operators);
 			if ($pos !== false) {
 				unset($adminer->operators[$pos]);
 			}
 		}
 		
-		function dsn($dsn, $username, $password, $exception_handler = 'auth_error') {
-			set_exception_handler($exception_handler); // try/catch is not compatible with PHP 4
-			parent::__construct($dsn, $username, $password);
-			restore_exception_handler();
+		function dsn($dsn, $username, $password) {
+			try {
+				parent::__construct($dsn, $username, $password);
+			} catch (Exception $ex) {
+				auth_error(h($ex->getMessage()));
+			}
 			$this->setAttribute(13, array('Min_PDOStatement')); // 13 - PDO::ATTR_STATEMENT_CLASS
-			$this->server_info = $this->getAttribute(4); // 4 - PDO::ATTR_SERVER_VERSION
+			$this->server_info = @$this->getAttribute(4); // 4 - PDO::ATTR_SERVER_VERSION
 		}
 		
 		/*abstract function select_db($database);*/
@@ -26,8 +28,7 @@ if (extension_loaded('pdo')) {
 			$result = parent::query($query);
 			$this->error = "";
 			if (!$result) {
-				$errorInfo = $this->errorInfo();
-				$this->error = $errorInfo[2];
+				list(, $this->errno, $this->error) = $this->errorInfo();
 				return false;
 			}
 			$this->store_result($result);
@@ -41,6 +42,9 @@ if (extension_loaded('pdo')) {
 		function store_result($result = null) {
 			if (!$result) {
 				$result = $this->_result;
+				if (!$result) {
+					return false;
+				}
 			}
 			if ($result->columnCount()) {
 				$result->num_rows = $result->rowCount(); // is not guaranteed to work with all drivers
@@ -51,6 +55,9 @@ if (extension_loaded('pdo')) {
 		}
 		
 		function next_result() {
+			if (!$this->_result) {
+				return false;
+			}
 			$this->_result->_offset = 0;
 			return @$this->_result->nextRowset(); // @ - PDO_PgSQL doesn't support it
 		}

adminer/include/tmpfile.inc.php

@@ -0,0 +1,22 @@
+<?php
+
+class TmpFile {
+	var $handler;
+	var $size;
+	
+	function __construct() {
+		$this->handler = tmpfile();
+	}
+	
+	function write($contents) {
+		$this->size += strlen($contents);
+		fwrite($this->handler, $contents);
+	}
+	
+	function send() {
+		fseek($this->handler, 0);
+		fpassthru($this->handler);
+		fclose($this->handler);
+	}
+	
+}

adminer/include/version.inc.php

@@ -1,2 +1,2 @@
 <?php
-$VERSION = "3.6.0";
+$VERSION = "4.3.1";

adminer/include/xxtea.inc.php

@@ -79,6 +79,9 @@ function decrypt_string($str, $key) {
 	if ($str == "") {
 		return "";
 	}
+	if (!$key) {
+		return false;
+	}
 	$key = array_values(unpack("V*", pack("H*", md5($key))));
 	$v = str2long($str, false);
 	$n = count($v) - 1;

adminer/index.php

@@ -1,15 +1,16 @@
 <?php
 /** Adminer - Compact database management
-* @link http://www.adminer.org/
-* @author Jakub Vrana, http://www.vrana.cz/
+* @link https://www.adminer.org/
+* @author Jakub Vrana, https://www.vrana.cz/
 * @copyright 2007 Jakub Vrana
 * @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)
 */
 
 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"]) {
@@ -21,6 +22,7 @@ if (isset($_GET["callf"])) {
 if (isset($_GET["function"])) {
 	$_GET["procedure"] = $_GET["function"];
 }
+
 if (isset($_GET["download"])) {
 	include "./download.inc.php";
 } elseif (isset($_GET["table"])) {
@@ -63,6 +65,8 @@ if (isset($_GET["download"])) {
 	include "./user.inc.php";
 } elseif (isset($_GET["processlist"])) {
 	include "./processlist.inc.php";
+} elseif (isset($_GET["replication"])) {
+	include "./replication.inc.php";
 } elseif (isset($_GET["select"])) {
 	include "./select.inc.php";
 } elseif (isset($_GET["variables"])) {

adminer/indexes.inc.php

@@ -1,47 +1,64 @@
 <?php
 $TABLE = $_GET["indexes"];
 $index_types = array("PRIMARY", "UNIQUE", "INDEX");
-$table_status = table_status($TABLE);
-if (eregi("MyISAM|M?aria", $table_status["Engine"])) {
+$table_status = table_status($TABLE, true);
+if (preg_match('~MyISAM|M?aria' . ($connection->server_info >= 5.6 ? '|InnoDB' : '') . '~i', $table_status["Engine"])) {
 	$index_types[] = "FULLTEXT";
 }
-$indexes = indexes($TABLE);
-if ($jush == "sqlite") { // doesn't support primary key
-	unset($index_types[0]);
-	unset($indexes[""]);
+if (preg_match('~MyISAM|M?aria' . ($connection->server_info >= 5.7 ? '|InnoDB' : '') . '~i', $table_status["Engine"])) {
+	$index_types[] = "SPATIAL";
 }
-if ($_POST && !$error && !$_POST["add"]) {
+$indexes = indexes($TABLE);
+$primary = array();
+if ($jush == "mongo") { // doesn't support primary key
+	$primary = $indexes["_id_"];
+	unset($index_types[0]);
+	unset($indexes["_id_"]);
+}
+$row = $_POST;
+
+if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"]) {
 	$alter = array();
-	foreach ($_POST["indexes"] as $index) {
+	foreach ($row["indexes"] as $index) {
 		$name = $index["name"];
 		if (in_array($index["type"], $index_types)) {
 			$columns = array();
 			$lengths = array();
+			$descs = array();
 			$set = array();
 			ksort($index["columns"]);
 			foreach ($index["columns"] as $key => $column) {
 				if ($column != "") {
 					$length = $index["lengths"][$key];
-					$set[] = idf_escape($column) . ($length ? "(" . (+$length) . ")" : "");
+					$desc = $index["descs"][$key];
+					$set[] = idf_escape($column) . ($length ? "(" . (+$length) . ")" : "") . ($desc ? " DESC" : "");
 					$columns[] = $column;
 					$lengths[] = ($length ? $length : null);
+					$descs[] = $desc;
 				}
 			}
+
 			if ($columns) {
 				$existing = $indexes[$name];
 				if ($existing) {
 					ksort($existing["columns"]);
 					ksort($existing["lengths"]);
-					if ($index["type"] == $existing["type"] && array_values($existing["columns"]) === $columns && (!$existing["lengths"] || array_values($existing["lengths"]) === $lengths)) {
+					ksort($existing["descs"]);
+					if ($index["type"] == $existing["type"]
+						&& array_values($existing["columns"]) === $columns
+						&& (!$existing["lengths"] || array_values($existing["lengths"]) === $lengths)
+						&& array_values($existing["descs"]) === $descs
+					) {
 						// skip existing index
 						unset($indexes[$name]);
 						continue;
 					}
 				}
-				$alter[] = array($index["type"], $name, "(" . implode(", ", $set) . ")");
+				$alter[] = array($index["type"], $name, $set);
 			}
 		}
 	}
+
 	// drop removed indexes
 	foreach ($indexes as $name => $existing) {
 		$alter[] = array($existing["type"], $name, "DROP");
@@ -52,53 +69,75 @@ if ($_POST && !$error && !$_POST["add"]) {
 	queries_redirect(ME . "table=" . urlencode($TABLE), lang('Indexes have been altered.'), alter_indexes($TABLE, $alter));
 }
 
-page_header(lang('Indexes'), $error, array("table" => $TABLE), $TABLE);
+page_header(lang('Indexes'), $error, array("table" => $TABLE), h($TABLE));
 
 $fields = array_keys(fields($TABLE));
-$row = array("indexes" => $indexes);
-if ($_POST) {
-	$row = $_POST;
-	if ($_POST["add"]) {
-		foreach ($row["indexes"] as $key => $index) {
-			if ($index["columns"][count($index["columns"])] != "") {
-				$row["indexes"][$key]["columns"][] = "";
-			}
-		}
-		$index = end($row["indexes"]);
-		if ($index["type"] || array_filter($index["columns"], 'strlen') || array_filter($index["lengths"], 'strlen')) {
-			$row["indexes"][] = array("columns" => array(1 => ""));
-		}
-	}
-} else {
+if ($_POST["add"]) {
 	foreach ($row["indexes"] as $key => $index) {
-		$row["indexes"][$key]["name"] = $key;
-		$row["indexes"][$key]["columns"][] = "";
+		if ($index["columns"][count($index["columns"])] != "") {
+			$row["indexes"][$key]["columns"][] = "";
+		}
 	}
-	$row["indexes"][] = array("columns" => array(1 => ""));
+	$index = end($row["indexes"]);
+	if ($index["type"] || array_filter($index["columns"], 'strlen')) {
+		$row["indexes"][] = array("columns" => array(1 => ""));
+	}
+}
+if (!$row) {
+	foreach ($indexes as $key => $index) {
+		$indexes[$key]["name"] = $key;
+		$indexes[$key]["columns"][] = "";
+	}
+	$indexes[] = array("columns" => array(1 => ""));
+	$row["indexes"] = $indexes;
 }
 ?>
 
 <form action="" method="post">
 <table cellspacing="0" class="nowrap">
-<thead><tr><th><?php echo lang('Index Type'); ?><th><?php echo lang('Column (length)'); ?><th><?php echo lang('Name'); ?></thead>
+<thead><tr>
+<th id="label-type"><?php echo lang('Index Type'); ?>
+<th><input type="submit" class="wayoff"><?php echo lang('Column (length)'); ?>
+<th id="label-name"><?php echo lang('Name'); ?>
+<th><noscript><input type='image' class='icon' name='add[0]' src='../adminer/static/plus.gif' alt='+' title='<?php echo lang('Add next'); ?>'></noscript>&nbsp;
+</thead>
 <?php
+if ($primary) {
+	echo "<tr><td>PRIMARY<td>";
+	foreach ($primary["columns"] as $key => $column) {
+		echo select_input(" disabled", $fields, $column);
+		echo "<label><input disabled type='checkbox'>" . lang('descending') . "</label> ";
+	}
+	echo "<td><td>\n";
+}
 $j = 1;
 foreach ($row["indexes"] as $index) {
-	echo "<tr><td>" . html_select("indexes[$j][type]", array(-1 => "") + $index_types, $index["type"], ($j == count($row["indexes"]) ? "indexesAddRow(this);" : 1)) . "<td>";
-	ksort($index["columns"]);
-	$i = 1;
-	foreach ($index["columns"] as $key => $column) {
-		echo "<span>" . html_select("indexes[$j][columns][$i]", array(-1 => "") + $fields, $column, ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . "(this, '" . js_escape($jush == "sql" ? "" : $_GET["indexes"] . "_") . "');");
-		echo "<input name='indexes[$j][lengths][$i]' size='2' value='" . h($index["lengths"][$key]) . "'> </span>"; //! hide for non-MySQL drivers, add ASC|DESC
-		$i++;
+	if (!$_POST["drop_col"] || $j != key($_POST["drop_col"])) {
+		echo "<tr><td>" . html_select("indexes[$j][type]", array(-1 => "") + $index_types, $index["type"], ($j == count($row["indexes"]) ? "indexesAddRow(this);" : 1), "label-type");
+
+		echo "<td>";
+		ksort($index["columns"]);
+		$i = 1;
+		foreach ($index["columns"] as $key => $column) {
+			echo "<span>" . select_input(
+				" name='indexes[$j][columns][$i]' onchange=\"" . ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . "(this, '" . h(js_escape($jush == "sql" ? "" : $_GET["indexes"] . "_")) . "');\" title='" . lang('Column') . "'",
+				($fields ? array_combine($fields, $fields) : $fields),
+				$column
+			);
+			echo ($jush == "sql" || $jush == "mssql" ? "<input type='number' name='indexes[$j][lengths][$i]' class='size' value='" . h($index["lengths"][$key]) . "' title='" . lang('Length') . "'>" : "");
+			echo ($jush != "sql" ? checkbox("indexes[$j][descs][$i]", 1, $index["descs"][$key], lang('descending')) : "");
+			echo " </span>";
+			$i++;
+		}
+
+		echo "<td><input name='indexes[$j][name]' value='" . h($index["name"]) . "' autocapitalize='off' aria-labelledby='label-name'>\n";
+		echo "<td><input type='image' class='icon' name='drop_col[$j]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "' onclick=\"return !editingRemoveRow(this, 'indexes\$1[type]');\">\n";
 	}
-	echo "<td><input name='indexes[$j][name]' value='" . h($index["name"]) . "'>\n";
 	$j++;
 }
 ?>
 </table>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<noscript><p><input type="submit" name="add" value="<?php echo lang('Add next'); ?>"></noscript>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/lang/ar.inc.php

@@ -1,23 +1,22 @@
 <?php
 $translations = array(
 	'Login' => 'تسجيل الدخول',
-	'Logout successful.' => 'مع السلامة.',
-	'Invalid credentials.' => 'فشل في تسجيل الدخول.',
+	'Logout successful.' => 'تم تسجيل الخروج بنجاح.',
+	'Invalid credentials.' => 'بيانات الدخول غير صالحة.',
 	'Server' => 'الخادم',
-	'Username' => 'المستعمل',
+	'Username' => 'اسم المستخدم',
 	'Password' => 'كلمة المرور',
-	'Select database' => 'إختر قاعدة البيانات',
-	'Invalid database.' => 'قاعدة بيانات خاطئة.',
-	'Create new database' => 'أنشئ فاعدة بيانات',
+	'Select database' => 'اختر قاعدة البيانات',
+	'Invalid database.' => 'قاعدة البيانات غير صالحة.',
 	'Table has been dropped.' => 'تم حذف الجدول.',
 	'Table has been altered.' => 'تم تعديل الجدول.',
 	'Table has been created.' => 'تم إنشاء الجدول.',
 	'Alter table' => 'تعديل الجدول',
 	'Create table' => 'إنشاء جدول',
-	'Table name' => 'إسم الجدول',
+	'Table name' => 'اسم الجدول',
 	'engine' => 'المحرك',
 	'collation' => 'الترتيب',
-	'Column name' => 'إسم العمود',
+	'Column name' => 'اسم العمود',
 	'Type' => 'النوع',
 	'Length' => 'الطول',
 	'Auto Increment' => 'تزايد تلقائي',
@@ -29,14 +28,12 @@ $translations = array(
 	'Database has been altered.' => 'تم تعديل قاعدة البيانات.',
 	'Alter database' => 'تعديل قاعدة البيانات',
 	'Create database' => 'إنشاء قاعدة بيانات',
-	'SQL command' => 'إستعلام SQL',
-	'Dump' => 'تصدير',
+	'SQL command' => 'استعلام SQL',
 	'Logout' => 'تسجيل الخروج',
 	'database' => 'قاعدة بيانات',
-	'Use' => 'المستعمل',
+	'Use' => 'استعمال',
 	'No tables.' => 'لا توجد جداول.',
 	'select' => 'تحديد',
-	'Create new table' => 'أنشئ جدول جديد',
 	'Item has been deleted.' => 'تم حذف العنصر.',
 	'Item has been updated.' => 'تم تعديل العنصر.',
 	'Edit' => 'تعديل',
@@ -50,48 +47,48 @@ $translations = array(
 	'Alter indexes' => 'تعديل المؤشرات',
 	'Add next' => 'إضافة التالي',
 	'Language' => 'اللغة',
-	'Select' => 'إختيار',
+	'Select' => 'اختيار',
 	'New item' => 'عنصر جديد',
 	'Search' => 'بحث',
 	'Sort' => 'ترتيب',
 	'descending' => 'تنازلي',
 	'Limit' => 'حد',
 	'No rows.' => 'لا توجد نتائج.',
-	'Action' => 'حركة',
+	'Action' => 'الإجراء',
 	'edit' => 'تعديل',
 	'Page' => 'صفحة',
-	'Query executed OK, %d row(s) affected.' => 'تم تنفسذ الإستعلام, %d عدد الأسطر المعدلة.',
-	'Error in query' => 'هناك خطأ في الإستعلام',
+	'Query executed OK, %d row(s) affected.' => 'تم تنفسذ الاستعلام, %d عدد الأسطر المعدلة.',
+	'Error in query' => 'هناك خطأ في الاستعلام',
 	'Execute' => 'تنفيذ',
 	'Table' => 'جدول',
 	'Foreign keys' => 'مفاتيح أجنبية',
 	'Triggers' => 'الزنادات',
 	'View' => 'عرض',
-	'Unable to select the table' => 'من غير الممكن إختيار الجدول',
-	'Invalid CSRF token. Send the form again.' => 'CSRF Token خاطئ. من فضلك أعد إرسال الإستمارة.',
+	'Unable to select the table' => 'يتعذر اختيار الجدول',
+	'Invalid CSRF token. Send the form again.' => 'رمز CSRF غير صالح. المرجو إرسال الاستمارة مرة أخرى.',
 	'Comment' => 'تعليق',
-	'Default values' => 'القيمة الإفتراضية',
+	'Default values' => 'القيم الافتراضية',
 	'%d byte(s)' => '%d بايت',
 	'No commands to execute.' => 'لا توجد أوامر للتنفيذ.',
-	'Unable to upload a file.' => 'من غير الممكن رفع الملف.',
+	'Unable to upload a file.' => 'يتعذر رفع ملف ما.',
 	'File upload' => 'رفع ملف',
-	'File uploads are disabled.' => 'تم إلغاء رفع الملفات.',
-	'Routine has been called, %d row(s) affected.' => 'تم إستدعاء الروتين, عدد الأسطر المعدلة %d.',
-	'Call' => 'إستدعاء',
-	'No extension' => 'إمتداد غير موجود',
+	'File uploads are disabled.' => 'رفع الملفات غير مشغل.',
+	'Routine has been called, %d row(s) affected.' => 'تم استدعاء الروتين, عدد الأسطر المعدلة %d.',
+	'Call' => 'استدعاء',
+	'No extension' => 'امتداد غير موجود',
 	'None of the supported PHP extensions (%s) are available.' => 'إمتدادات php المدعومة غير موجودة.',
 	'Session support must be enabled.' => 'عليك تفعيل نظام الجلسات.',
 	'Session expired, please login again.' => 'إنتهت الجلسة، من فضلك أعد تسجيل الدخول.',
 	'Text length' => 'طول النص',
-	'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.' => 'تم إنشاء المفتاح الأجنبي.',
 	'Foreign key' => 'مفتاح أجنبي',
 	'Target table' => 'الجدول المستهدف',
 	'Change' => 'تعديل',
 	'Source' => 'المصدر',
 	'Target' => 'الهدف',
-	'Add column' => 'أضف عمود',
+	'Add column' => 'إضافة عمودا',
 	'Alter' => 'تعديل',
 	'Add foreign key' => 'إضافة مفتاح أجنبي',
 	'ON DELETE' => 'ON DELETE',
@@ -103,11 +100,11 @@ $translations = array(
 	'View has been created.' => 'تم إنشاء العرض.',
 	'Alter view' => 'تعديل عرض',
 	'Create view' => 'إنشاء عرض',
-	'Name' => 'الإسم',
+	'Name' => 'الاسم',
 	'Process list' => 'قائمة الإجراءات',
 	'%d process(es) have been killed.' => 'عدد الإجراءات التي تم إيقافها %d.',
 	'Kill' => 'إيقاف',
-	'Parameter name' => 'إسم المتغير',
+	'Parameter name' => 'اسم المتغير',
 	'Database schema' => 'مخطط فاعدة البيانات',
 	'Create procedure' => 'إنشاء إجراء',
 	'Create function' => 'إنشاء دالة',
@@ -139,7 +136,7 @@ $translations = array(
 	'Grant' => 'موافق',
 	'Revoke' => 'إلغاء',
 	'%s version: %s through PHP extension %s' => 'النسخة %s : %s عن طريق إمتداد ال PHP %s',
-	'Logged as: %s' => 'تم تسجيل الدخول بإسم %s',
+	'Logged as: %s' => 'تم تسجيل الدخول باسم %s',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'معلومات POST كبيرة جدا. قم بتقليص حجم المعلومات أو قم بزيادة قيمة %s في خيارات ال PHP.',
 	'Move up' => 'نقل للأعلى',
 	'Move down' => 'نقل للأسفل',
@@ -178,6 +175,7 @@ $translations = array(
 	'Data Free' => 'المساحة الحرة',
 	'Rows' => 'الأسطر',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Analyze' => 'تحليل',
 	'Optimize' => 'تحسين',
 	'Check' => 'فحص',
@@ -188,14 +186,14 @@ $translations = array(
 	'%d item(s) have been affected.' => 'عدد العناصر المعدلة هو %d.',
 	'whole result' => 'نتيجة كاملة',
 	'Clone' => 'نسخ',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'لقد تجاوزت العدد الأقصى للحقول. يرجى الرفع من %s و %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'لقد تجاوزت العدد الأقصى للحقول. يرجى الرفع من %s.',
 	'Partition by' => 'مقسم بواسطة',
 	'Partitions' => 'التقسيمات',
-	'Partition name' => 'إسم التقسيم',
+	'Partition name' => 'اسم التقسيم',
 	'Values' => 'القيم',
-	'%d row(s) have been imported.' => 'عدد الأسطر المستوردة هو %d.',
+	'%d row(s) have been imported.' => 'تم استيراد %d سطرا',
 	'anywhere' => 'في اي مكان',
-	'Import' => 'إستيراد',
+	'Import' => 'استيراد',
 	'Stop on error' => 'أوقف في حالة حدوث خطأ',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$5/$3/$1',
@@ -225,7 +223,6 @@ $translations = array(
 	'Databases have been dropped.' => 'تم حذف قواعد البيانات.',
 	'Database has been dropped.' => 'تم حذف قاعدة البيانات.',
 	'Search data in tables' => 'بحث في الجداول',
-	'schema' => 'المخطط',
 	'Schema' => 'المخطط',
 	'Alter schema' => 'تعديل المخطط',
 	'Create schema' => 'إنشاء مخطط',
@@ -243,8 +240,7 @@ $translations = array(
 	'Alter type' => 'تعديل نوع',
 	'Type has been dropped.' => 'تم حذف النوع.',
 	'Type has been created.' => 'تم إنشاء النوع.',
-	'Double click on a value to modify it.' => 'أنقر نقرا مزدوجا على قيمة لتعديلها.',
-	'Use edit link to modify this value.' => 'إستعمل الرابط "تعديل" لتعديل هذه القيمة.',
+	'Use edit link to modify this value.' => 'استعمل الرابط "تعديل" لتعديل هذه القيمة.',
 	'last' => 'الأخيرة',
 	'From server' => 'من الخادم',
 	'System' => 'النظام',
@@ -257,16 +253,15 @@ $translations = array(
 	'Attachments' => 'ملفات مرفقة.',
 	'Item%s has been inserted.' => 'تم إدراج العنصر.',
 	'now' => 'الآن',
-	'%d query(s) executed OK.' => array('تم تنفيذ الإستعلام %d بنجاح.', 'تم تنفيذ الإستعلامات %d بنجاح.'),
-	'Show only errors' => 'إعرض الأخطاء فقط',
-	'Last page' => 'الصفحة السابقة',
+	'%d query(s) executed OK.' => array('تم تنفيذ الاستعلام %d بنجاح.', 'تم تنفيذ الاستعلامات %d بنجاح.'),
+	'Show only errors' => 'إظهار الأخطاء فقط',
 	'Refresh' => 'تحديث',
-	'Invalid schema.' => 'مخطط خاطئ.',
-	'Please use one of the extensions %s.' => 'من فضلك إستعمل إحدى الإمتدادات: %s.',
+	'Invalid schema.' => 'مخطط غير صالح.',
+	'Please use one of the extensions %s.' => 'المرجو استخدام إحدى الامتدادات %s.',
 	'ltr' => 'rtl',
 	'Tables have been copied.' => 'تم نسخ الجداول.',
 	'Copy' => 'نسخ',
-	'Permanent link' => 'وصلة دائمة',
+	'Permanent link' => 'رابط دائم',
 	'Edit all' => 'تعديل الكل',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/bg.inc.php

@@ -0,0 +1,336 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'Система',
+	'Server' => 'Сървър',
+	'Username' => 'Потребител',
+	'Password' => 'Парола',
+	'Permanent login' => 'Запаметяване',
+	'Login' => 'Вход',
+	'Logout' => 'Изход',
+	'Logged as: %s' => 'Текущ потребител: %s',
+	'Logout successful.' => 'Излизането е успешно.',
+	'Invalid credentials.' => 'Невалидни потребителски данни.',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Прекалено много неуспешни опити за вход, опитайте пак след %d минута.', 'Прекалено много неуспешни опити за вход, опитайте пак след %d минути.'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Главната парола вече е невалидна. <a href="https://www.adminer.org/en/extension/" target="_blank">Изберете</a> %s метод, за да я направите постоянна.',
+	'Language' => 'Език',
+	'Invalid CSRF token. Send the form again.' => 'Невалиден шифроващ ключ. Попълнете и изпратете формуляра отново.',
+	'If you did not send this request from Adminer then close this page.' => 'Ако не сте изпратили тази заявка през Adminer, затворете тази страница.',
+	'No extension' => 'Няма разширение',
+	'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 през PHP разширение %s',
+	'Refresh' => 'Обновяване',
+	
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+	
+	'Privileges' => 'Права',
+	'Create user' => 'Създаване на потребител',
+	'User has been dropped.' => 'Потребителя беше премахнат.',
+	'User has been altered.' => 'Потребителя беше променен.',
+	'User has been created.' => 'Потребителя беше създаден.',
+	'Hashed' => 'Хеширан',
+	'Column' => 'Колона',
+	'Routine' => 'Процедура',
+	'Grant' => 'Осигуряване',
+	'Revoke' => 'Отнемане',
+	
+	'Process list' => 'Списък с процеси',
+	'%d process(es) have been killed.' => array('%d процес беше прекъснат.', '%d процеса бяха прекъснати.'),
+	'Kill' => 'Прекъсване',
+	
+	'Variables' => 'Променливи',
+	'Status' => 'Състояние',
+	
+	'SQL command' => 'SQL команда',
+	'%d query(s) executed OK.' => array('%d заявка е изпълнена.', '%d заявки са изпълнени.'),
+	'Query executed OK, %d row(s) affected.' => array('Заявката е изпълнена, %d ред е засегнат.', 'Заявката е изпълнена, %d редове са засегнати.'),
+	'No commands to execute.' => 'Няма команди за изпълнение.',
+	'Error in query' => 'Грешка в заявката',
+	'Execute' => 'Изпълнение',
+	'Stop on error' => 'Спиране при грешка',
+	'Show only errors' => 'Показване само на грешките',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'History' => 'Хронология',
+	'Clear' => 'Изчистване',
+	'Edit all' => 'Редактиране на всички',
+	
+	'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 управляващата директива.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Можете да прикачите голям SQL файл чрез FTP и да го импортирате от сървъра.',
+	'You are offline.' => 'Вие сте офлайн.',
+	
+	'Export' => 'Експорт',
+	'Output' => 'Резултат',
+	'open' => 'показване',
+	'save' => 'запис',
+	'Format' => 'Формат',
+	'Data' => 'Данни',
+	
+	'Database' => 'База данни',
+	'database' => 'база данни',
+	'Use' => 'Избор',
+	'Select database' => 'Избор на база данни',
+	'Invalid 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' => '0123456789',
+	'Engine' => 'Система',
+	'Collation' => 'Кодировка',
+	'Data Length' => 'Големина на данните',
+	'Index Length' => 'Големина на индекса',
+	'Data Free' => 'Свободно място',
+	'Rows' => 'Редове',
+	'%d in total' => '%d всичко',
+	'Analyze' => 'Анализиране',
+	'Optimize' => 'Оптимизиране',
+	'Vacuum' => 'Консолидиране',
+	'Check' => 'Проверка',
+	'Repair' => 'Поправка',
+	'Truncate' => 'Изрязване',
+	'Tables have been truncated.' => 'Таблиците бяха изрязани.',
+	'Move to other database' => 'Преместване в друга база данни',
+	'Move' => 'Преместване',
+	'Tables have been moved.' => 'Таблиците бяха преместени.',
+	'Copy' => 'Копиране',
+	'Tables have been copied.' => 'Таблиците бяха копирани.',
+	
+	'Routines' => 'Процедури',
+	'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.' => 'Процедурата беше създадена.',
+	'Alter function' => 'Промяна на функция',
+	'Alter procedure' => 'Промяна на процедура',
+	'Return type' => 'Резултат',
+	
+	'Events' => 'Събития',
+	'Event has been dropped.' => 'Събитието беше премахнато.',
+	'Event has been altered.' => 'Събитието беше променено.',
+	'Event has been created.' => 'Събитието беше създадено.',
+	'Alter event' => 'Промяна на събитие',
+	'Create event' => 'Създаване на събитие',
+	'At given time' => 'В зададено време',
+	'Every' => 'Всеки',
+	'Schedule' => 'Насрочване',
+	'Start' => 'Начало',
+	'End' => 'Край',
+	'On completion preserve' => 'Запазване след завършване',
+	
+	'Tables' => 'Таблици',
+	'Tables and views' => 'Таблици и изгледи',
+	'Table' => 'Таблица',
+	'No tables.' => 'Няма таблици.',
+	'Alter table' => 'Промяна на таблица',
+	'Create table' => 'Създаване на таблица',
+	'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' => 'система',
+	'collation' => 'кодировка',
+	'Column name' => 'Име на колоната',
+	'Type' => 'Вид',
+	'Length' => 'Големина',
+	'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.',
+	
+	'Partition by' => 'Разделяне на',
+	'Partitions' => 'Раздели',
+	'Partition name' => 'Име на раздела',
+	'Values' => 'Стойности',
+	
+	'View' => 'Изглед',
+	'Materialized view' => 'Запаметен изглед',
+	'View has been dropped.' => 'Изгледа беше премахнат.',
+	'View has been altered.' => 'Изгледа беше променен.',
+	'View has been created.' => 'Изгледа беше създаден.',
+	'Alter view' => 'Промяна на изглед',
+	'Create view' => 'Създаване на изглед',
+	
+	'Indexes' => 'Индекси',
+	'Indexes have been altered.' => 'Индексите бяха променени.',
+	'Alter indexes' => 'Промяна на индекси',
+	'Add next' => 'Добавяне на следващ',
+	'Index Type' => 'Вид на индекса',
+	'Column (length)' => 'Колона (дължина)',
+	
+	'Foreign keys' => 'Препратки',
+	'Foreign key' => 'Препратка',
+	'Foreign key has been dropped.' => 'Препратката беше премахната.',
+	'Foreign key has been altered.' => 'Препратката беше променена.',
+	'Foreign key has been created.' => 'Препратката беше създадена.',
+	'Target table' => 'Таблица приемник',
+	'Change' => 'Промяна',
+	'Source' => 'Източник',
+	'Target' => 'Цел',
+	'Add column' => 'Добавяне на колона',
+	'Alter' => 'Промяна',
+	'Add foreign key' => 'Добавяне на препратка',
+	'ON DELETE' => 'При изтриване',
+	'ON UPDATE' => 'При промяна',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Колоните източник и цел трябва да са от еднакъв вид, трябва да има индекс на колоните приемник и да има въведени данни.',
+	
+	'Triggers' => 'Тригери',
+	'Add trigger' => 'Добавяне на тригер',
+	'Trigger has been dropped.' => 'Тригера беше премахнат.',
+	'Trigger has been altered.' => 'Тригера беше променен.',
+	'Trigger has been created.' => 'Тригера беше създаден.',
+	'Alter trigger' => 'Промяна на тригер',
+	'Create trigger' => 'Създаване на тригер',
+	'Time' => 'Време',
+	'Event' => 'Събитие',
+	'Name' => 'Име',
+	
+	'select' => 'показване',
+	'Select' => 'Показване',
+	'Select data' => 'Показване на данни',
+	'Functions' => 'Функции',
+	'Aggregation' => 'Съвкупност',
+	'Search' => 'Търсене',
+	'anywhere' => 'навсякъде',
+	'Search data in tables' => 'Търсене на данни в таблиците',
+	'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 реда бяха импортирани.'),
+	'File must be in UTF-8 encoding.' => 'Файла трябва да е с UTF-8 кодировка.',
+	
+	// in-place editing in select
+	'Modify' => 'Промяна',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+щракване в стойността, за да я промените.',
+	'Use edit link to modify this value.' => 'Използвайте "редакция" за промяна на данните.',
+	
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'Елементи%s бяха вмъкнати.',
+	'Item has been deleted.' => 'Елемента беше изтрит.',
+	'Item has been updated.' => 'Елемента беше обновен.',
+	'%d item(s) have been affected.' => array('%d елемент беше засегнат.', '%d елемента бяха засегнати.'),
+	'New item' => 'Нов елемент',
+	'original' => 'оригинал',
+	// label for value '' in enum data type
+	'empty' => 'празно',
+	'edit' => 'редакция',
+	'Edit' => 'Редактиране',
+	'Insert' => 'Вмъкване',
+	'Save' => 'Запис',
+	'Saving' => 'Записване',
+	'Save and continue edit' => 'Запис и редакция',
+	'Save and insert next' => 'Запис и нов',
+	'Selected' => 'Избран',
+	'Clone' => 'Клониране',
+	'Delete' => 'Изтриване',
+	'You have no privileges to update this table.' => 'Нямате праве за обновяване на таблицата.',
+	
+	'E-mail' => 'E-mail',
+	'From' => 'От',
+	'Subject' => 'Тема',
+	'Attachments' => 'Прикачени',
+	'Send' => 'Изпращане',
+	'%d e-mail(s) have been sent.' => array('%d писмо беше изпратено.', '%d писма бяха изпратени.'),
+	
+	// data type descriptions
+	'Numbers' => 'Числа',
+	'Date and time' => 'Дата и час',
+	'Strings' => 'Низове',
+	'Binary' => 'Двоични',
+	'Lists' => 'Списъци',
+	'Network' => 'Мрежа',
+	'Geometry' => 'Геометрия',
+	'Relations' => 'Зависимости',
+	
+	'Editor' => 'Редактор',
+	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
+	'$1-$3-$5' => '$1-$3-$5',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => '[гггг]-мм-дд',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'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.',
+	
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'Промяна на схемата',
+	'Create schema' => 'Създаване на схема',
+	'Schema has been dropped.' => 'Схемата беше премахната.',
+	'Schema has been created.' => 'Схемата беше създадена.',
+	'Schema has been altered.' => 'Схемата беше променена.',
+	'Schema' => 'Схема',
+	'Invalid schema.' => 'Невалидна схема.',
+	
+	// PostgreSQL sequences support
+	'Sequences' => 'Последователности',
+	'Create sequence' => 'Създаване на последователност',
+	'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.' => 'Вида беше създаден.',
+	'Alter type' => 'Промяна на вид',
+);

adminer/lang/bn.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'পাসওয়ার্ড',
 	'Select database' => 'ডাটাবেজ নির্বাচন করো',
 	'Invalid database.' => 'ভুল ডাটাবেজ।',
-	'Create new database' => 'নতুন ডাটাবেজ তৈরী করো',
 	'Table has been dropped.' => 'টেবিল মুছে ফেলা হয়েছে।',
 	'Table has been altered.' => 'টেবিল সম্পাদনা করা হয়েছে।',
 	'Table has been created.' => 'টেবিল তৈরী করা হয়েছে।',
@@ -31,13 +30,11 @@ $translations = array(
 	'Alter database' => 'ডাটাবেজ সম্পাদনা',
 	'Create database' => 'ডাটাবেজ তৈরী',
 	'SQL command' => 'SQL-কোয়্যারী',
-	'Dump' => 'এক্সপোর্ট',
 	'Logout' => 'লগআউট',
 	'database' => 'ডাটাবেজ',
 	'Use' => 'ব্যবহার',
 	'No tables.' => 'কোন টেবিল নাই।',
 	'select' => 'নির্বাচন',
-	'Create new table' => 'নতুন টেবিল তৈরী করো',
 	'Item has been deleted.' => 'বিষয়বস্তু মুছে ফেলা হয়েছে।',
 	'Item has been updated.' => 'বিষয়বস্তু আপডেট করা হয়েছে।',
 	'Item%s has been inserted.' => 'বিষয়বস্তুসমূহ সংযোজন করা হয়েছে।',
@@ -180,6 +177,7 @@ $translations = array(
 	'Tables have been truncated.' => 'টেবিল ছাঁটাই করা হয়েছে',
 	'Rows' => 'সারি',
 	',' => ',',
+	'0123456789' => '০১২৩৪৫৬৭৮৯',
 	'Tables have been moved.' => 'টেবিল স্থানান্তর করা হয়েছে।',
 	'Move to other database' => 'অন্য ডাটাবেজে স্থানান্তর করো',
 	'Move' => 'স্থানান্তর করো',
@@ -190,7 +188,7 @@ $translations = array(
 	'%d item(s) have been affected.' => '%d টি বিষয়বস্তু প্রভাবিত হয়েছে',
 	'whole result' => 'সম্পূর্ণ ফলাফল',
 	'Clone' => 'ক্লোন',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'অনুমোদিত ফিল্ড এর সর্বাধিক সংখ্যা অতিক্রম করে গেছে। অনুগ্রহপূর্বক %s এবং %s বৃদ্ধি করুন।',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'অনুমোদিত ফিল্ড এর সর্বাধিক সংখ্যা অতিক্রম করে গেছে। অনুগ্রহপূর্বক %s বৃদ্ধি করুন।',
 	'Partition by' => 'পার্টিশন যার মাধ্যমে',
 	'Partitions' => 'পার্টিশন',
 	'Partition name' => 'পার্টিশনের নাম',
@@ -226,7 +224,6 @@ $translations = array(
 	'Permanent login' => 'স্থায়ী লগইন',
 	'Databases have been dropped.' => 'ডাটাবেজসমূহ মুছে ফেলা হয়েছে।',
 	'Search data in tables' => 'টেবিলে খোঁজ করো',
-	'schema' => 'স্কিমা',
 	'Schema' => 'স্কিমা',
 	'Alter schema' => 'স্কিমা পরিবর্তন করো',
 	'Create schema' => 'স্কিমা তৈরী করো',
@@ -244,7 +241,6 @@ $translations = array(
 	'Alter type' => 'টাইপ পরিবর্তন করো',
 	'Type has been dropped.' => 'টাইপ মুছে ফেলা হয়েছে।',
 	'Type has been created.' => 'টাইপ তৈরি করা হয়েছে।',
-	'Double click on a value to modify it.' => 'কোন মানকে পরিবর্তন করতে এতে ডবল ক্লিক করো।',
 	'Use edit link to modify this value.' => 'এই মান পরিবর্তনের জন্য সম্পাদনা লিঙ্ক ব্যবহার করো।',
 	'last' => 'সর্বশেষ',
 	'From server' => 'সার্ভার থেকে',
@@ -258,7 +254,6 @@ $translations = array(
 	'Attachments' => 'সংযুক্তি',
 	'%d query(s) executed OK.' => array('SQL-কোয়্যারী সফলভাবে সম্পন্ন হয়েছে', '%d SQL-কোয়্যারীসমূহ সফলভাবে সম্পন্ন হয়েছে'),
 	'Show only errors' => 'শুধুমাত্র ত্রুটি দেখাও',
-	'Last page' => 'শেষ পাতা',
 	'Refresh' => 'রিফ্রেশ',
 	'Invalid schema.' => 'অবৈধ স্কিমা।',
 	'Please use one of the extensions %s.' => 'কোন একটা এক্সটেনশন %s ব্যবহার করো।',

adminer/lang/bs.inc.php

@@ -0,0 +1,321 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'Sistem',
+	'Server' => 'Server',
+	'Username' => 'Korisničko ime',
+	'Password' => 'Lozinka',
+	'Permanent login' => 'Trajna prijava',
+	'Login' => 'Prijava',
+	'Logout' => 'Odjava',
+	'Logged as: %s' => 'Prijavi se kao: %s',
+	'Logout successful.' => 'Uspešna odjava.',
+	'Invalid credentials.' => 'Nevažeće dozvole.',
+	'Language' => 'Jezik',
+	'Invalid CSRF token. Send the form again.' => 'Nevažeći CSRF kod. Proslijedite ponovo formu.',
+	'No extension' => 'Bez dodataka',
+	'None of the supported PHP extensions (%s) are available.' => 'Nijedan od podržanih PHP dodataka nije dostupan.',
+	'Session support must be enabled.' => 'Morate omogućiti podršku za sesije.',
+	'Session expired, please login again.' => 'Vaša sesija je istekla, prijavite se ponovo.',
+	'%s version: %s through PHP extension %s' => '%s verzija: %s pomoću PHP dodatka je %s',
+	'Refresh' => 'Osveži',
+
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+
+	'Privileges' => 'Dozvole',
+	'Create user' => 'Novi korisnik',
+	'User has been dropped.' => 'Korisnik je izbrisan.',
+	'User has been altered.' => 'Korisnik je izmijenjen.',
+	'User has been created.' => 'korisnik je spašen.',
+	'Hashed' => 'Heširano',
+	'Column' => 'kolumna',
+	'Routine' => 'Rutina',
+	'Grant' => 'Dozvoli',
+	'Revoke' => 'Opozovi',
+
+	'Process list' => 'Spisak procesa',
+	'%d process(es) have been killed.' => array('%d proces je ukinut.', '%d procesa su ukinuta.', '%d procesa je ukinuto.'),
+	'Kill' => 'Ubij',
+
+	'Variables' => 'Promijenljive',
+	'Status' => 'Status',
+
+	'SQL command' => 'SQL komanda',
+	'%d query(s) executed OK.' => array('%d upit je uspiješno izvršen.', '%d upita su uspiješno izvršena.', '%d upita je uspiješno izvršeno.'),
+	'Query executed OK, %d row(s) affected.' => array('Upit je uspiješno izvršen, %d red je ažuriran.', 'Upit je uspiješno izvršen, %d reda su ažurirana.', 'Upit je uspiješno izvršen, %d redova je ažurirano.'),
+	'No commands to execute.' => 'Bez komandi za izvršavanje.',
+	'Error in query' => 'Greška u upitu',
+	'Execute' => 'Izvrši',
+	'Stop on error' => 'Zaustavi prilikom greške',
+	'Show only errors' => 'Prikazuj samo greške',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'History' => 'Historijat',
+	'Clear' => 'Očisti',
+	'Edit all' => 'Izmijeni sve',
+
+	'File upload' => 'Slanje datoteka',
+	'From server' => 'Sa servera',
+	'Webserver file %s' => 'Datoteka %s sa veb servera',
+	'Run file' => 'Pokreni datoteku',
+	'File does not exist.' => 'Datoteka ne postoji.',
+	'File uploads are disabled.' => 'Onemogućeno je slanje datoteka.',
+	'Unable to upload a file.' => 'Slanje datoteke nije uspelo.',
+	'Maximum allowed file size is %sB.' => 'Najveća dozvoljena veličina datoteke je %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Preveliki POST podatak. Morate da smanjite podatak ili povećajte vrijednost konfiguracione direktive %s.',
+
+	'Export' => 'Izvoz',
+	'Output' => 'Ispis',
+	'open' => 'otvori',
+	'save' => 'spasi',
+	'Format' => 'Format',
+	'Data' => 'Podaci',
+
+	'Database' => 'Baza podataka',
+	'database' => 'baza podataka',
+	'Use' => 'Koristi',
+	'Select database' => 'Izaberite bazu',
+	'Invalid database.' => 'Neispravna baza podataka.',
+	'Database has been dropped.' => 'Baza podataka je izbrisana.',
+	'Databases have been dropped.' => 'Baze podataka su izbrisane.',
+	'Database has been created.' => 'Baza podataka je spašena.',
+	'Database has been renamed.' => 'Baza podataka je preimenovana.',
+	'Database has been altered.' => 'Baza podataka je izmijenjena.',
+	'Alter database' => 'Ažuriraj bazu podataka',
+	'Create database' => 'Formiraj bazu podataka',
+	'Database schema' => 'Šema baze podataka',
+
+	// link to current database schema layout
+	'Permanent link' => 'Trajna veza',
+
+	// thousands separator - must contain single byte
+	',' => ',',
+	'0123456789' => '0123456789',
+	'Engine' => 'Stroj',
+	'Collation' => 'Sravnjivanje',
+	'Data Length' => 'Dužina podataka',
+	'Index Length' => 'Dužina indeksa',
+	'Data Free' => 'Slobodno podataka',
+	'Rows' => 'Redova',
+	'%d in total' => 'ukupno %d',
+	'Analyze' => 'Analiziraj',
+	'Optimize' => 'Optimizuj',
+	'Check' => 'Provjeri',
+	'Repair' => 'Popravi',
+	'Truncate' => 'Isprazni',
+	'Tables have been truncated.' => 'Tabele su ispražnjene.',
+	'Move to other database' => 'Premijesti u drugu bazu podataka',
+	'Move' => 'Premijesti',
+	'Tables have been moved.' => 'Tabele su premješćene.',
+	'Copy' => 'Umnoži',
+	'Tables have been copied.' => 'Tabele su umnožene.',
+
+	'Routines' => 'Rutine',
+	'Routine has been called, %d row(s) affected.' => array('Pozvana je rutina, %d red je ažuriran.', 'Pozvana je rutina, %d reda su ažurirani.', 'Pozvana je rutina, %d redova je ažurirano.'),
+	'Call' => 'Pozovi',
+	'Parameter name' => 'Naziv parametra',
+	'Create procedure' => 'Formiraj proceduru',
+	'Create function' => 'Formiraj funkciju',
+	'Routine has been dropped.' => 'Rutina je izbrisana.',
+	'Routine has been altered.' => 'Rutina je izmijenjena.',
+	'Routine has been created.' => 'Rutina je spašena.',
+	'Alter function' => 'Ažuriraj funkciju',
+	'Alter procedure' => 'Ažuriraj proceduru',
+	'Return type' => 'Povratni tip',
+
+	'Events' => 'Događaji',
+	'Event has been dropped.' => 'Događaj je izbrisan.',
+	'Event has been altered.' => 'Događaj je izmijenjen.',
+	'Event has been created.' => 'Događaj je spašen.',
+	'Alter event' => 'Ažuriraj događaj',
+	'Create event' => 'Napravi događaj',
+	'At given time' => 'U zadato vrijeme',
+	'Every' => 'Svaki',
+	'Schedule' => 'Raspored',
+	'Start' => 'Početak',
+	'End' => 'Kraj',
+	'On completion preserve' => 'Zadrži po završetku',
+
+	'Tables' => 'Tabele',
+	'Tables and views' => 'Tabele i pogledi',
+	'Table' => 'Tabela',
+	'No tables.' => 'Bez tabela.',
+	'Alter table' => 'Ažuriraj tabelu',
+	'Create table' => 'Napravi tabelu',
+	'Table has been dropped.' => 'Tabela je izbrisana.',
+	'Tables have been dropped.' => 'Tabele su izbrisane.',
+	'Tables have been optimized.' => 'Tabele su optimizovane.',
+	'Table has been altered.' => 'Tabela je izmijenjena.',
+	'Table has been created.' => 'Tabela je spašena.',
+	'Table name' => 'Naziv tabele',
+	'Show structure' => 'Prikaži strukturu',
+	'engine' => 'stroj',
+	'collation' => 'Sravnjivanje',
+	'Column name' => 'Naziv kolumne',
+	'Type' => 'Tip',
+	'Length' => 'Dužina',
+	'Auto Increment' => 'Auto-priraštaj',
+	'Options' => 'Opcije',
+	'Comment' => 'Komentar',
+	'Default values' => 'Podrazumijevane vrijednosti',
+	'Drop' => 'Izbriši',
+	'Are you sure?' => 'Da li ste sigurni?',
+	'Move up' => 'Pomijeri na gore',
+	'Move down' => 'Pomijeri na dole',
+	'Remove' => 'Ukloni',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Premašen je maksimalni broj dozvoljenih polja. Molim uvećajte %s.',
+
+	'Partition by' => 'Podijeli po',
+	'Partitions' => 'Podijele',
+	'Partition name' => 'Ime podijele',
+	'Values' => 'Vrijednosti',
+
+	'View' => 'Pogled',
+	'View has been dropped.' => 'Pogled je izbrisan.',
+	'View has been altered.' => 'Pogled je izmijenjen.',
+	'View has been created.' => 'Pogled je spašen.',
+	'Alter view' => 'Ažuriraj pogled',
+	'Create view' => 'Napravi pogled',
+
+	'Indexes' => 'Indeksi',
+	'Indexes have been altered.' => 'Indeksi su izmijenjeni.',
+	'Alter indexes' => 'Ažuriraj indekse',
+	'Add next' => 'Dodaj slijedeći',
+	'Index Type' => 'Tip indeksa',
+	'Column (length)' => 'kolumna (dužina)',
+
+	'Foreign keys' => 'Strani ključevi',
+	'Foreign key' => 'Strani ključ',
+	'Foreign key has been dropped.' => 'Strani ključ je izbrisan.',
+	'Foreign key has been altered.' => 'Strani ključ je izmijenjen.',
+	'Foreign key has been created.' => 'Strani ključ je spašen.',
+	'Target table' => 'Ciljna tabela',
+	'Change' => 'izmijeni',
+	'Source' => 'Izvor',
+	'Target' => 'Cilj',
+	'Add column' => 'Dodaj kolumnu',
+	'Alter' => 'Ažuriraj',
+	'Add foreign key' => 'Dodaj strani ključ',
+	'ON DELETE' => 'ON DELETE (prilikom brisanja)',
+	'ON UPDATE' => 'ON UPDATE (prilikom osvežavanja)',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Izvorne i ciljne kolumne moraju biti istog tipa, ciljna kolumna mora biti indeksirana i izvorna tabela mora sadržati podatke iz ciljne.',
+
+	'Triggers' => 'Okidači',
+	'Add trigger' => 'Dodaj okidač',
+	'Trigger has been dropped.' => 'Okidač je izbrisan.',
+	'Trigger has been altered.' => 'Okidač je izmijenjen.',
+	'Trigger has been created.' => 'Okidač je spašen.',
+	'Alter trigger' => 'Ažuriraj okidač',
+	'Create trigger' => 'Formiraj okidač',
+	'Time' => 'Vrijeme',
+	'Event' => 'Događaj',
+	'Name' => 'Ime',
+
+	'select' => 'izaberi',
+	'Select' => 'Izaberi',
+	'Selected' => 'Izabrano',
+	'Select data' => 'Izaberi podatke',
+	'Functions' => 'Funkcije',
+	'Aggregation' => 'Sakupljanje',
+	'Search' => 'Pretraga',
+	'anywhere' => 'bilo gdje',
+	'Search data in tables' => 'Pretraži podatke u tabelama',
+	'Sort' => 'Poređaj',
+	'descending' => 'opadajuće',
+	'Limit' => 'Granica',
+	'Text length' => 'Dužina teksta',
+	'Action' => 'Akcija',
+	'Full table scan' => 'Skreniranje kompletne tabele',
+	'Unable to select the table' => 'Ne mogu da izaberem tabelu',
+	'No rows.' => 'Bez redova.',
+	'%d row(s)' => array('%d red', '%d reda', '%d redova'),
+	'Page' => 'Strana',
+	'last' => 'poslijednja',
+	'Loading' => 'Učitavam',
+	'Load more data' => 'Učitavam još podataka',
+	'whole result' => 'ceo rezultat',
+	'%d byte(s)' => array('%d bajt', '%d bajta', '%d bajtova'),
+
+	'Import' => 'Uvoz',
+	'%d row(s) have been imported.' => array('%d red je uvežen.', '%d reda su uvežena.', '%d redova je uveženo.'),
+
+	// in-place editing in select
+	'Ctrl+click on a value to modify it.' => 'Ctrl+klik na vrijednost za izmijenu.',
+	'Use edit link to modify this value.' => 'Koristi vezu za izmijenu ove vrijednosti.',
+
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'Stavka %s je spašena.',
+	'Item has been deleted.' => 'Stavka je izbrisana.',
+	'Item has been updated.' => 'Stavka je izmijenjena.',
+	'%d item(s) have been affected.' => array('%d stavka je ažurirana.', '%d stavke su ažurirane.', '%d stavki je ažurirano.'),
+	'New item' => 'Nova stavka',
+	'original' => 'original',
+	// label for value '' in enum data type
+	'empty' => 'prazno',
+	'edit' => 'izmijeni',
+	'Edit' => 'Izmijeni',
+	'Insert' => 'Umetni',
+	'Save' => 'Sačuvaj',
+	'Save and continue edit' => 'Sačuvaj i nastavi uređenje',
+	'Save and insert next' => 'Sačuvaj i umijetni slijedeće',
+	'Clone' => 'Dupliraj',
+	'Delete' => 'Izbriši',
+	'Modify' => 'Izmjene',
+
+	'E-mail' => 'El. pošta',
+	'From' => 'Od',
+	'Subject' => 'Naslov',
+	'Attachments' => 'Prilozi',
+	'Send' => 'Pošalji',
+	'%d e-mail(s) have been sent.' => array('%d poruka el. pošte je poslata.', '%d poruke el. pošte su poslate.', '%d poruka el. pošte je poslato.'),
+
+	// data type descriptions
+	'Numbers' => 'Broj',
+	'Date and time' => 'Datum i vrijeme',
+	'Strings' => 'Tekst',
+	'Binary' => 'Binarno',
+	'Lists' => 'Liste',
+	'Network' => 'Mreža',
+	'Geometry' => 'Geometrija',
+	'Relations' => 'Odnosi',
+
+	'Editor' => 'Uređivač',
+	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
+	'$1-$3-$5' => '$5.$3.$1.',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => 'dd.mm.[yyyy].',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'HH:MM:SS',
+	'now' => 'sad',
+	'yes' => 'da',
+	'no' => 'ne',
+
+	// general SQLite error in create, drop or rename database
+	'File exists.' => 'Datoteka već postoji.',
+	'Please use one of the extensions %s.' => 'Molim koristite jedan od nastavaka %s.',
+
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'Ažuriraj šemu',
+	'Create schema' => 'Formiraj šemu',
+	'Schema has been dropped.' => 'Šema je izbrisana.',
+	'Schema has been created.' => 'Šema je spašena.',
+	'Schema has been altered.' => 'Šema je izmijenjena.',
+	'Schema' => 'Šema',
+	'Invalid schema.' => 'Šema nije ispravna.',
+
+	// PostgreSQL sequences support
+	'Sequences' => 'Nizovi',
+	'Create sequence' => 'Napravi niz',
+	'Sequence has been dropped.' => 'Niz je izbrisan.',
+	'Sequence has been created.' => 'Niz je formiran.',
+	'Sequence has been altered.' => 'Niz je izmijenjen.',
+	'Alter sequence' => 'Ažuriraj niz',
+
+	// PostgreSQL user types support
+	'User types' => 'Korisnički tipovi',
+	'Create type' => 'Definiši tip',
+	'Type has been dropped.' => 'Tip je izbrisan.',
+	'Type has been created.' => 'tip je spašen.',
+	'Alter type' => 'Ažuriraj tip',
+);

adminer/lang/ca.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Contrasenya',
 	'Select database' => 'Selecciona base de dades',
 	'Invalid database.' => 'Base de dades invàlida.',
-	'Create new database' => 'Crea una nova base de dades',
 	'Table has been dropped.' => 'S\'ha suprimit la taula.',
 	'Table has been altered.' => 'S\'ha modificat la taula.',
 	'Table has been created.' => 'S\'ha creat la taula.',
@@ -31,13 +30,11 @@ $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',
 	'No tables.' => 'No hi ha cap taula.',
 	'select' => 'registres',
-	'Create new table' => 'Crea una nova taula',
 	'Item has been deleted.' => 'S\'ha suprmit l\'element.',
 	'Item has been updated.' => 'S\'ha actualitzat l\'element.',
 	'Item%s has been inserted.' => 'S\'ha insertat l\'element%s.',
@@ -180,6 +177,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',
@@ -199,7 +197,7 @@ $translations = array(
 	'Show structure' => 'Mostra l\'estructura',
 	'Select data' => 'Selecciona dades',
 	'Stop on error' => 'Atura en trobar un error',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'S\'ha assolit el nombre màxim de camps. Incrementa %s i %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'S\'ha assolit el nombre màxim de camps. Incrementa %s.',
 	'anywhere' => 'a qualsevol lloc',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$5/$3/$1',
@@ -233,14 +231,13 @@ $translations = array(
 	'Geometry' => 'Geometria',
 	'Databases have been dropped.' => 'S\'han suprimit les bases de dades.',
 	'File exists.' => 'El fitxer ja existeix.',
-	'Double click on a value to modify it.' => 'Fes un doble clic a un valor per modificar-lo.',
+	'Ctrl+click on a value to modify it.' => 'Fes un Ctrl+clic a un valor per modificar-lo.',
 	'Use edit link to modify this value.' => 'Utilitza l\'enllaç d\'edició per modificar aquest valor.',
 	'Alter schema' => 'Modifica l\'esquema',
 	'Create schema' => 'Crea un esquema',
 	'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',
@@ -259,7 +256,6 @@ $translations = array(
 	'now' => 'ara',
 	'%d query(s) executed OK.' => array('%d consulta executada correctament.', '%d consultes executades correctament.'),
 	'Show only errors' => 'Mostra només els errors',
-	'Last page' => 'Darrera plana',
 	'Refresh' => 'Refresca',
 	'Invalid schema.' => 'Esquema invàlid.',
 	'Please use one of the extensions %s.' => 'Si us plau, utilitza una de les extensions %s.',

adminer/lang/cs.inc.php

@@ -11,8 +11,12 @@ $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.',
+	'<a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to use SQLite.' => 'Pro přihlášení k SQLite <a href="https://www.adminer.org/cs/extension/" target="_blank">implementujte</a> metodu %s.',
+	'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="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Platnost hlavního hesla vypršela. <a href="https://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é.',
@@ -41,11 +45,16 @@ $translations = array(
 	'Variables' => 'Proměnné',
 	'Status' => 'Stav',
 	
+	'Replication' => 'Replikace',
+	'Master status' => 'Master status',
+	'Slave status' => 'Slave status',
+	
 	'SQL command' => 'SQL příkaz',
 	'%d query(s) executed OK.' => array('%d příkaz proběhl v pořádku.', '%d příkazy proběhly v pořádku.', '%d příkazů proběhlo v pořádku.'),
 	'Query executed OK, %d row(s) affected.' => array('Příkaz proběhl v pořádku, byl změněn %d záznam.', 'Příkaz proběhl v pořádku, byly změněny %d záznamy.', 'Příkaz proběhl v pořádku, bylo změněno %d záznamů.'),
 	'No commands to execute.' => 'Žádné příkazy k vykonání.',
 	'Error in query' => 'Chyba v dotazu',
+	'ATTACH queries are not supported.' => 'Dotazy ATTACH nejsou podporované.',
 	'Execute' => 'Provést',
 	'Stop on error' => 'Zastavit při chybě',
 	'Show only errors' => 'Zobrazit pouze chyby',
@@ -64,9 +73,10 @@ $translations = array(
 	'Unable to upload a file.' => 'Nepodařilo se nahrát soubor.',
 	'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',
@@ -78,7 +88,6 @@ $translations = array(
 	'Use' => 'Vybrat',
 	'Select database' => 'Vybrat databázi',
 	'Invalid database.' => 'Nesprávná databáze.',
-	'Create new database' => 'Vytvořit novou databázi',
 	'Database has been dropped.' => 'Databáze byla odstraněna.',
 	'Databases have been dropped.' => 'Databáze byly odstraněny.',
 	'Database has been created.' => 'Databáze byla vytvořena.',
@@ -93,6 +102,7 @@ $translations = array(
 	
 	// thousands separator - must contain single byte
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Engine' => 'Úložiště',
 	'Collation' => 'Porovnávání',
 	'Data Length' => 'Velikost dat',
@@ -102,6 +112,7 @@ $translations = array(
 	'%d in total' => '%d celkem',
 	'Analyze' => 'Analyzovat',
 	'Optimize' => 'Optimalizovat',
+	'Vacuum' => 'Vyčistit',
 	'Check' => 'Zkontrolovat',
 	'Repair' => 'Opravit',
 	'Truncate' => 'Vyprázdnit',
@@ -144,7 +155,6 @@ $translations = array(
 	'No tables.' => 'Žádné tabulky.',
 	'Alter table' => 'Pozměnit tabulku',
 	'Create table' => 'Vytvořit tabulku',
-	'Create new table' => 'Vytvořit novou tabulku',
 	'Table has been dropped.' => 'Tabulka byla odstraněna.',
 	'Tables have been dropped.' => 'Tabulky byly odstraněny.',
 	'Tables have been optimized.' => 'Tabulky byly optimalizovány.',
@@ -160,13 +170,16 @@ $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',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Byl překročen maximální povolený počet polí. Zvyšte prosím %s a %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Byl překročen maximální povolený počet polí. Zvyšte prosím %s.',
 	
 	'Partition by' => 'Rozdělit podle',
 	'Partitions' => 'Oddíly',
@@ -174,6 +187,7 @@ $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.',
@@ -225,15 +239,16 @@ $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í',
-	'Last page' => 'Poslední stránka',
 	'Load more data' => 'Nahrát další data',
 	'Loading' => 'Nahrává se',
 	'whole result' => 'celý výsledek',
@@ -241,9 +256,11 @@ $translations = array(
 	
 	'Import' => 'Import',
 	'%d row(s) have been imported.' => array('Byl importován %d záznam.', 'Byly importovány %d záznamy.', 'Bylo importováno %d záznamů.'),
+	'File must be in UTF-8 encoding.' => 'Soubor musí být v kódování UTF-8.',
 	
 	// in-place editing in select
-	'Double click on a value to modify it.' => 'Dvojklikněte na políčko, které chcete změnit.',
+	'Modify' => 'Změnit',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+klikněte na políčko, které chcete změnit.',
 	'Use edit link to modify this value.' => 'Ke změně této hodnoty použijte odkaz upravit.',
 	
 	// %s can contain auto-increment value
@@ -259,10 +276,13 @@ $translations = array(
 	'Edit' => 'Upravit',
 	'Insert' => 'Vložit',
 	'Save' => 'Uložit',
+	'Saving' => 'Ukládá se',
 	'Save and continue edit' => 'Uložit a pokračovat v editaci',
 	'Save and insert next' => 'Uložit a vložit další',
+	'Selected' => 'Označené',
 	'Clone' => 'Klonovat',
 	'Delete' => 'Smazat',
+	'You have no privileges to update this table.' => 'Nemáte oprávnění editovat tuto tabulku.',
 	
 	'E-mail' => 'E-mail',
 	'From' => 'Odesílatel',
@@ -302,7 +322,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.',
 	
@@ -320,4 +339,8 @@ $translations = array(
 	'Type has been dropped.' => 'Typ byl odstraněn.',
 	'Type has been created.' => 'Typ byl vytvořen.',
 	'Alter type' => 'Pozměnit typ',
+
+	'Replication' => null,
+	'Master status' => null,
+	'Slave status' => null,
 );

adminer/lang/da.inc.php

@@ -0,0 +1,282 @@
+<?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="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Master-kodeordet er udløbet. <a href="https://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.',
+	'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

@@ -8,14 +8,13 @@ $translations = array(
 	'Password' => 'Passwort',
 	'Select database' => 'Datenbank auswählen',
 	'Invalid database.' => 'Datenbank ungültig.',
-	'Create new database' => 'Neue Datenbank',
-	'Table has been dropped.' => 'Tabelle entfernt.',
-	'Table has been altered.' => 'Tabelle geändert.',
-	'Table has been created.' => 'Tabelle erstellt.',
+	'Table has been dropped.' => 'Tabelle wurde entfernt.',
+	'Table has been altered.' => 'Tabelle wurde geändert.',
+	'Table has been created.' => 'Tabelle wurde erstellt.',
 	'Alter table' => 'Tabelle ändern',
-	'Create table' => 'Neue Tabelle erstellen',
+	'Create table' => 'Tabelle erstellen',
 	'Table name' => 'Name der Tabelle',
-	'engine' => 'Motor',
+	'engine' => 'Speicher-Engine',
 	'collation' => 'Kollation',
 	'Column name' => 'Spaltenname',
 	'Type' => 'Typ',
@@ -24,29 +23,27 @@ $translations = array(
 	'Options' => 'Optionen',
 	'Save' => 'Speichern',
 	'Drop' => 'Entfernen',
-	'Database has been dropped.' => 'Datenbank entfernt.',
-	'Database has been created.' => 'Datenbank erstellt.',
-	'Database has been renamed.' => 'Datenbank umbenannt.',
-	'Database has been altered.' => 'Datenbank geändert.',
+	'Database has been dropped.' => 'Datenbank wurde entfernt.',
+	'Database has been created.' => 'Datenbank wurde erstellt.',
+	'Database has been renamed.' => 'Datenbank wurde umbenannt.',
+	'Database has been altered.' => 'Datenbank wurde geändert.',
 	'Alter database' => 'Datenbank ändern',
-	'Create database' => 'Neue Datenbank',
-	'SQL command' => 'SQL-Query',
-	'Dump' => 'Export',
+	'Create database' => 'Datenbank erstellen',
+	'SQL command' => 'SQL-Kommando',
 	'Logout' => 'Abmelden',
 	'database' => 'Datenbank',
 	'Use' => 'Benutzung',
 	'No tables.' => 'Keine Tabellen.',
 	'select' => 'zeigen',
-	'Create new table' => 'Neue Tabelle',
-	'Item has been deleted.' => 'Datensatz gelöscht.',
-	'Item has been updated.' => 'Datensatz geändert.',
-	'Item%s has been inserted.' => 'Datensatz%s hinzugefügt.',
-	'Edit' => 'Ändern',
-	'Insert' => 'Hinzufügen',
-	'Save and insert next' => 'Speichern und nächsten hinzufügen',
+	'Item has been deleted.' => 'Datensatz wurde gelöscht.',
+	'Item has been updated.' => 'Datensatz wurde geändert.',
+	'Item%s has been inserted.' => 'Datensatz%s wurde eingefügt.',
+	'Edit' => 'Bearbeiten',
+	'Insert' => 'Einfügen',
+	'Save and insert next' => 'Speichern und nächsten einfügen',
 	'Delete' => 'Entfernen',
 	'Database' => 'Datenbank',
-	'Routines' => 'Prozeduren',
+	'Routines' => 'Routinen',
 	'Indexes have been altered.' => 'Indizes geändert.',
 	'Indexes' => 'Indizes',
 	'Alter indexes' => 'Indizes ändern',
@@ -58,9 +55,9 @@ $translations = array(
 	'Sort' => 'Ordnen',
 	'descending' => 'absteigend',
 	'Limit' => 'Begrenzung',
-	'No rows.' => 'Keine Daten.',
+	'No rows.' => 'Keine Datensätze.',
 	'Action' => 'Aktion',
-	'edit' => 'ändern',
+	'edit' => 'bearbeiten',
 	'Page' => 'Seite',
 	'Query executed OK, %d row(s) affected.' => array('Abfrage ausgeführt, %d Datensatz betroffen.', 'Abfrage ausgeführt, %d Datensätze betroffen.'),
 	'Error in query' => 'Fehler in der SQL-Abfrage',
@@ -78,16 +75,16 @@ $translations = array(
 	'Unable to upload a file.' => 'Hochladen von Datei fehlgeschlagen.',
 	'File upload' => 'Datei importieren',
 	'File uploads are disabled.' => 'Importieren von Dateien abgeschaltet.',
-	'Routine has been called, %d row(s) affected.' => array('Kommando SQL ausgeführt, %d Datensatz betroffen.', 'Kommando SQL ausgeführt, %d Datensätze betroffen.'),
+	'Routine has been called, %d row(s) affected.' => array('Routine wurde ausgeführt, %d Datensatz betroffen.', 'Routine wurde ausgeführt, %d Datensätze betroffen.'),
 	'Call' => 'Aufrufen',
 	'No extension' => 'Keine Erweiterungen installiert',
 	'None of the supported PHP extensions (%s) are available.' => 'Keine der unterstützten PHP-Erweiterungen (%s) ist vorhanden.',
-	'Session support must be enabled.' => 'Sitzungen müssen aktiviert sein.',
+	'Session support must be enabled.' => 'Unterstüzung für PHP-Sessions muss aktiviert sein.',
 	'Session expired, please login again.' => 'Sitzungsdauer abgelaufen, bitte erneut anmelden.',
 	'Text length' => 'Textlänge',
-	'Foreign key has been dropped.' => 'Fremdschlüssel entfernt.',
-	'Foreign key has been altered.' => 'Fremdschlüssel geändert.',
-	'Foreign key has been created.' => 'Fremdschlüssel erstellt.',
+	'Foreign key has been dropped.' => 'Fremdschlüssel wurde entfernt.',
+	'Foreign key has been altered.' => 'Fremdschlüssel wurde geändert.',
+	'Foreign key has been created.' => 'Fremdschlüssel wurde erstellt.',
 	'Foreign key' => 'Fremdschlüssel',
 	'Target table' => 'Zieltabelle',
 	'Change' => 'Ändern',
@@ -100,53 +97,53 @@ $translations = array(
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Index-Typ',
 	'Column (length)' => 'Spalte (Länge)',
-	'View has been dropped.' => 'View entfernt.',
-	'View has been altered.' => 'View geändert.',
-	'View has been created.' => 'View erstellt.',
+	'View has been dropped.' => 'View wurde entfernt.',
+	'View has been altered.' => 'View wurde geändert.',
+	'View has been created.' => 'View wurde erstellt.',
 	'Alter view' => 'View ändern',
-	'Create view' => 'Neue View erstellen',
+	'Create view' => 'View erstellen',
 	'Name' => 'Name',
 	'Process list' => 'Prozessliste',
 	'%d process(es) have been killed.' => array('%d Prozess gestoppt.', '%d Prozesse gestoppt.'),
 	'Kill' => 'Anhalten',
 	'Parameter name' => 'Name des Parameters',
 	'Database schema' => 'Datenbankschema',
-	'Create procedure' => 'Neue Prozedur',
-	'Create function' => 'Neue Funktion',
-	'Routine has been dropped.' => 'Prozedur entfernt.',
-	'Routine has been altered.' => 'Prozedur geändert.',
-	'Routine has been created.' => 'Prozedur erstellt.',
+	'Create procedure' => 'Prozedur erstellen',
+	'Create function' => 'Funktion erstellen',
+	'Routine has been dropped.' => 'Routine wurde entfernt.',
+	'Routine has been altered.' => 'Routine wurde geändert.',
+	'Routine has been created.' => 'Routine wurde erstellt.',
 	'Alter function' => 'Funktion ändern',
 	'Alter procedure' => 'Prozedur ändern',
 	'Return type' => 'Typ des Rückgabewertes',
 	'Add trigger' => 'Trigger hinzufügen',
-	'Trigger has been dropped.' => 'Trigger entfernt.',
-	'Trigger has been altered.' => 'Trigger geändert.',
-	'Trigger has been created.' => 'Trigger erstellt.',
+	'Trigger has been dropped.' => 'Trigger wurde entfernt.',
+	'Trigger has been altered.' => 'Trigger wurde geändert.',
+	'Trigger has been created.' => 'Trigger wurde erstellt.',
 	'Alter trigger' => 'Trigger ändern',
-	'Create trigger' => 'Trigger hinzufügen',
+	'Create trigger' => 'Trigger erstellen',
 	'Time' => 'Zeitpunkt',
 	'Event' => 'Ereignis',
-	'%s version: %s through PHP extension %s' => 'Version %s: %s, mit PHP-Erweiterung %s',
+	'%s version: %s through PHP extension %s' => 'Version %s: %s mit PHP-Erweiterung %s',
 	'%d row(s)' => array('%d Datensatz', '%d Datensätze'),
 	'Remove' => 'Entfernen',
-	'Are you sure?' => 'Sind Sie sicher ?',
+	'Are you sure?' => 'Sind Sie sicher?',
 	'Privileges' => 'Rechte',
-	'Create user' => 'Neuer Benutzer',
-	'User has been dropped.' => 'Benutzer entfernt.',
-	'User has been altered.' => 'Benutzer geändert.',
-	'User has been created.' => 'Benutzer erstellt.',
+	'Create user' => 'Benutzer erstellen',
+	'User has been dropped.' => 'Benutzer wurde entfernt.',
+	'User has been altered.' => 'Benutzer wurde geändert.',
+	'User has been created.' => 'Benutzer wurde erstellt.',
 	'Hashed' => 'Hashed',
 	'Column' => 'Spalte',
-	'Routine' => 'Rutine',
+	'Routine' => 'Routine',
 	'Grant' => 'Erlauben',
-	'Revoke' => 'Verbieten',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST data zu gross. Reduzieren Sie die Grösse oder vergrössern Sie den Wert %s in der Konfiguration.',
+	'Revoke' => 'Widerrufen',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST-Daten sind zu groß. Reduzieren Sie die Größe oder vergrößern Sie den Wert %s in der Konfiguration.',
 	'Logged as: %s' => 'Angemeldet als: %s',
 	'Move up' => 'Nach oben',
 	'Move down' => 'Nach unten',
 	'Functions' => 'Funktionen',
-	'Aggregation' => 'Agregationen',
+	'Aggregation' => 'Aggregationen',
 	'Export' => 'Exportieren',
 	'Output' => 'Ergebnis',
 	'open' => 'anzeigen',
@@ -154,9 +151,9 @@ $translations = array(
 	'Format' => 'Format',
 	'Tables' => 'Tabellen',
 	'Data' => 'Daten',
-	'Event has been dropped.' => 'Ereignis entfernt.',
-	'Event has been altered.' => 'Ereignis geändert.',
-	'Event has been created.' => 'Ereignis erstellt.',
+	'Event has been dropped.' => 'Ereignis wurde entfernt.',
+	'Event has been altered.' => 'Ereignis wurde geändert.',
+	'Event has been created.' => 'Ereignis wurde erstellt.',
 	'Alter event' => 'Ereignis ändern',
 	'Create event' => 'Ereignis erstellen',
 	'At given time' => 'Zur angegebenen Zeit',
@@ -168,34 +165,35 @@ $translations = array(
 	'Status' => 'Status',
 	'On completion preserve' => 'Nach der Ausführung erhalten',
 	'Tables and views' => 'Tabellen und Views',
-	'Data Length' => 'Datengrösse',
-	'Index Length' => 'Indexgrösse',
+	'Data Length' => 'Datengröße',
+	'Index Length' => 'Indexgröße',
 	'Data Free' => 'Freier Bereich',
-	'Collation' => 'Collation',
+	'Collation' => 'Kollation',
 	'Analyze' => 'Analysieren',
 	'Optimize' => 'Optimieren',
 	'Check' => 'Prüfen',
 	'Repair' => 'Reparieren',
-	'Truncate' => 'Entleeren (truncate)',
-	'Tables have been truncated.' => 'Tabellen sind entleert worden (truncate).',
+	'Truncate' => 'Leeren (truncate)',
+	'Tables have been truncated.' => 'Tabellen wurden geleert (truncate).',
 	'Rows' => 'Datensätze',
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'Tabellen verschoben.',
 	'Move to other database' => 'In andere Datenbank verschieben',
 	'Move' => 'Verschieben',
-	'Engine' => 'Motor',
+	'Engine' => 'Speicher-Engine',
 	'Save and continue edit' => 'Speichern und weiter bearbeiten',
 	'original' => 'Original',
 	'Tables have been dropped.' => 'Tabellen wurden entfernt (drop).',
 	'%d item(s) have been affected.' => '%d Artikel betroffen.',
 	'whole result' => 'Gesamtergebnis',
 	'Clone' => 'Klonen',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Die maximal erlaubte Anzahl der Felder ist überschritten. Bitte %s und %s erhöhen.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Die maximal erlaubte Anzahl der Felder ist überschritten. Bitte %s erhöhen.',
 	'Partition by' => 'Partitionieren um',
 	'Partitions' => 'Partitionen',
 	'Partition name' => 'Name der Partition',
 	'Values' => 'Werte',
-	'%d row(s) have been imported.' => array('%d Datensatz importiert.', '%d Datensätze wurden importiert.'),
+	'%d row(s) have been imported.' => array('%d Datensatz wurde importiert.', '%d Datensätze wurden importiert.'),
 	'anywhere' => 'beliebig',
 	'Import' => 'Importieren',
 	'Stop on error' => 'Bei Fehler anhalten',
@@ -204,50 +202,49 @@ $translations = array(
 	'[yyyy]-mm-dd' => 't.m.[jjjj]',
 	'History' => 'History',
 	'Variables' => 'Variablen',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Spalten des Ursprungs und des Zieles müssen vom gleichen Datentyp sein, es muss unter den Zielspalten ein Index existieren und die referenzierten Daten müssen existieren.',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Quell- und Zielspalten müssen vom gleichen Datentyp sein, es muss unter den Zielspalten ein Index existieren und die referenzierten Daten müssen existieren.',
 	'Relations' => 'Relationen',
 	'Run file' => 'Datei ausführen',
-	'Clear' => 'Entleeren',
-	'Maximum allowed file size is %sB.' => 'Maximal erlaubte Dateigrösse ist %sB.',
+	'Clear' => 'Löschen',
+	'Maximum allowed file size is %sB.' => 'Maximal erlaubte Dateigröße ist %sB.',
 	'Numbers' => 'Zahlen',
-	'Date and time' => 'Datum oder Zeit',
+	'Date and time' => 'Datum und Zeit',
 	'Strings' => 'Zeichenketten',
 	'Binary' => 'Binär',
 	'Lists' => 'Listen',
 	'Editor' => 'Editor',
-	'E-mail' => 'E-mail',
+	'E-mail' => 'E-Mail',
 	'From' => 'Von',
 	'Subject' => 'Betreff',
 	'Send' => 'Abschicken',
-	'%d e-mail(s) have been sent.' => array('%d e-mail abgeschickt.', '%d e-mails abgeschickt.'),
+	'%d e-mail(s) have been sent.' => array('%d E-Mail abgeschickt.', '%d E-Mails abgeschickt.'),
 	'Webserver file %s' => 'Webserver Datei %s',
 	'File does not exist.' => 'Datei existiert nicht.',
 	'%d in total' => '%d insgesamt',
 	'Permanent login' => 'Passwort speichern',
-	'Databases have been dropped.' => 'Datenbanken entfernt.',
+	'Databases have been dropped.' => 'Datenbanken wurden entfernt.',
 	'Search data in tables' => 'Suche in Tabellen',
-	'schema' => 'Schema',
 	'Schema' => 'Schema',
 	'Alter schema' => 'Schema ändern',
-	'Create schema' => 'Neues Schema',
+	'Create schema' => 'Schema erstellen',
 	'Schema has been dropped.' => 'Schema wurde gelöscht.',
-	'Schema has been created.' => 'Neues Schema erstellt.',
-	'Schema has been altered.' => 'Schema geändert.',
-	'Sequences' => 'Sequenz',
-	'Create sequence' => 'Neue Sequenz',
+	'Schema has been created.' => 'Schema wurde erstellt.',
+	'Schema has been altered.' => 'Schema wurde geändert.',
+	'Sequences' => 'Sequenzen',
+	'Create sequence' => 'Sequenz erstellen',
 	'Alter sequence' => 'Sequenz ändern',
-	'Sequence has been dropped.' => 'Sequenz gelöscht.',
-	'Sequence has been created.' => 'Neue Sequenz erstellt.',
-	'Sequence has been altered.' => 'Sequenz geändert.',
-	'User types' => 'Benutzer-definierte Typen',
+	'Sequence has been dropped.' => 'Sequenz wurde gelöscht.',
+	'Sequence has been created.' => 'Sequenz wurde erstellt.',
+	'Sequence has been altered.' => 'Sequenz wurde geändert.',
+	'User types' => 'Benutzerdefinierte Typen',
 	'Create type' => 'Typ erstellen',
 	'Alter type' => 'Typ ändern',
-	'Type has been dropped.' => 'Typ gelöscht.',
-	'Type has been created.' => 'Typ erstellt.',
-	'Double click on a value to modify it.' => 'Doppelklick zum Bearbeiten des Wertes.',
-	'Use edit link to modify this value.' => 'Benutzen Sie den Link zum editieren dieses Wertes.',
+	'Type has been dropped.' => 'Typ wurde gelöscht.',
+	'Type has been created.' => 'Typ wurde erstellt.',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+Klick zum Bearbeiten des Wertes.',
+	'Use edit link to modify this value.' => 'Benutzen Sie den Link zum Bearbeiten dieses Wertes.',
 	'last' => 'letzte',
-	'From server' => 'Im Server',
+	'From server' => 'Vom Server',
 	'System' => 'Datenbank System',
 	'Select data' => 'Daten auswählen',
 	'Show structure' => 'Struktur anzeigen',
@@ -256,9 +253,8 @@ $translations = array(
 	'Geometry' => 'Geometrie',
 	'File exists.' => 'Datei existiert schon.',
 	'Attachments' => 'Anhänge',
-	'%d query(s) executed OK.' => array('SQL-Query erfolgreich ausgeführt.', '%d SQL-Queries erfolgreich ausgeführt.'),
+	'%d query(s) executed OK.' => array('SQL-Abfrage erfolgreich ausgeführt.', '%d SQL-Abfragen erfolgreich ausgeführt.'),
 	'Show only errors' => 'Nur Fehler anzeigen',
-	'Last page' => 'Letzte Seite',
 	'Refresh' => 'Aktualisieren',
 	'Invalid schema.' => 'Schema nicht gültig.',
 	'Please use one of the extensions %s.' => 'Bitte einen der Dateitypen %s benutzen.',
@@ -267,6 +263,26 @@ $translations = array(
 	'Tables have been copied.' => 'Tabellen wurden kopiert.',
 	'Copy' => 'Kopieren',
 	'Permanent link' => 'Dauerhafter Link',
-	'Edit all' => 'Alle ändern',
+	'Edit all' => 'Alle bearbeiten',
 	'HH:MM:SS' => 'HH:MM:SS',
+	'Compute' => 'kalkulieren',
+	'Size' => 'Größe',
+	'Modify' => 'Ändern',
+	'Selected' => 'Ausgewählte',
+	'Default value' => 'Vorgabewert festlegen',
+	'Limit rows' => 'Datensätze begrenzen',
+	'Tables have been optimized.' => 'Tabellen wurden optimiert.',
+	'File must be in UTF-8 encoding.' => 'Die Datei muss UTF-8 kodiert sein.',
+	'Loading' => 'Lade',
+	'Load more data' => 'Mehr Daten laden',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Zu viele erfolglose Login-Versuche. Bitte probieren Sie es in %d Minute noch einmal.', 'Zu viele erfolglose Login-Versuche. Bitte probieren Sie es in %d Minuten noch einmal.'),
+	'If you did not send this request from Adminer then close this page.' => 'Wenn Sie diese Anfrage nicht von Adminer gesendet haben, schließen Sie diese Seite.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Sie können eine große SQL-Datei per FTP hochladen und dann vom Server importieren.',
+	'You are offline.' => 'Sie sind offline.',
+	'You have no privileges to update this table.' => 'Sie haben keine Rechte, um diese Tabelle zu aktualisieren.' ,
+	'Saving' => 'Speichere',
+	'yes' => 'ja',
+	'no' => 'nein',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Das Master-Passwort ist abgelaufen.  <a href="https://www.adminer.org/de/extension/" target="_blank">Implementieren</a> Sie die %s Methode, um es permanent zu machen.',
+	'%d / ' => '%d / ',
 );

adminer/lang/el.inc.php

@@ -0,0 +1,336 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'Σύστημα',
+	'Server' => 'Διακομιστής',
+	'Username' => 'Όνομα Χρήστη',
+	'Password' => 'Κωδικός',
+	'Permanent login' => 'Μόνιμη Σύνδεση',
+	'Login' => 'Σύνδεση',
+	'Logout' => 'Αποσύνδεση',
+	'Logged as: %s' => 'Συνδεθήκατε ως %s',
+	'Logout successful.' => 'Αποσυνδεθήκατε με επιτυχία.',
+	'Invalid credentials.' => 'Εσφαλμένα Διαπιστευτήρια.',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Επανηλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτό.', 'Επανηλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτά.'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Έλειξε ο Κύριος Κωδικός. <a href="https://www.adminer.org/en/extension/" target="_blank">Ενεργοποιήστε</a> τη μέθοδο %s για να τον κάνετε μόνιμο.',
+	'Language' => 'Γλώσσα',
+	'Invalid CSRF token. Send the form again.' => 'Άκυρο κουπόνι CSRF. Στείλτε τη φόρμα ξανά.',
+	'If you did not send this request from Adminer then close this page.' => 'Αν δε στείλατε αυτό το αίτημα από το Adminer, τότε κλείστε αυτή τη σελίδα.',
+	'No extension' => 'Χωρίς Επεκτάσεις',
+	'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 μέσω επέκτασης PHP %s',
+	'Refresh' => 'Ανανέωση',
+	
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+	
+	'Privileges' => 'Προνόμια',
+	'Create user' => 'Δημιουργία Χρήστη',
+	'User has been dropped.' => 'Ο Χρήστης διαγράφηκε.',
+	'User has been altered.' => 'Ο Χρήστης τροποποιήθηκε.',
+	'User has been created.' => 'Ο Χρήστης δημιουργήθηκε.',
+	'Hashed' => 'Κωδικοποιήθηκε',
+	'Column' => 'Στήλη',
+	'Routine' => 'Ρουτίνα',
+	'Grant' => 'Παραχώρηση',
+	'Revoke' => 'Ανάκληση',
+	
+	'Process list' => 'Λίστα διεργασιών',
+	'%d process(es) have been killed.' => array('Τερματίστηκαν %d διεργασία.', 'Τερματίστηκαν %d διεργασίες.'),
+	'Kill' => 'Τερματισμός',
+	
+	'Variables' => 'Μεταβλητές',
+	'Status' => 'Κατάσταση',
+	
+	'SQL command' => 'Εντολή SQL',
+	'%d query(s) executed OK.' => array('Το ερώτημα %d εκτελέστηκε ΟΚ.', 'Τα ερώτηματα %d εκτελέστηκαν ΟΚ.'),
+	'Query executed OK, %d row(s) affected.' => array('Το ερώτημα εκτελέστηκε ΟΚ, επιρρεάστηκε %d σειρά.', 'Το ερώτημα εκτελέστηκε ΟΚ, επιρρεάστηκαν %d σειρές.'),
+	'No commands to execute.' => 'Δεν υπάρχει εντολή να εκτελεστεί.',
+	'Error in query' => 'Σφάλμα στο ερώτημα',
+	'Execute' => 'Εκτέλεση',
+	'Stop on error' => 'Διακοπή όταν υπάρχει σφάλμα',
+	'Show only errors' => 'Να εμφανίζονται μόνο τα σφάλματα',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'History' => 'Ιστορικό',
+	'Clear' => 'Καθαρισμός',
+	'Edit all' => 'Επεξεργασία όλων',
+	
+	'File upload' => 'Ανέβασμα αρχείου',
+	'From server' => 'Από διακομιστή',
+	'Webserver file %s' => 'Αρχείο %s από διακομιστή web',
+	'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.' => 'Πολλά δεδομένα POST. Μείωστε τα περιεχόμενα ή αυξήστε την σχετική ρύθμιση %s.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Μπορείτε να ανεβάσετε ένα μεγάλο αρχείο SQL μέσω FTP και να το εισάγετε από το διακομιστή.',
+	'You are offline.' => 'Βρίσκεστε εκτός σύνδεσης.',
+	
+	'Export' => 'Εξαγωγή',
+	'Output' => 'Αποτέλεσμα',
+	'open' => 'άνοιγμα',
+	'save' => 'αποθήκευση',
+	'Saving' => 'Γίνεται Αποθήκευση',
+	'Format' => 'Μορφή',
+	'Data' => 'Δεδομένα',
+	
+	'Database' => 'Β. Δεδομένων',
+	'database' => 'β. δεδομένων',
+	'Use' => 'χρήση',
+	'Select database' => 'Επιλέξτε Β.Δ.',
+	'Invalid 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' => '0123456789',
+	'Engine' => 'Μηχανή',
+	'Collation' => 'Collation',
+	'Data Length' => 'Μήκος Δεδομένων',
+	'Index Length' => 'Μήκος Δείκτη',
+	'Data Free' => 'Δεδομένα Ελεύθερα',
+	'Rows' => 'Σειρές',
+	'%d in total' => '%d συνολικά',
+	'Analyze' => 'Ανάλυση',
+	'Optimize' => 'Βελτιστοποίηση',
+	'Vacuum' => 'Καθαρισμός',
+	'Check' => 'Έλεγχος',
+	'Repair' => 'Επιδιόρθωση',
+	'Truncate' => 'Περικοπή',
+	'Tables have been truncated.' => 'Οι πίνακες περικόπτηκαν.',
+	'Move to other database' => 'Μεταφορά σε άλλη Β.Δ.',
+	'Move' => 'Μεταφορά',
+	'Tables have been moved.' => 'Οι πίνακες μεταφέρθηκαν.',
+	'Copy' => 'Αντιγραφή',
+	'Tables have been copied.' => 'Οι πίνακες αντιγράφηκαν.',
+	
+	'Routines' => 'Ρουτίνες',
+	'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.' => 'Η ρουτίνα δημιουργήθηκε.',
+	'Alter function' => 'Τροποποίηση λειτουργίας',
+	'Alter procedure' => 'Τροποποίηση διαδικασίας',
+	'Return type' => 'Επιστρεφόμενος τύπος',
+	
+	'Events' => 'Γεγονός',
+	'Event has been dropped.' => 'Το γεγονός διαγράφηκε.',
+	'Event has been altered.' => 'Το γεγονός τροποποιήθηκε.',
+	'Event has been created.' => 'Το γεγονός δημιουργήθηκε.',
+	'Alter event' => 'Τροποποίηση γεγονότος',
+	'Create event' => 'Δημιουργία γεγονότος',
+	'At given time' => 'Σε προκαθορισμένο χρόνο',
+	'Every' => 'Κάθε',
+	'Schedule' => 'Προγραμματισμός',
+	'Start' => 'Έναρξη',
+	'End' => 'Λήξη',
+	'On completion preserve' => 'Κατά την ολοκλήρωση διατήρησε',
+	
+	'Tables' => 'Πίνακες',
+	'Tables and views' => 'Πίνακες και Προβολές',
+	'Table' => 'Πίνακας',
+	'No tables.' => 'Χωρίς πίνακες.',
+	'Alter table' => 'Τροποποίηση πίνακα',
+	'Create table' => 'Δημιουργία  πίνακα',
+	'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' => 'μηχανή',
+	'collation' => 'collation',
+	'Column name' => 'Όνομα στήλης',
+	'Type' => 'Τύπος',
+	'Length' => 'Μήκος',
+	'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.',
+	
+	'Partition by' => 'Τμηματοποίηση ανά',
+	'Partitions' => 'Τμήματα',
+	'Partition name' => 'Όνομα Τμήματος',
+	'Values' => 'Τιμές',
+	
+	'View' => 'Προβολή',
+	'Materialized view' => 'Υλοποιημένη προβολή',
+	'View has been dropped.' => 'Η προβολή διαγράφηκε.',
+	'View has been altered.' => 'Η προβολή τροποποιήθηκε.',
+	'View has been created.' => 'Η προβολή δημιουργήθηκε.',
+	'Alter view' => 'Τροποποίηση προβολής',
+	'Create view' => 'Δημιουργία προβολής',
+	
+	'Indexes' => 'Δείκτες',
+	'Indexes have been altered.' => 'Οι δείκτες τροποποιήθηκαν.',
+	'Alter indexes' => 'Τροποποίηση δεικτών',
+	'Add next' => 'Προσθήκη επόμενου',
+	'Index Type' => 'Τύπος δείκτη',
+	'Column (length)' => 'Στήλη (μήκος)',
+	
+	'Foreign keys' => 'Εξαρτημένα κλειδιά',
+	'Foreign key' => 'Εξαρτημένο κλειδί',
+	'Foreign key has been dropped.' => 'Το εξαρτημένο κλειδί διαγράφηκε.',
+	'Foreign key has been altered.' => 'Το εξαρτημένο κλειδί τροποποιήθηκε.',
+	'Foreign key has been created.' => 'Το εξαρτημένο κλειδί δημιουργήθηκε.',
+	'Target table' => 'Πίνακας Στόχος',
+	'Change' => 'Αλλαγή',
+	'Source' => 'Πηγή',
+	'Target' => 'Στόχος',
+	'Add column' => 'Προσθήκη στήλης',
+	'Alter' => 'Τροποποίηση',
+	'Add foreign key' => 'Προσθήκη εξαρτημένου κλειδιού',
+	'ON DELETE' => 'ΚΑΤΑ ΤΗ ΔΙΑΓΡΑΦΗ',
+	'ON UPDATE' => 'ΚΑΤΑ ΤΗΝ ΑΛΛΑΓΗ',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Οι στήλες στη πηγή και το στόχο πρέπει να έχουν τον ίδιο τύπο, πρέπει να υπάρχει δείκτης στη στήλη στόχο και να υπάρχουν εξαρτημένα δεδομένα.',
+	
+	'Triggers' => 'Εναύσματα',
+	'Add trigger' => 'Προσθήκη εναύσματος',
+	'Trigger has been dropped.' => 'Το έναυσμα διαγράφηκε.',
+	'Trigger has been altered.' => 'Το έναυσμα τροποποιήθηκε.',
+	'Trigger has been created.' => 'Το έναυσμα δημιουργήθηκε.',
+	'Alter trigger' => 'Τροποποίηση εναύσματος',
+	'Create trigger' => 'Δημιουργία εναύσματος',
+	'Time' => 'Ώρα',
+	'Event' => 'Γεγονός',
+	'Name' => 'Όνομα',
+	
+	'select' => 'επιλογή',
+	'Select' => 'Επιλογή',
+	'Select data' => 'Επιλέξτε δεδομένα',
+	'Functions' => 'Λειτουργίες',
+	'Aggregation' => 'Άθροισμα',
+	'Search' => 'Αναζήτηση',
+	'anywhere' => 'παντού',
+	'Search data in tables' => 'Αναζήτηση δεδομένων στους πίνακες',
+	'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 byte', '%d bytes'),
+	
+	'Import' => 'Εισαγωγή',
+	'%d row(s) have been imported.' => array('$d σειρά εισήχθη.', '%d σειρές εισήχθησαν.'),
+	'File must be in UTF-8 encoding.' => 'Το αρχείο πρέπει να έχει κωδικοποίηση UTF-8.',
+	
+	// in-place editing in select
+	'Modify' => 'Τροποποίηση',
+	'Ctrl+click on a value to modify it.' => 'Πιέστε Ctrl+click σε μια τιμή για να την τροποποιήσετε.',
+	'Use edit link to modify this value.' => 'Χρησιμοποιήστε το σύνδεσμο επεξεργασία για να τροποποιήσετε την τιμή.',
+	
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'Η εγγραφή%s εισήχθη.',
+	'Item has been deleted.' => 'Η εγγραφή διαγράφηκε.',
+	'Item has been updated.' => 'Η εγγραφή ενημερώθηκε.',
+	'%d item(s) have been affected.' => array('Επιρρεάστηκε %d εγγραφή.', 'Επιρρεάστηκαν %d εγγραφές.'),
+	'New item' => 'Νέα εγγραφή',
+	'original' => 'πρωτότυπο',
+	// label for value '' in enum data type
+	'empty' => 'κενό',
+	'edit' => 'επεξεργασία',
+	'Edit' => 'Επεξεργασία',
+	'Insert' => 'Εισαγωγή',
+	'Save' => 'Αποθήκευση',
+	'Save and continue edit' => 'Αποθήκευση και συνέχεια επεξεργασίας',
+	'Save and insert next' => 'Αποθήκευση και εισαγωγή επόμενου',
+	'Selected' => 'Επιλεγμένα',
+	'Clone' => 'Κλονοποίηση',
+	'Delete' => 'Διαγραφή',
+	'You have no privileges to update this table.' => 'Δεν έχετε δικαίωμα να τροποποιήσετε αυτό τον πίνακα.',
+	
+	'E-mail' => 'E-mail',
+	'From' => 'Από',
+	'Subject' => 'Θέμα',
+	'Attachments' => 'Συνημμένα',
+	'Send' => 'Αποστολή',
+	'%d e-mail(s) have been sent.' => array('%d e-mail απεστάλλει.', '%d e-mail απεστάλλησαν.'),
+	
+	// data type descriptions
+	'Numbers' => 'Αριθμοί',
+	'Date and time' => 'Ημερομηνία και ώρα',
+	'Strings' => 'Κείμενο',
+	'Binary' => 'Δυαδικό',
+	'Lists' => 'Λίστες',
+	'Network' => 'Δίκτυο',
+	'Geometry' => 'Γεωμετρία',
+	'Relations' => 'Συσχετήσεις',
+	
+	'Editor' => 'Επεξεργαστής',
+	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
+	'$1-$3-$5' => '$5/$3/$1',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => 'ηη/μμ/[εεεε]',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'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.',
+	
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'Τροποποίηση σχήματος',
+	'Create schema' => 'Δημιουργία σχήματος',
+	'Schema has been dropped.' => 'Το σχήμα διαγράφηκε.',
+	'Schema has been created.' => 'Το σχήμα δημιουργήθηκε.',
+	'Schema has been altered.' => 'Το σχήμα τροποποιήθηκε.',
+	'Schema' => 'Σχήμα',
+	'Invalid schema.' => 'Άκυρο σχήμα.',
+	
+	// PostgreSQL sequences support
+	'Sequences' => 'Αλληλουχία',
+	'Create sequence' => 'Δημιουργία αλληλουχίας',
+	'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.' => 'Ο τύπος δημιουργήθηκε.',
+	'Alter type' => 'Τροποποίηση τύπου',
+);

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,17 @@
 <?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.',
 	'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,23 +30,21 @@ $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.',
 	'select' => 'registros',
-	'Create new table' => 'Nueva tabla',
 	'Item has been deleted.' => 'Registro eliminado.',
 	'Item has been updated.' => 'Registro modificado.',
 	'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',
@@ -57,33 +54,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.',
@@ -95,9 +92,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.',
@@ -118,16 +115,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?',
@@ -146,7 +143,7 @@ $translations = array(
 	'Move up' => 'Mover arriba',
 	'Move down' => 'Mover abajo',
 	'Functions' => 'Funciones',
-	'Aggregation' => 'Agregaciones',
+	'Aggregation' => 'Agregados',
 	'Export' => 'Exportar',
 	'Output' => 'Salida',
 	'open' => 'mostrar',
@@ -159,14 +156,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',
@@ -177,9 +174,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',
@@ -187,10 +185,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 and %s.' => 'Cantida máxima de campos permitidos excedidos. Por favor aumente %s y %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',
@@ -202,13 +200,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',
@@ -221,12 +219,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',
@@ -239,13 +236,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.',
-	'Double click on a value to modify it.' => 'Doble-clic sobre el valor para editarlo.',
-	'Use edit link to modify this value.' => 'Utilice el enlace de modificar para realizar los cambios.',
+	'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 edición para realizar cambios.',
 	'last' => 'último',
 	'From server' => 'Desde servidor',
 	'System' => 'Motor de base de datos',
@@ -254,11 +251,10 @@ $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',
-	'Last page' => 'Ultima página',
 	'Refresh' => 'Refrescar',
 	'Invalid schema.' => 'Esquema inválido.',
 	'Please use one of the extensions %s.' => 'Por favor use una de las extensiones %s.',

adminer/lang/et.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Parool',
 	'Select database' => 'Vali andmebaas',
 	'Invalid database.' => 'Tundmatu andmebaas.',
-	'Create new database' => 'Loo uus andmebaas',
 	'Table has been dropped.' => 'Tabel on edukalt kustutatud.',
 	'Table has been altered.' => 'Tabeli andmed on edukalt muudetud.',
 	'Table has been created.' => 'Tabel on edukalt loodud.',
@@ -31,13 +30,11 @@ $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',
 	'No tables.' => 'Tabeleid ei leitud.',
 	'select' => 'kuva',
-	'Create new table' => 'Loo uus tabel',
 	'Item has been deleted.' => 'Kustutamine õnnestus.',
 	'Item has been updated.' => 'Uuendamine õnnestus.',
 	'Item%s has been inserted.' => 'Kirje%s on edukalt lisatud.',
@@ -180,6 +177,7 @@ $translations = array(
 	'Data Free' => 'Vaba ruumi',
 	'Rows' => 'Ridu',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Analyze' => 'Analüüsi',
 	'Optimize' => 'Optimeeri',
 	'Check' => 'Kontrolli',
@@ -190,7 +188,7 @@ $translations = array(
 	'%d item(s) have been affected.' => 'Mõjutatud kirjeid: %d.',
 	'whole result' => 'Täielikud tulemused',
 	'Clone' => 'Kloon',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Maksimaalne väljade arv ületatud. Palun suurendage %s ja %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maksimaalne väljade arv ületatud. Palun suurendage %s.',
 	'Partition by' => 'Partitsiooni',
 	'Partitions' => 'Partitsioonid',
 	'Partition name' => 'Partitsiooni nimi',
@@ -226,7 +224,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',
@@ -244,7 +241,7 @@ $translations = array(
 	'Alter type' => 'Muuda tüüpi',
 	'Type has been dropped.' => 'Tüüp on edukalt kustutatud.',
 	'Type has been created.' => 'Tüüp on edukalt loodud.',
-	'Double click on a value to modify it.' => 'Väärtuse muutmiseks topelt-kliki sellel.',
+	'Ctrl+click on a value to modify it.' => 'Väärtuse muutmiseks Ctrl+kliki sellel.',
 	'Use edit link to modify this value.' => 'Väärtuse muutmiseks kasuta muutmislinki.',
 	'last' => 'viimane',
 	'From server' => 'Serverist',
@@ -258,7 +255,6 @@ $translations = array(
 	'Attachments' => 'Manused',
 	'%d query(s) executed OK.' => array('%d päring edukalt käivitatud.', '%d päringut edukalt käivitatud.'),
 	'Show only errors' => 'Kuva vaid veateateid',
-	'Last page' => 'Viimane lehekülg',
 	'Refresh' => 'Uuenda',
 	'Invalid schema.' => 'Sobimatu skeema.',
 	'Please use one of the extensions %s.' => 'Palun kasuta üht laiendustest %s.',

adminer/lang/fa.inc.php

@@ -1,98 +1,101 @@
 <?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="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'رمز اصلی باطل شده است. روش %s را <a href="https://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.' => 'پایگاه داده نامعتبر.',
+	'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 +105,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,11 +148,11 @@ $translations = array(
 	'No tables.' => 'جدولی وجود ندارد',
 	'Alter table' => 'ویرایش جدول',
 	'Create table' => 'ایجاد جدول',
-	'Create new 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' => 'موتور',
@@ -159,13 +163,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 and %s.' => 'حداکثر مجاز فیلدهای مجاز اشباع شد. لطفا %s و %s را کاهش دهید',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'حداکثر تعداد فیلدهای مجاز اشباع شد. لطفا %s را افزایش دهید.',
 	
 	'Partition by' => 'بخشبندی توسط',
 	'Partitions' => 'بخشبندیها',
@@ -173,14 +180,15 @@ $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' => 'ایجاد نمایش',
 	
 	'Indexes' => 'ایندکسها',
-	'Indexes have been altered.' => 'ایندکسها ویرایش شد',
+	'Indexes have been altered.' => 'ایندکسها ویرایش شدند.',
 	'Alter indexes' => 'ویرایش ایندکسها',
 	'Add next' => 'افرودن بعدی',
 	'Index Type' => 'نوع ایندکس',
@@ -188,9 +196,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' => 'منبع',
@@ -200,13 +208,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' => 'زمان',
@@ -224,29 +232,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' => 'آخری',
-	'Last page' => 'صفحه آخر',
+	'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
-	'Double click on a value to modify it.' => 'روی مقدار دوبار کلیک کنید تا آنرا ویرایش کنید',
-	'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
@@ -257,15 +271,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' => 'اعداد',
@@ -285,33 +301,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/fi.inc.php

@@ -0,0 +1,336 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'Järjestelmä',
+	'Server' => 'Palvelin',
+	'Username' => 'Käyttäjänimi',
+	'Password' => 'Salasana',
+	'Permanent login' => 'Haluan pysyä kirjautuneena',
+	'Login' => 'Kirjaudu',
+	'Logout' => 'Kirjaudu ulos',
+	'Logged as: %s' => 'Olet kirjautunut käyttäjänä: %s',
+	'Logout successful.' => 'Uloskirjautuminen onnistui.',
+	'Invalid credentials.' => 'Virheelliset kirjautumistiedot.',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Liian monta epäonnistunutta sisäänkirjautumisyritystä, kokeile uudestaan %d minuutin kuluttua.', 'Liian monta epäonnistunutta sisäänkirjautumisyritystä, kokeile uudestaan %d minuutin kuluttua.'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Master-salasana ei ole enää voimassa. <a href="https://www.adminer.org/en/extension/" target="_blank">Toteuta</a> %s-metodi sen tekemiseksi pysyväksi.',
+	'Language' => 'Kieli',
+	'Invalid CSRF token. Send the form again.' => 'Virheellinen CSRF-vastamerkki. Lähetä lomake uudelleen.',
+	'If you did not send this request from Adminer then close this page.' => 'Jollet lähettänyt tämä pyyntö Adminerista, sulje tämä sivu.',
+	'No extension' => 'Ei laajennusta',
+	'None of the supported PHP extensions (%s) are available.' => 'Mitään tuetuista PHP-laajennuksista (%s) ei ole käytettävissä.',
+	'Session support must be enabled.' => 'Istuntotuki on oltava päällä.',
+	'Session expired, please login again.' => 'Istunto vanhentunut, kirjaudu uudelleen.',
+	'%s version: %s through PHP extension %s' => '%s versio: %s PHP-laajennuksella %s',
+	'Refresh' => 'Virkistä',
+	
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+	
+	'Privileges' => 'Oikeudet',
+	'Create user' => 'Luo käyttäjä',
+	'User has been dropped.' => 'Käyttäjä poistettiin.',
+	'User has been altered.' => 'Käyttäjää muutettiin.',
+	'User has been created.' => 'Käyttäjä luotiin.',
+	'Hashed' => 'Hashed',
+	'Column' => 'Sarake',
+	'Routine' => 'Rutiini',
+	'Grant' => 'Myönnä',
+	'Revoke' => 'Kiellä',
+	
+	'Process list' => 'Prosessilista',
+	'%d process(es) have been killed.' => array('%d prosessi lopetettu.', '%d prosessia lopetettu..'),
+	'Kill' => 'Lopeta',
+	
+	'Variables' => 'Muuttujat',
+	'Status' => 'Tila',
+	
+	'SQL command' => 'SQL-komento',
+	'%d query(s) executed OK.' => array('%d kysely onnistui.', '%d kyselyä onnistui.'),
+	'Query executed OK, %d row(s) affected.' => array('Kysely onnistui, kohdistui %d riviin.', 'Kysely onnistui, kohdistui %d riviin.'),
+	'No commands to execute.' => 'Ei komentoja suoritettavana.',
+	'Error in query' => 'Virhe kyselyssä',
+	'Execute' => 'Suorita',
+	'Stop on error' => 'Pysähdy virheeseen',
+	'Show only errors' => 'Näytä vain virheet',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'History' => 'Historia',
+	'Clear' => 'Tyhjennä',
+	'Edit all' => 'Muokkaa kaikkia',
+	
+	'File upload' => 'Tiedoston lataus palvelimelle',
+	'From server' => 'Verkkopalvelimella Adminer-kansiossa oleva tiedosto',
+	'Webserver file %s' => 'Verkkopalvelintiedosto %s',
+	'Run file' => 'Suorita tämä',
+	'File does not exist.' => 'Tiedostoa ei ole.',
+	'File uploads are disabled.' => 'Tiedostojen lataaminen palvelimelle on estetty.',
+	'Unable to upload a file.' => 'Tiedostoa ei voida ladata palvelimelle.',
+	'Maximum allowed file size is %sB.' => 'Suurin sallittu tiedostokoko on %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Liian suuri POST-datamäärä. Pienennä dataa tai kasvata arvoa %s konfigurointitiedostossa.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Voit ladata suuren SQL-tiedoston FTP:n kautta ja tuoda sen sitten palvelimelta.',
+	'You are offline.' => 'Olet offline-tilassa.',
+	
+	'Export' => 'Vienti',
+	'Output' => 'Tulos',
+	'open' => 'avaa',
+	'save' => 'tallenna',
+	'Saving' => 'Tallennetaan',
+	'Format' => 'Muoto',
+	'Data' => 'Data',
+	
+	'Database' => 'Tietokanta',
+	'database' => 'tietokanta',
+	'Use' => 'Käytä',
+	'Select database' => 'Valitse tietokanta',
+	'Invalid database.' => 'Tietokanta ei kelpaa.',
+	'Database has been dropped.' => 'Tietokanta on poistettu.',
+	'Databases have been dropped.' => 'Tietokannat on poistettu.',
+	'Database has been created.' => 'Tietokanta on luotu.',
+	'Database has been renamed.' => 'Tietokanta on nimetty uudelleen.',
+	'Database has been altered.' => 'Tietokantaa on muutettu.',
+	'Alter database' => 'Muuta tietokantaa',
+	'Create database' => 'Luo tietokanta',
+	'Database schema' => 'Tietokantakaava',
+	
+	// link to current database schema layout
+	'Permanent link' => 'Pysyvä linkki',
+	
+	// thousands separator - must contain single byte
+	',' => ',',
+	'0123456789' => '0123456789',
+	'Engine' => 'Moottori',
+	'Collation' => 'Kollaatio',
+	'Data Length' => 'Datan pituus',
+	'Index Length' => 'Indeksin pituus',
+	'Data Free' => 'Vapaa tila',
+	'Rows' => 'Riviä',
+	'%d in total' => '%d kaikkiaan',
+	'Analyze' => 'Analysoi',
+	'Optimize' => 'Optimoi',
+	'Vacuum' => 'Siivoa',
+	'Check' => 'Tarkista',
+	'Repair' => 'Korjaa',
+	'Truncate' => 'Tyhjennä',
+	'Tables have been truncated.' => 'Taulujen sisältö on tyhjennetty.',
+	'Move to other database' => 'Siirrä toiseen tietokantaan',
+	'Move' => 'Siirrä',
+	'Tables have been moved.' => 'Taulut on siirretty.',
+	'Copy' => 'Kopioi',
+	'Tables have been copied.' => 'Taulut on kopioitu.',
+	
+	'Routines' => 'Rutiinit',
+	'Routine has been called, %d row(s) affected.' => array('Rutiini kutsuttu, kohdistui %d riviin.', 'Rutiini kutsuttu, kohdistui %d riviin.'),
+	'Call' => 'Kutsua',
+	'Parameter name' => 'Parametrin nimi',
+	'Create procedure' => 'Luo proseduuri',
+	'Create function' => 'Luo funktio',
+	'Routine has been dropped.' => 'Rutiini on poistettu.',
+	'Routine has been altered.' => 'Rutiinia on muutettu.',
+	'Routine has been created.' => 'Rutiini on luotu.',
+	'Alter function' => 'Muuta funktiota',
+	'Alter procedure' => 'Muuta proseduuria',
+	'Return type' => 'Palautustyyppi',
+	
+	'Events' => 'Tapahtumat',
+	'Event has been dropped.' => 'Tapahtuma on poistettu.',
+	'Event has been altered.' => 'Tapahtumaa on muutettu.',
+	'Event has been created.' => 'Tapahtuma on luotu.',
+	'Alter event' => 'Muuta tapahtumaa',
+	'Create event' => 'Luo tapahtuma',
+	'At given time' => 'Tiettynä aikana',
+	'Every' => 'Joka',
+	'Schedule' => 'Aikataulu',
+	'Start' => 'Aloitus',
+	'End' => 'Lopetus',
+	'On completion preserve' => 'Säilytä, kun valmis',
+	
+	'Tables' => 'Taulut',
+	'Tables and views' => 'Taulut ja näkymät',
+	'Table' => 'Taulu',
+	'No tables.' => 'Ei tauluja.',
+	'Alter table' => 'Muuta taulua',
+	'Create table' => 'Luo taulu',
+	'Table has been dropped.' => 'Taulu on poistettu.',
+	'Tables have been dropped.' => 'Tauluja on poistettu.',
+	'Tables have been optimized.' => 'Taulut on optimoitu.',
+	'Table has been altered.' => 'Taulua on muutettu.',
+	'Table has been created.' => 'Taulu on luotu.',
+	'Table name' => 'Taulun nimi',
+	'Show structure' => 'Näytä rakenne',
+	'engine' => 'moottori',
+	'collation' => 'kollaatio',
+	'Column name' => 'Sarakkeen nimi',
+	'Type' => 'Tyyppi',
+	'Length' => 'Pituus',
+	'Auto Increment' => 'Automaattinen lisäys',
+	'Options' => 'Asetukset',
+	'Comment' => 'Kommentit',
+	'Default value' => 'Oletusarvo',
+	'Default values' => 'Oletusarvot',
+	'Drop' => 'Poista',
+	'Are you sure?' => 'Oletko varma?',
+	'Size' => 'Koko',
+	'Compute' => 'Laske',
+	'Move up' => 'Siirrä ylös',
+	'Move down' => 'Siirrä alas',
+	'Remove' => 'Poista',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Kenttien sallittu enimmäismäärä ylitetty. Kasvata arvoa %s.',
+	
+	'Partition by' => 'Osioi arvolla',
+	'Partitions' => 'Osiot',
+	'Partition name' => 'Osion nimi',
+	'Values' => 'Arvot',
+	
+	'View' => 'Näkymä',
+	'Materialized view' => 'Materialisoitunut näkymä',
+	'View has been dropped.' => 'Näkymä on poistettu.',
+	'View has been altered.' => 'Näkymää on muutettu.',
+	'View has been created.' => 'Näkymä on luotu.',
+	'Alter view' => 'Muuta näkymää',
+	'Create view' => 'Luo näkymä',
+	
+	'Indexes' => 'Indeksit',
+	'Indexes have been altered.' => 'Indeksejä on muutettu.',
+	'Alter indexes' => 'Muuta indeksejä',
+	'Add next' => 'Lisää seuraava',
+	'Index Type' => 'Indeksityyppi',
+	'Column (length)' => 'Sarake (pituus)',
+	
+	'Foreign keys' => 'Vieraat avaimet',
+	'Foreign key' => 'Vieras avain',
+	'Foreign key has been dropped.' => 'Vieras avain on poistettu.',
+	'Foreign key has been altered.' => 'Vierasta avainta on muutettu.',
+	'Foreign key has been created.' => 'Vieras avain on luotu.',
+	'Target table' => 'Kohdetaulu',
+	'Change' => 'Muuta',
+	'Source' => 'Lähde',
+	'Target' => 'Kohde',
+	'Add column' => 'Lisää sarake',
+	'Alter' => 'Muuta',
+	'Add foreign key' => 'Lisää vieras avain',
+	'ON DELETE' => 'ON DELETE',
+	'ON UPDATE' => 'ON UPDATE',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Lähde- ja kohdesarakkeiden tulee olla samaa tietotyyppiä, kohdesarakkeisiin tulee olla indeksi ja dataa, johon viitataan, täytyy olla.',
+	
+	'Triggers' => 'Liipaisimet',
+	'Add trigger' => 'Lisää liipaisin',
+	'Trigger has been dropped.' => 'Liipaisin on poistettu.',
+	'Trigger has been altered.' => 'Liipaisinta on muutettu.',
+	'Trigger has been created.' => 'Liipaisin on luotu.',
+	'Alter trigger' => 'Muuta liipaisinta',
+	'Create trigger' => 'Luo liipaisin',
+	'Time' => 'Aika',
+	'Event' => 'Tapahtuma',
+	'Name' => 'Nimi',
+	
+	'select' => 'valitse',
+	'Select' => 'Valitse',
+	'Select data' => 'Valitse data',
+	'Functions' => 'Funktiot',
+	'Aggregation' => 'Aggregaatiot',
+	'Search' => 'Hae',
+	'anywhere' => 'kaikkialta',
+	'Search data in tables' => 'Hae dataa tauluista',
+	'Sort' => 'Lajittele',
+	'descending' => 'alenevasti',
+	'Limit' => 'Raja',
+	'Limit rows' => 'Rajoita rivimäärää',
+	'Text length' => 'Tekstin pituus',
+	'Action' => 'Toimenpide',
+	'Full table scan' => 'Koko taulun läpikäynti',
+	'Unable to select the table' => 'Taulua ei voitu valita',
+	'No rows.' => 'Ei rivejä.',
+	'%d / ' => '%d / ',
+	'%d row(s)' => array('%d rivi', '%d riviä'),
+	'Page' => 'Sivu',
+	'last' => 'viimeinen',
+	'Load more data' => 'Lataa lisää dataa',
+	'Loading' => 'Ladataan',
+	'whole result' => 'koko tulos',
+	'%d byte(s)' => array('%d tavu', '%d tavua'),
+	
+	'Import' => 'Tuonti',
+	'%d row(s) have been imported.' => array('%d rivi tuotiin.', '%d riviä tuotiin.'),
+	'File must be in UTF-8 encoding.' => 'Tiedoston täytyy olla UTF-8-muodossa.',
+	
+	// in-place editing in select
+	'Modify' => 'Muuta',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+napsauta arvoa muuttaaksesi.',
+	'Use edit link to modify this value.' => 'Käytä muokkaa-linkkiä muuttaaksesi tätä arvoa.',
+	
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'Tietue%s lisättiin.',
+	'Item has been deleted.' => 'Tietue poistettiin.',
+	'Item has been updated.' => 'Tietue päivitettiin.',
+	'%d item(s) have been affected.' => array('Kohdistui %d tietueeseen.', 'Kohdistui %d tietueeseen.'),
+	'New item' => 'Uusi tietue',
+	'original' => 'alkuperäinen',
+	// label for value '' in enum data type
+	'empty' => 'tyhjä',
+	'edit' => 'muokkaa',
+	'Edit' => 'Muokkaa',
+	'Insert' => 'Lisää',
+	'Save' => 'Tallenna',
+	'Save and continue edit' => 'Tallenna ja jatka muokkaamista',
+	'Save and insert next' => 'Tallenna ja lisää seuraava',
+	'Selected' => 'Valitut',
+	'Clone' => 'Kloonaa',
+	'Delete' => 'Poista',
+	'You have no privileges to update this table.' => 'Sinulla ei ole oikeutta päivittää tätä taulua.',
+	
+	'E-mail' => 'S-posti',
+	'From' => 'Lähettäjä',
+	'Subject' => 'Aihe',
+	'Attachments' => 'Liitteet',
+	'Send' => 'Lähetä',
+	'%d e-mail(s) have been sent.' => array('% sähköpostiviestiä lähetetty.', '% sähköpostiviestiä lähetetty.'),
+	
+	// data type descriptions
+	'Numbers' => 'Numerot',
+	'Date and time' => 'Päiväys ja aika',
+	'Strings' => 'Merkkijonot',
+	'Binary' => 'Binäärinen',
+	'Lists' => 'Luettelot',
+	'Network' => 'Verkko',
+	'Geometry' => 'Geometria',
+	'Relations' => 'Suhteet',
+	
+	'Editor' => 'Editori',
+	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
+	'$1-$3-$5' => '$5.$3.$1',
+	// hint for date format - use language equivalents for day, month and year shortcuts
+	'[yyyy]-mm-dd' => 'pp.kk.[vvvv]',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'HH:MM:SS',
+	'now' => 'nyt',
+	'yes' => 'kyllä',
+	'no' => 'ei',
+	
+	// general SQLite error in create, drop or rename database
+	'File exists.' => 'Tiedosto on olemassa.',
+	'Please use one of the extensions %s.' => 'Käytä jotain %s-laajennuksista.',
+	
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'Muuta kaavaa',
+	'Create schema' => 'Luo kaava',
+	'Schema has been dropped.' => 'Kaava poistettiin.',
+	'Schema has been created.' => 'Kaava luotiin.',
+	'Schema has been altered.' => 'Kaavaa muutettiin.',
+	'Schema' => 'Kaava',
+	'Invalid schema.' => 'Kaava ei kelpaa.',
+	
+	// PostgreSQL sequences support
+	'Sequences' => 'Sekvenssit',
+	'Create sequence' => 'Luo sekvenssi',
+	'Sequence has been dropped.' => 'Sekvenssi on poistettu.',
+	'Sequence has been created.' => 'Sekvenssi on luotu.',
+	'Sequence has been altered.' => 'Sekvenssiä on muutettu.',
+	'Alter sequence' => 'Muuta sekvenssiä',
+	
+	// PostgreSQL user types support
+	'User types' => 'Käyttäjän tyypit',
+	'Create type' => 'Luo tyyppi',
+	'Type has been dropped.' => 'Tyyppi poistettiin.',
+	'Type has been created.' => 'Tyyppi luotiin.',
+	'Alter type' => 'Muuta tyyppiä',
+);

adminer/lang/fr.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Mot de passe',
 	'Select database' => 'Sélectionner la base de données',
 	'Invalid database.' => 'Base de données invalide.',
-	'Create new database' => 'Créer une base de données',
 	'Table has been dropped.' => 'La table a été effacée.',
 	'Table has been altered.' => 'La table a été modifiée.',
 	'Table has been created.' => 'La table a été créée.',
@@ -20,9 +19,9 @@ $translations = array(
 	'Column name' => 'Nom de la colonne',
 	'Type' => 'Type',
 	'Length' => 'Longueur',
-	'Auto Increment' => 'Auto increment',
+	'Auto Increment' => 'Incrément automatique',
 	'Options' => 'Options',
-	'Save' => 'Sauvegarder',
+	'Save' => 'Enregistrer',
 	'Drop' => 'Supprimer',
 	'Database has been created.' => 'La base de données a été créée.',
 	'Database has been renamed.' => 'La base de données a été renommée.',
@@ -30,18 +29,16 @@ $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',
 	'No tables.' => 'Aucune table.',
 	'select' => 'select',
-	'Create new table' => 'Créer une nouvelle table',
 	'Item has been deleted.' => 'L\'élément a été supprimé.',
 	'Item has been updated.' => 'L\'élément a été modifié.',
 	'Edit' => 'Modifier',
 	'Insert' => 'Insérer',
-	'Save and insert next' => 'Sauvegarder et insérer le prochain',
+	'Save and insert next' => 'Enr. et insérer prochain',
 	'Delete' => 'Effacer',
 	'Database' => 'Base de données',
 	'Routines' => 'Routines',
@@ -50,7 +47,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',
@@ -65,10 +62,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'),
@@ -117,17 +114,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é.',
@@ -148,7 +145,7 @@ $translations = array(
 	'Data' => 'Données',
 	'Output' => 'Sortie',
 	'open' => 'ouvrir',
-	'save' => 'sauvegarder',
+	'save' => 'enregistrer',
 	'Format' => 'Format',
 	'Functions' => 'Fonctions',
 	'Aggregation' => 'Agrégation',
@@ -165,7 +162,7 @@ $translations = array(
 	'Events' => 'Évènements',
 	'Schedule' => 'Horaire',
 	'At given time' => 'À un moment précis',
-	'Save and continue edit' => 'Sauvegarder et continuer l\'édition',
+	'Save and continue edit' => 'Enr. et continuer édition',
 	'original' => 'original',
 	'Tables have been truncated.' => 'Les tables ont été tronquées.',
 	'Tables have been moved.' => 'Les tables ont été déplacées.',
@@ -178,6 +175,7 @@ $translations = array(
 	'Data Free' => 'Espace inutilisé',
 	'Rows' => 'Lignes',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Analyze' => 'Analyser',
 	'Optimize' => 'Optimiser',
 	'Check' => 'Vérifier',
@@ -188,12 +186,12 @@ $translations = array(
 	'%d item(s) have been affected.' => array('%d élément a été modifié.', '%d éléments ont été modifiés.'),
 	'whole result' => 'résultat entier',
 	'Clone' => 'Cloner',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Le nombre maximum de champs est dépassé. Veuillez augmenter %s et %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Le nombre maximum de champs est dépassé. Veuillez augmenter %s.',
 	'Partition by' => 'Partitionner par',
 	'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',
@@ -225,7 +223,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',
@@ -243,7 +240,7 @@ $translations = array(
 	'Alter type' => 'Modifier le type',
 	'Type has been dropped.' => 'Le type a été supprimé.',
 	'Type has been created.' => 'Le type a été créé.',
-	'Double click on a value to modify it.' => 'Double-cliquez sur une valeur pour la modifier.',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+cliquez sur une valeur pour la modifier.',
 	'Use edit link to modify this value.' => 'Utilisez le lien "modifier" pour modifier cette valeur.',
 	'last' => 'dernière',
 	'From server' => 'Depuis le serveur',
@@ -259,7 +256,6 @@ $translations = array(
 	'now' => 'maintenant',
 	'%d query(s) executed OK.' => array('%d requête exécutée avec succès.', '%d requêtes exécutées avec succès.'),
 	'Show only errors' => 'Montrer seulement les erreurs',
-	'Last page' => 'Dernière page',
 	'Refresh' => 'Rafraîchir',
 	'Invalid schema.' => 'Schéma invalide.',
 	'Please use one of the extensions %s.' => 'Veuillez utiliser l\'une des extensions %s.',
@@ -269,4 +265,27 @@ $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és 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 échouées, essayez à nouveau dans %d minute.', 'Trop de connexions échouées, essayez à nouveau dans %d minutes.'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Le mot de passe a expiré. <a href="https://www.adminer.org/en/extension/" target="_blank">Implémentez</a> la méthode %s afin de le rendre permanent.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Vous pouvez uploader un gros fichier 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',
+	'Materialized view' => 'Vue matérialisée',
+	'%d / ' => '%d / ',
+	'Limit rows' => 'Limiter les lignes',
+	'Default value' => 'Valeur par défaut',
+	'If you did not send this request from Adminer then close this page.' => 'Si vous n\'avez pas envoyé cette requête depuis Adminer, alors fermez cette page.',
+	'You are offline.' => 'Vous êtes hors ligne.',
 );

adminer/lang/gl.inc.php

@@ -0,0 +1,291 @@
+<?php
+$translations = array(
+	'Login' => 'Conectar',
+	'Logout successful.' => 'Pechouse a sesión con éxito.',
+	'Invalid credentials.' => 'Credenciais (usuario e/ou contrasinal) inválidos.',
+	'Server' => 'Servidor',
+	'Username' => 'Usuario',
+	'Password' => 'Contrasinal',
+	'Select database' => 'Seleccionar Base de datos',
+	'Invalid database.' => 'Base de datos incorrecta.',
+	'Table has been dropped.' => 'Eliminouse a táboa.',
+	'Table has been altered.' => 'Modificouse a táboa.',
+	'Table has been created.' => 'Creouse a táboa.',
+	'Alter table' => 'Modificar táboa',
+	'Create table' => 'Crear táboa',
+	'Table name' => 'Nome da táboa',
+	'engine' => 'motor',
+	'collation' => 'xogo de caracteres (collation)',
+	'Column name' => 'Nome da columna',
+	'Type' => 'Tipo',
+	'Length' => 'Lonxitude',
+	'Auto Increment' => 'Incremento automático',
+	'Options' => 'Opcións',
+	'Save' => 'Gardar',
+	'Drop' => 'Eliminar',
+	'Database has been dropped.' => 'Eliminouse a base de datos.',
+	'Database has been created.' => 'Creouse a base de datos.',
+	'Database has been renamed.' => 'Renomeouse a base de datos.',
+	'Database has been altered.' => 'Modificouse a base de datos.',
+	'Alter database' => 'Modificar Base de datos',
+	'Create database' => 'Crear Base de datos',
+	'SQL command' => 'Comando SQL',
+	'Logout' => 'Pechar sesión',
+	'database' => 'base de datos',
+	'Use' => 'Usar',
+	'No tables.' => 'Nengunha táboa.',
+	'select' => 'selecciona',
+	'Item has been deleted.' => 'Eliminouse o elemento.',
+	'Item has been updated.' => 'Modificouse o elemento.',
+	'Item%s has been inserted.' => 'Inseríuse o elemento%s.',
+	'Edit' => 'Editar',
+	'Insert' => 'Inserir',
+	'Save and insert next' => 'Guardar e inserir seguinte',
+	'Delete' => 'Borrar',
+	'Database' => 'Base de datos',
+	'Routines' => 'Rutinas',
+	'Indexes have been altered.' => 'Alteráronse os índices.',
+	'Indexes' => 'Índices',
+	'Alter indexes' => 'Modificar índices',
+	'Add next' => 'Engadir seguinte',
+	'Language' => 'Lingua',
+	'Select' => 'Seleccionar',
+	'New item' => 'Novo elemento',
+	'Search' => 'Buscar',
+	'Sort' => 'Ordenar',
+	'descending' => 'descendente',
+	'Limit' => 'Límite',
+	'No rows.' => 'Nengún resultado.',
+	'Action' => 'Acción',
+	'edit' => 'editar',
+	'Page' => 'Páxina',
+	'Query executed OK, %d row(s) affected.' => array('Consulta executada, %d fila afectada.', 'Consulta executada, %d filas afectadas.'),
+	'Error in query' => 'Erro na consulta',
+	'Execute' => 'Executar',
+	'Table' => 'Táboa',
+	'Foreign keys' => 'Chaves externas',
+	'Triggers' => 'Disparadores',
+	'View' => 'Vista',
+	'Unable to select the table' => 'No é posible seleccionar a táboa',
+	'Invalid CSRF token. Send the form again.' => 'Token CSRF inválido. Envíe de novo os datos do formulario.',
+	'Comment' => 'Comentario',
+	'Default values' => 'Valores predeterminados',
+	'%d byte(s)' => array('%d byte', '%d bytes'),
+	'No commands to execute.' => 'Non hai comandos para executar.',
+	'Unable to upload a file.' => 'Non é posible importar o ficheiro.',
+	'File upload' => 'Importar ficheiro',
+	'File uploads are disabled.' => 'Importación de ficheiros deshablilitada.',
+	'Routine has been called, %d row(s) affected.' => array('Chamouse á rutina, %d fila afectada.', 'Chamouse á rutina, %d filas afectadas.'),
+	'Call' => 'Chamar',
+	'No extension' => 'Non ten extensión',
+	'None of the supported PHP extensions (%s) are available.' => 'Ningunha das extensións PHP soportadas (%s) está dispoñible.',
+	'Session support must be enabled.' => 'As sesións deben estar habilitadas.',
+	'Session expired, please login again.' => 'Caducou a sesión, por favor acceda de novo.',
+	'Text length' => 'Lonxitud do texto',
+	'Foreign key has been dropped.' => 'Eliminouse a chave externa.',
+	'Foreign key has been altered.' => 'Modificouse a chave externa.',
+	'Foreign key has been created.' => 'Creouse a chave externa.',
+	'Foreign key' => 'Chave externa',
+	'Target table' => 'táboa de destino',
+	'Change' => 'Cambiar',
+	'Source' => 'Orixe',
+	'Target' => 'Destino',
+	'Add column' => 'Engadir columna',
+	'Alter' => 'Modificar',
+	'Add foreign key' => 'Engadir chave externa',
+	'ON DELETE' => 'AO BORRAR (ON DELETE)',
+	'ON UPDATE' => 'AO ACTUALIZAR (ON UPDATE)',
+	'Index Type' => 'Tipo de índice',
+	'Column (length)' => 'Columna (lonxitude)',
+	'View has been dropped.' => 'Eliminouse a vista.',
+	'View has been altered.' => 'Modificouse a vista.',
+	'View has been created.' => 'Creouse a vista.',
+	'Alter view' => 'Modificar vista',
+	'Create view' => 'Crear vista',
+	'Name' => 'Nome',
+	'Process list' => 'Lista de procesos',
+	'%d process(es) have been killed.' => array('%d proceso foi detido.', '%d procesos foron detidos.'),
+	'Kill' => 'Deter',
+	'Parameter name' => 'Nome de Parámetro',
+	'Database schema' => 'Esquema de base de datos',
+	'Create procedure' => 'Crear procedemento',
+	'Create function' => 'Crear función',
+	'Routine has been dropped.' => 'Eliminouse o procedemento.',
+	'Routine has been altered.' => 'Alterouse o procedemento.',
+	'Routine has been created.' => 'Creouse o procedemento.',
+	'Alter function' => 'Modificar Función',
+	'Alter procedure' => 'Modificar procedemento',
+	'Return type' => 'Tipo de valor devolto',
+	'Add trigger' => 'Engadir disparador',
+	'Trigger has been dropped.' => 'Eliminouse o disparador.',
+	'Trigger has been altered.' => 'Modificouse o disparador.',
+	'Trigger has been created.' => 'Creouse o disparador.',
+	'Alter trigger' => 'Modificar Disparador',
+	'Create trigger' => 'Crear Disparador',
+	'Time' => 'Tempo',
+	'Event' => 'Evento',
+	'%s version: %s through PHP extension %s' => 'Versión %s: %s a través da extensión de PHP %s',
+	'%d row(s)' => array('%d fila', '%d filas'),
+	'Remove' => 'Eliminar',
+	'Are you sure?' => 'Está seguro?',
+	'Privileges' => 'Privilexios',
+	'Create user' => 'Crear Usuario',
+	'User has been dropped.' => 'Eliminouse o usuario.',
+	'User has been altered.' => 'Modificouse o usuario.',
+	'User has been created.' => 'Creouse o usuario.',
+	'Hashed' => 'Hashed',
+	'Column' => 'Columna',
+	'Routine' => 'Rutina',
+	'Grant' => 'Conceder',
+	'Revoke' => 'Revocar',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Datos POST demasiado grandes. Reduza os datos ou aumente a directiva de configuración %s.',
+	'Logged as: %s' => 'Conectado como: %s',
+	'Move up' => 'Mover arriba',
+	'Move down' => 'Mover abaixo',
+	'Functions' => 'Funcións',
+	'Aggregation' => 'Agregados',
+	'Export' => 'Exportar',
+	'Output' => 'Salida',
+	'open' => 'abrir',
+	'save' => 'gardar',
+	'Format' => 'Formato',
+	'Tables' => 'Táboas',
+	'Data' => 'Datos',
+	'Event has been dropped.' => 'Eliminouse o evento.',
+	'Event has been altered.' => 'Modificouse o evento.',
+	'Event has been created.' => 'Creouse o evento.',
+	'Alter event' => 'Modificar Evento',
+	'Create event' => 'Crear Evento',
+	'At given time' => 'No tempo indicado',
+	'Every' => 'Cada',
+	'Events' => 'Eventos',
+	'Schedule' => 'Axenda',
+	'Start' => 'Inicio',
+	'End' => 'Fin',
+	'Status' => 'Estado',
+	'On completion preserve' => 'Ao completar manter',
+	'Tables and views' => 'táboas e vistas',
+	'Data Length' => 'Lonxitude de datos',
+	'Index Length' => 'Lonxitude de índice',
+	'Data Free' => 'Espazo dispoñible',
+	'Collation' => 'Xogo de caracteres (collation)',
+	'Analyze' => 'Analizar',
+	'Optimize' => 'Optimizar',
+	'Check' => 'Comprobar',
+	'Repair' => 'Reparar',
+	'Truncate' => 'Baleirar',
+	'Tables have been truncated.' => 'Baleiráronse as táboas.',
+	'Rows' => 'Filas',
+	',' => ' ',
+	'0123456789' => '0123456789',
+	'Tables have been moved.' => 'Movéronse as táboas.',
+	'Move to other database' => 'Mover a outra base de datos',
+	'Move' => 'Mover',
+	'Engine' => 'Motor',
+	'Save and continue edit' => 'Gardar se seguir editando',
+	'original' => 'orixinal',
+	'Tables have been dropped.' => 'Elimináronse as táboas.',
+	'%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.' => 'Excedida o número máximo de campos permitidos. Por favor aumente %s.',
+	'Partition by' => 'Particionar por',
+	'Partitions' => 'Particións',
+	'Partition name' => 'Nome da Partición',
+	'Values' => 'Valores',
+	'%d row(s) have been imported.' => array('%d fila importada.', '%d filas importadas.'),
+	'anywhere' => 'onde sexa',
+	'Import' => 'Importar',
+	'Stop on error' => 'Parar en caso de erro',
+	'%.3f s' => '%.3f s',
+	'$1-$3-$5' => '$5/$3/$1',
+	'[yyyy]-mm-dd' => 'dd/mm/[aaaa]',
+	'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.' => 'As columnas de orixe e destino deben ser do mesmo tipo, debe existir un índice nas columnas de destino e os datos referenciados deben existir.',
+	'Relations' => 'Relacins',
+	'Run file' => 'Executar ficheiro',
+	'Clear' => 'Baleirar',
+	'Maximum allowed file size is %sB.' => 'O tamaño máximo de ficheiro permitido é de %sB.',
+	'Numbers' => 'Números',
+	'Date and time' => 'Data e hora',
+	'Strings' => 'Cadea',
+	'Binary' => 'Binario',
+	'Lists' => 'Listas',
+	'Editor' => 'Editor',
+	'E-mail' => 'Email',
+	'From' => 'De',
+	'Subject' => 'Asunto',
+	'Send' => 'Enviar',
+	'%d e-mail(s) have been sent.' => array('%d email enviado.', '%d emails enviados.'),
+	'Webserver file %s' => 'Ficheiro de servidor web %s',
+	'File does not exist.' => 'O ficheiro non existe.',
+	'%d in total' => '%d en total',
+	'Permanent login' => 'Permanecer conectado',
+	'Databases have been dropped.' => 'Elimináronse as bases de datos.',
+	'Search data in tables' => 'Buscar datos en táboas',
+	'Schema' => 'Esquema',
+	'Alter schema' => 'Modificar esquema',
+	'Create schema' => 'Crear esquema',
+	'Schema has been dropped.' => 'Eliminouse o esquema.',
+	'Schema has been created.' => 'Creouse o esquema.',
+	'Schema has been altered.' => 'Modificouse o esquema.',
+	'Sequences' => 'Secuencias',
+	'Create sequence' => 'Crear secuencias',
+	'Alter sequence' => 'Modificar secuencia',
+	'Sequence has been dropped.' => 'Eliminouse a secuencia.',
+	'Sequence has been created.' => 'Creouse a secuencia.',
+	'Sequence has been altered.' => 'Modificaouse a secuencia.',
+	'User types' => 'Tipos definidos polo usuario',
+	'Create type' => 'Crear tipo',
+	'Alter type' => 'Modificar tipo',
+	'Type has been dropped.' => 'Eliminouse o tipo.',
+	'Type has been created.' => 'Creouse o tipo.',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+clic sobre o valor para editalo.',
+	'Use edit link to modify this value.' => 'Use a ligazón de edición para modificar este valor.',
+	'last' => 'último',
+	'From server' => 'Desde o servidor',
+	'System' => 'Sistema',
+	'Select data' => 'Seleccionar datos',
+	'Show structure' => 'Amosar estructura',
+	'empty' => 'baleiro',
+	'Network' => 'Rede',
+	'Geometry' => 'Xeometría',
+	'File exists.' => 'O ficheiro xa existe.',
+	'Attachments' => 'Adxuntos',
+	'%d query(s) executed OK.' => array('%d consulta executada correctamente.', '%d consultas executadas correctamente.'),
+	'Show only errors' => 'Amosar só erros',
+	'Refresh' => 'Refrescar',
+	'Invalid schema.' => 'Esquema inválido.',
+	'Please use one of the extensions %s.' => 'Por favor use unha das extensións %s.',
+	'now' => 'agora',
+	'ltr' => 'ltr',
+	'Tables have been copied.' => 'Copiáronse as táboas.',
+	'Copy' => 'Copiar',
+	'Permanent link' => 'Ligazón permanente',
+	'Edit all' => 'Editar todo',
+	'HH:MM:SS' => 'HH:MM:SS',
+	'Tables have been optimized.' => 'Optimizáronse as táboas',
+	'Materialized view' => 'Vista materializada',
+	'Vacuum' => 'Baleirar',
+	'Selected' => 'Selección',
+	'File must be in UTF-8 encoding.' => 'O ficheiro ten que estar codificado con UTF-8',
+	'Modify' => 'Modificar',
+	'Loading' => 'Cargando',
+	'Load more data' => 'Cargar máis datos',
+	'%d / ' => array('%d / ','%d / '),
+	'Limit rows' => 'Limitar filas',
+	'Default value' => 'Valor por defecto',
+	'Full table scan' => 'Escaneo completo da táboa',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Demasiados intentos de conexión, intentao de novo en %d minuto', 'Demasiados intentos de conexión, intentao de novo en %d minutos'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'O contrasinal principal caducou. <a href="https://www.adminer.org/en/extension/" target="_blank">Implementa</a> o método %s para facelo permanente.',
+	'If you did not send this request from Adminer then close this page.' => 'Se non enviaches esta petición dende o Adminer entón pecha esta páxina',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Podes subir un ficheiro SQL de gran tamaño vía FTP e importalo dende o servidor',
+	'Size' => 'Tamaño',
+	'Compute' => 'Calcular',
+	'You are offline.' => 'Non tes conexión',
+	'You have no privileges to update this table.' => 'Non tes privilexios para actualizar esta táboa',
+	'Saving' => 'Gardando',
+	'yes' => 'si',
+	'no' => 'non',
+);

adminer/lang/hu.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Jelszó',
 	'Select database' => 'Adatbázis kiválasztása',
 	'Invalid database.' => 'Érvénytelen adatbázis.',
-	'Create new database' => 'Új adatbázis',
 	'Table has been dropped.' => 'A tábla eldobva.',
 	'Table has been altered.' => 'A tábla módosult.',
 	'Table has been created.' => 'A tábla létrejött.',
@@ -31,13 +30,11 @@ $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',
 	'No tables.' => 'Nincs tábla.',
 	'select' => 'kiválasztás',
-	'Create new table' => 'Új tábla',
 	'Item has been deleted.' => 'A tétel törölve.',
 	'Item has been updated.' => 'A tétel frissítve.',
 	'Item%s has been inserted.' => '%s tétel beszúrva.',
@@ -180,6 +177,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',
@@ -199,7 +197,7 @@ $translations = array(
 	'Show structure' => 'Struktúra',
 	'Select data' => 'Tartalom',
 	'Stop on error' => 'Hiba esetén megáll',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'A maximális mezőszámot elérted. Növeld meg ezeket: %s, %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'A maximális mezőszámot elérted. Növeld meg ezeket: %s.',
 	'anywhere' => 'bárhol',
 	'%.3f s' => '%.3f másodperc',
 	'$1-$3-$5' => '$6.$4.$1',
@@ -233,14 +231,12 @@ $translations = array(
 	'Geometry' => 'Geometria',
 	'Databases have been dropped.' => 'Adatbázis eldobva.',
 	'File exists.' => 'A fájl létezik.',
-	'Double click on a value to modify it.' => 'Kattints kétszer az értékre a szerkesztéshez.',
 	'Use edit link to modify this value.' => 'Használd a szerkesztés hivatkozást ezen érték módosításához.',
 	'Alter schema' => 'Séma módosítása',
 	'Create schema' => 'Séma létrehozása',
 	'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',
@@ -259,7 +255,6 @@ $translations = array(
 	'now' => 'most',
 	'%d query(s) executed OK.' => '%d sikeres lekérdezés.',
 	'Show only errors' => 'Csak a hibák mutatása',
-	'Last page' => 'Utolsó oldal',
 	'Refresh' => 'Frissítés',
 	'Invalid schema.' => 'Érvénytelen séma.',
 	'Please use one of the extensions %s.' => 'Használja a(z) %s kiterjesztést.',

adminer/lang/id.inc.php

@@ -10,11 +10,11 @@ $translations = array(
 	'Logout' => 'Keluar',
 	'Logged as: %s' => 'Masuk sebagai: %s',
 	'Logout successful.' => 'Berhasil keluar.',
-	'Invalid credentials.' => 'Akses invalid.',
+	'Invalid credentials.' => 'Akses tidak sah.',
 	'Language' => 'Bahasa',
-	'Invalid CSRF token. Send the form again.' => 'Token CSRF invalid. Kirim ulang formulir.',
-	'No extension' => 'Ekstensi tidak tersedia',
-	'None of the supported PHP extensions (%s) are available.' => 'Ekstensi PHP yang didukung (%s) tidak tersedia.',
+	'Invalid CSRF token. Send the form again.' => 'Token CSRF tidak sah. Kirim ulang formulir.',
+	'No extension' => 'Ekstensi tidak ada',
+	'None of the supported PHP extensions (%s) are available.' => 'Ekstensi PHP yang didukung (%s) tidak ada.',
 	'Session support must be enabled.' => 'Dukungan sesi harus aktif.',
 	'Session expired, please login again.' => 'Sesi habis, silakan masuk lagi.',
 	'%s version: %s through PHP extension %s' => 'Versi %s: %s dengan ekstensi PHP %s',
@@ -44,29 +44,28 @@ $translations = array(
 	'SQL command' => 'Perintah SQL',
 	'%d query(s) executed OK.' => '%d kueri berhasil dijalankan.',
 	'Query executed OK, %d row(s) affected.' => 'Kueri berhasil, %d baris terpengaruh.',
-	'No commands to execute.' => 'Tiada perintah untuk dijalankan.',
-	'Error in query' => 'Kesalahan dalam kueri',
+	'No commands to execute.' => 'Tidak ada perintah untuk dijalankan.',
+	'Error in query' => 'Galat dalam kueri',
 	'Execute' => 'Jalankan',
-	'Stop on error' => 'Hentikan pada kesalahan',
-	'Show only errors' => 'Hanya tampilkan kesalahan',
+	'Stop on error' => 'Hentikan jika galat',
+	'Show only errors' => 'Hanya tampilkan galat',
 	// sprintf() format for time of the command
 	'%.3f s' => '%.3f s',
 	'History' => 'Riwayat',
 	'Clear' => 'Bersihkan',
-	'Edit all' => 'Edit semua',
 
+	'Edit all' => 'Sunting semua',
 	'File upload' => 'Unggah berkas',
 	'From server' => 'Dari server',
 	'Webserver file %s' => 'Berkas server web %s',
 	'Run file' => 'Jalankan berkas',
-	'File does not exist.' => 'Berkas tidak ditemukan.',
+	'File does not exist.' => 'Berkas tidak ada.',
 	'File uploads are disabled.' => 'Pengunggahan berkas dimatikan.',
 	'Unable to upload a file.' => 'Tidak dapat mengunggah berkas.',
-	'Maximum allowed file size is %sB.' => 'Besar berkas yang diizinkan adalah %s bita.',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Data POST terlalu besar. Kurangi data atau perbesar pengarah konfigurasi %s.',
+	'Maximum allowed file size is %sB.' => 'Besar berkas yang diizinkan adalah %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Data POST terlalu besar. Kurangi data atau perbesar direktif konfigurasi %s.',
 
 	'Export' => 'Ekspor',
-	'Dump' => 'Ekspor',
 	'Output' => 'Hasil',
 	'open' => 'buka',
 	'save' => 'simpan',
@@ -77,22 +76,22 @@ $translations = array(
 	'database' => 'basis data',
 	'Use' => 'Gunakan',
 	'Select database' => 'Pilih basis data',
-	'Invalid database.' => 'Basis data invalid.',
-	'Create new database' => 'Buat basis data baru',
+	'Invalid database.' => 'Basis data tidak sah.',
 	'Database has been dropped.' => 'Basis data berhasil dihapus.',
 	'Databases have been dropped.' => 'Basis data berhasil dihapus.',
 	'Database has been created.' => 'Basis data berhasil dibuat.',
-	'Database has been renamed.' => 'Basis data berhasil diganti nama.',
+	'Database has been renamed.' => 'Basis data berhasil diganti namanya.',
 	'Database has been altered.' => 'Basis data berhasil diubah.',
 	'Alter database' => 'Ubah basis data',
 	'Create database' => 'Buat basis data',
 	'Database schema' => 'Skema basis data',
 
 	// link to current database schema layout
-	'Permanent link' => 'Tautan permanen',
+	'Permanent link' => 'Pranala permanen',
 
 	// thousands separator - must contain single byte
 	',' => '.',
+	'0123456789' => '0123456789',
 	'Engine' => 'Mesin',
 	'Collation' => 'Kolasi',
 	'Data Length' => 'Panjang Data',
@@ -113,9 +112,9 @@ $translations = array(
 	'Tables have been copied.' => 'Tabel berhasil disalin.',
 
 	'Routines' => 'Rutin',
-	'Routine has been called, %d row(s) affected.' => array('Rutin telah dipanggil, %d baris terpengaruh.', 'Rutin telah dipanggil, %d baris terpengaruh'),
+	'Routine has been called, %d row(s) affected.' => 'Rutin telah dipanggil, %d baris terpengaruh.',
 	'Call' => 'Panggilan',
-	'Parameter name' => 'Nama paramater',
+	'Parameter name' => 'Nama parameter',
 	'Create procedure' => 'Buat prosedur',
 	'Create function' => 'Buat fungsi',
 	'Routine has been dropped.' => 'Rutin berhasil dihapus.',
@@ -123,14 +122,14 @@ $translations = array(
 	'Routine has been created.' => 'Rutin berhasil dibuat.',
 	'Alter function' => 'Ubah fungsi',
 	'Alter procedure' => 'Ubah prosedur',
-	'Return type' => 'Jenis balikan',
+	'Return type' => 'Jenis pengembalian',
 
-	'Events' => 'Peristiwa',
-	'Event has been dropped.' => 'Peristiwa berhasil dihapus.',
-	'Event has been altered.' => 'Peristiwa berhasil diubah.',
-	'Event has been created.' => 'Peristiwa berhasil dibuat.',
-	'Alter event' => 'Ubah peristiwa',
-	'Create event' => 'Buat peristiwa',
+	'Events' => 'Even',
+	'Event has been dropped.' => 'Even berhasil dihapus.',
+	'Event has been altered.' => 'Even berhasil diubah.',
+	'Event has been created.' => 'Even berhasil dibuat.',
+	'Alter event' => 'Ubah even',
+	'Create event' => 'Buat even',
 	'At given time' => 'Pada waktu tertentu',
 	'Every' => 'Setiap',
 	'Schedule' => 'Jadwal',
@@ -141,10 +140,9 @@ $translations = array(
 	'Tables' => 'Tabel',
 	'Tables and views' => 'Tabel dan tampilan',
 	'Table' => 'Tabel',
-	'No tables.' => 'Tiada tabel.',
+	'No tables.' => 'Tidak ada tabel.',
 	'Alter table' => 'Ubah tabel',
 	'Create table' => 'Buat tabel',
-	'Create new table' => 'Buat tabel baru',
 	'Table has been dropped.' => 'Tabel berhasil dihapus.',
 	'Tables have been dropped.' => 'Tabel berhasil dihapus.',
 	'Tables have been optimized.' => 'Tabel berhasil dioptimalkan.',
@@ -157,16 +155,16 @@ $translations = array(
 	'Column name' => 'Nama kolom',
 	'Type' => 'Jenis',
 	'Length' => 'Panjang',
-	'Auto Increment' => 'Kenaikan Otomatis',
+	'Auto Increment' => 'Inkrementasi Otomatis',
 	'Options' => 'Opsi',
 	'Comment' => 'Komentar',
 	'Default values' => 'Nilai bawaan',
 	'Drop' => 'Hapus',
-	'Are you sure?' => 'Anda yakin',
+	'Are you sure?' => 'Anda yakin?',
 	'Move up' => 'Naik',
 	'Move down' => 'Turun',
 	'Remove' => 'Hapus',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Jumlah ruas maksimum yang diizinkan dilewati. Harap naikkan %s dan %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Sudah lebih dumlah ruas maksimum yang diizinkan. Harap naikkan %s.',
 
 	'Partition by' => 'Partisi menurut',
 	'Partitions' => 'Partisi',
@@ -203,15 +201,15 @@ $translations = array(
 	'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.' => 'Kolom sumber dan sasaran harus memiliki jenis data yang sama. Kolom sasaran harus memiliki indeks dan data rujukan harus ada.',
 
-	'Triggers' => 'Picu',
-	'Add trigger' => 'Tambah picu',
-	'Trigger has been dropped.' => 'Picu berhasil dihapus.',
-	'Trigger has been altered.' => 'Picu berhasil diubah.',
-	'Trigger has been created.' => 'Picu berhasil dibuat.',
-	'Alter trigger' => 'Ubah picu',
-	'Create trigger' => 'Buat picu',
+	'Triggers' => 'Pemicu',
+	'Add trigger' => 'Tambah pemicu',
+	'Trigger has been dropped.' => 'Pemicu berhasil dihapus.',
+	'Trigger has been altered.' => 'Pemicu berhasil diubah.',
+	'Trigger has been created.' => 'Pemicu berhasil dibuat.',
+	'Alter trigger' => 'Ubah pemicu',
+	'Create trigger' => 'Buat pemicu',
 	'Time' => 'Waktu',
-	'Event' => 'Peristiwa',
+	'Event' => 'Even',
 	'Name' => 'Nama',
 
 	'select' => 'pilih',
@@ -222,18 +220,17 @@ $translations = array(
 	'Search' => 'Cari',
 	'anywhere' => 'di mana pun',
 	'Search data in tables' => 'Cari data dalam tabel',
-	'Sort' => 'Urutan',
+	'Sort' => 'Urutkan',
 	'descending' => 'menurun',
-	'Limit' => 'Limit',
+	'Limit' => 'Batas',
 	'Text length' => 'Panjang teks',
 	'Action' => 'Tindakan',
 	'Full table scan' => 'Pindai tabel lengkap',
 	'Unable to select the table' => 'Gagal memilih tabel',
-	'No rows.' => 'Tiada baris.',
+	'No rows.' => 'Tidak ada baris.',
 	'%d row(s)' => '%d baris',
 	'Page' => 'Halaman',
 	'last' => 'terakhir',
-	'Last page' => 'Halaman terakhir',
 	'whole result' => 'Seluruh hasil',
 	'%d byte(s)' => '%d bita',
 
@@ -241,8 +238,7 @@ $translations = array(
 	'%d row(s) have been imported.' => '%d baris berhasil diimpor.',
 
 	// in-place editing in select
-	'Double click on a value to modify it.' => 'Klik ganda suatu nilai untuk mengubahnya.',
-	'Use edit link to modify this value.' => 'Gunakan tautan edit untuk mengubah nilai ini.',
+	'Use edit link to modify this value.' => 'Gunakan pranala suntingan untuk mengubah nilai ini.',
 
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Entri%s berhasil disisipkan.',
@@ -250,30 +246,30 @@ $translations = array(
 	'Item has been updated.' => 'Entri berhasil diperbarui.',
 	'%d item(s) have been affected.' => '%d entri terpengaruh.',
 	'New item' => 'Entri baru',
-	'original' => 'orisinal',
+	'original' => 'asli',
 	// label for value '' in enum data type
 	'empty' => 'kosong',
-	'edit' => 'edit',
-	'Edit' => 'Edit',
+	'edit' => 'sunting',
+	'Edit' => 'Sunting',
 	'Insert' => 'Sisipkan',
 	'Save' => 'Simpan',
-	'Save and continue edit' => 'Simpan dan terus mengedit',
-	'Save and insert next' => 'Simpan dan sisipkan yang lain',
+	'Save and continue edit' => 'Simpan dan lanjut menyunting',
+	'Save and insert next' => 'Simpan dan sisipkan berikutnya',
 	'Clone' => 'Gandakan',
 	'Delete' => 'Hapus',
 
 	'E-mail' => 'Surel',
 	'From' => 'Dari',
-	'Subject' => 'Subjek',
+	'Subject' => 'Judul',
 	'Attachments' => 'Lampiran',
 	'Send' => 'Kirim',
-	'%d e-mail(s) have been sent.' => array('%d surel berhasil dikirim.', '%d surel berhasil dikirim'),
+	'%d e-mail(s) have been sent.' => '%d surel berhasil dikirim.',
 
 	// data type descriptions
 	'Numbers' => 'Angka',
 	'Date and time' => 'Tanggal dan waktu',
 	'Strings' => 'String',
-	'Binary' => 'Biner',
+	'Binary' => 'Binari',
 	'Lists' => 'Daftar',
 	'Network' => 'Jaringan',
 	'Geometry' => 'Geometri',
@@ -300,9 +296,8 @@ $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.',
+	'Invalid schema.' => 'Skema tidak sah.',
 
 	// PostgreSQL sequences support
 	'Sequences' => 'Deret',

adminer/lang/it.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Password',
 	'Select database' => 'Seleziona database',
 	'Invalid database.' => 'Database non valido.',
-	'Create new database' => 'Crea nuovo database',
 	'Table has been dropped.' => 'Tabella eliminata.',
 	'Table has been altered.' => 'Tabella modificata.',
 	'Table has been created.' => 'Tabella creata.',
@@ -31,13 +30,11 @@ $translations = array(
 	'Alter database' => 'Modifica database',
 	'Create database' => 'Crea database',
 	'SQL command' => 'Comando SQL',
-	'Dump' => 'Dump',
 	'Logout' => 'Esci',
 	'database' => 'database',
 	'Use' => 'Usa',
 	'No tables.' => 'No tabelle.',
 	'select' => 'seleziona',
-	'Create new table' => 'Crea nuova tabella',
 	'Item has been deleted.' => 'Elemento eliminato.',
 	'Item has been updated.' => 'Elemento aggiornato.',
 	'Item%s has been inserted.' => 'Elemento%s inserito.',
@@ -180,6 +177,7 @@ $translations = array(
 	'Data Free' => 'Dati liberi',
 	'Rows' => 'Righe',
 	',' => '.',
+	'0123456789' => '0123456789',
 	'Analyze' => 'Analizza',
 	'Optimize' => 'Ottimizza',
 	'Check' => 'Controlla',
@@ -190,7 +188,7 @@ $translations = array(
 	'%d item(s) have been affected.' => array('Il risultato consiste in %d elemento.', 'Il risultato consiste in %d elementi.'),
 	'whole result' => 'intero risultato',
 	'Clone' => 'Clona',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Troppi campi. Per favore aumentare %s e %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Troppi campi. Per favore aumentare %s.',
 	'Partition by' => 'Partiziona per',
 	'Partitions' => 'Partizioni',
 	'Partition name' => 'Nome partizione',
@@ -226,7 +224,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',
@@ -244,7 +241,7 @@ $translations = array(
 	'Alter type' => 'Modifica tipo definito dall\'utente',
 	'Type has been dropped.' => 'Tipo definito dall\'utente eliminato.',
 	'Type has been created.' => 'Tipo definito dall\'utente creato.',
-	'Double click on a value to modify it.' => 'Fai doppio click su un valore per modificarlo.',
+	'Ctrl+click on a value to modify it.' => 'Fai Ctrl+click su un valore per modificarlo.',
 	'Use edit link to modify this value.' => 'Usa il link modifica per modificare questo valore.',
 	'last' => 'ultima',
 	'From server' => 'Dal server',
@@ -258,7 +255,6 @@ $translations = array(
 	'Attachments' => 'Allegati',
 	'%d query(s) executed OK.' => array('%d query eseguita con successo.', '%d query eseguite con successo.'),
 	'Show only errors' => 'Mostra solo gli errori',
-	'Last page' => 'Ultima pagina',
 	'Refresh' => 'Aggiorna',
 	'Invalid schema.' => 'Schema non valido.',
 	'Please use one of the extensions %s.' => 'Usa una delle estensioni %s.',

adminer/lang/ja.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'パスワード',
 	'Select database' => 'データベースを選択してください',
 	'Invalid database.' => '不正なデータベース',
-	'Create new database' => '新規にデータベースを作成',
 	'Table has been dropped.' => 'テーブルを削除しました',
 	'Table has been altered.' => 'テーブルを変更しました',
 	'Table has been created.' => 'テーブルを作成しました',
@@ -31,13 +30,11 @@ $translations = array(
 	'Alter database' => 'データベースを変更',
 	'Create database' => 'データベースを作成',
 	'SQL command' => 'SQLコマンド',
-	'Dump' => 'ダンプ',
 	'Logout' => 'ログアウト',
 	'database' => 'データベース',
 	'Use' => '使用',
 	'No tables.' => 'テーブルがありません。',
 	'select' => '選択',
-	'Create new table' => 'テーブルを作成',
 	'Item has been deleted.' => '項目を削除しました',
 	'Item has been updated.' => '項目を更新しました',
 	'Edit' => '編集',
@@ -176,6 +173,7 @@ $translations = array(
 	'Data Free' => '空き',
 	'Rows' => '行数',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Analyze' => '分析',
 	'Optimize' => '最適化',
 	'Check' => 'チェック',
@@ -189,7 +187,7 @@ $translations = array(
 	'whole result' => '全結果',
 	'Tables have been dropped.' => 'テーブルを削除しました',
 	'Clone' => 'クローン',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => '定義可能な最大フィールド数を越えました。%s と %s を増やしてください。',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => '定義可能な最大フィールド数を越えました。%s を増やしてください。',
 	'Partition by' => 'パーティション',
 	'Partitions' => 'パーティション',
 	'Partition name' => 'パーティション名',
@@ -227,7 +225,6 @@ $translations = array(
 	'Permanent login' => '永続的にログイン',
 	'Databases have been dropped.' => 'データベースを削除しました',
 	'Search data in tables' => 'データを検索する',
-	'schema' => 'スキーマ',
 	'Schema' => 'スキーマ',
 	'Alter schema' => 'スキーマ変更',
 	'Create schema' => 'スキーマ追加',
@@ -245,7 +242,6 @@ $translations = array(
 	'Alter type' => 'ユーザー定義型変更',
 	'Type has been dropped.' => 'ユーザー定義型を削除しました',
 	'Type has been created.' => 'ユーザー定義型を追加しました',
-	'Double click on a value to modify it.' => 'ダブルクリックして編集',
 	'Use edit link to modify this value.' => 'リンクを編集する',
 	'last' => '最終',
 	'From server' => 'サーバーから実行',
@@ -259,7 +255,6 @@ $translations = array(
 	'now' => '現在の日時',
 	'%d query(s) executed OK.' => '%d クエリーを実行しました',
 	'Show only errors' => 'エラーのみ表示',
-	'Last page' => '最後のページ',
 	'Refresh' => 'リフレッシュ',
 	'Invalid schema.' => '無効なスキーマ',
 	'Please use one of the extensions %s.' => 'いずれかの拡張機能を使ってください %s',

adminer/lang/ko.inc.php

@@ -0,0 +1,267 @@
+<?php
+$translations = array(
+	'Login' => '로그인',
+	'Logout successful.' => '로그아웃',
+	'Invalid credentials.' => '잘못된 로그인',
+	'Server' => '서버',
+	'Username' => '사용자이름',
+	'Password' => '비밀번호',
+	'Select database' => '데이터베이스를 선택하십시오.',
+	'Invalid database.' => '잘못된 데이터베이스입니다.',
+	'Table has been dropped.' => '테이블을 삭제했습니다.',
+	'Table has been altered.' => '테이블을 변경했습니다.',
+	'Table has been created.' => '테이블을 만들었습니다.',
+	'Alter table' => '테이블 변경',
+	'Create table' => '테이블 만들기',
+	'Table name' => '테이블 이름',
+	'engine' => '엔진',
+	'collation' => '정렬',
+	'Column name' => '열 이름',
+	'Type' => '형',
+	'Length' => '길이',
+	'Auto Increment' => '자동증가',
+	'Options' => '설정',
+	'Save' => '저장',
+	'Drop' => '삭제',
+	'Database has been dropped.' => '데이터베이스를 삭제했습니다.',
+	'Database has been created.' => '데이터베이스를 만들었습니다.',
+	'Database has been renamed.' => '데이터베이스의 이름을 바꾸었습니다.',
+	'Database has been altered.' => '데이터베이스를 변경했습니다.',
+	'Alter database' => '데이터베이스 변경',
+	'Create database' => '데이터베이스 만들기',
+	'SQL command' => 'SQL 명령',
+	'Logout' => '로그아웃',
+	'database' => '데이터베이스',
+	'Use' => '사용',
+	'No tables.' => '테이블이 없습니다.',
+	'select' => '선택',
+	'Item has been deleted.' => '항목을 삭제했습니다.',
+	'Item has been updated.' => '항목을 갱신했습니다.',
+	'Edit' => '편집',
+	'Insert' => '삽입',
+	'Save and insert next' => '저장하고 다음에 추가',
+	'Delete' => '삭제',
+	'Database' => '데이터베이스',
+	'Routines' => '루틴',
+	'Indexes have been altered.' => '인덱스를 변경했습니다.',
+	'Indexes' => '색인',
+	'Alter indexes' => '인덱스 변경',
+	'Add next' => '추가',
+	'Language' => '언어',
+	'Select' => '선택',
+	'New item' => '항목 만들기',
+	'Search' => '검색',
+	'Sort' => '정렬',
+	'descending' => '역순',
+	'Limit' => '제약',
+	'No rows.' => '행이 없습니다.',
+	'Action' => '실행',
+	'edit' => '편집',
+	'Page' => '페이지',
+	'Query executed OK, %d row(s) affected.' => '쿼리를 실행했습니다. %d 행을 변경했습니다.',
+	'Error in query' => '쿼리의 오류',
+	'Execute' => '실행',
+	'Table' => '테이블',
+	'Foreign keys' => '외부 키',
+	'Triggers' => '트리거',
+	'View' => '보기',
+	'Unable to select the table' => '테이블을 선택할 수 없습니다.',
+	'Invalid CSRF token. Send the form again.' => '잘못된 CSRF 토큰. 다시 보내주십시오.',
+	'Comment' => '코멘트',
+	'Default values' => '기본값',
+	'%d byte(s)' => '%d 바이트',
+	'No commands to execute.' => '실행할 수 있는 명령이 없습니다.',
+	'Unable to upload a file.' => '파일을 업로드 할 수 없습니다.',
+	'File upload' => '파일 올리기',
+	'File uploads are disabled.' => '파일 업로드가 잘못되었습니다.',
+	'Routine has been called, %d row(s) affected.' => '루틴을 호출했습니다. %d 행을 변경했습니다.',
+	'Call' => '외침',
+	'No extension' => '확장 기능이 없습니다.',
+	'None of the supported PHP extensions (%s) are available.' => 'PHP 확장 (%s)가 설치되어 있지 않습니다.',
+	'Session support must be enabled.' => '세션을 사용하십시오.',
+	'Session expired, please login again.' => '세션 만료. 다시 로그인하십시오.',
+	'Text length' => '문자열의 길이',
+	'Foreign key has been dropped.' => '외부 키를 제거했습니다.',
+	'Foreign key has been altered.' => '외부 키를 변경했습니다.',
+	'Foreign key has been created.' => '외부 키를 만들었습니다.',
+	'Foreign key' => '외부 키',
+	'Target table' => '테이블',
+	'Change' => '변경',
+	'Source' => '소스',
+	'Target' => '타겟',
+	'Add column' => '열 추가',
+	'Alter' => '변경',
+	'Add foreign key' => '외부 키를 추가',
+	'ON DELETE' => 'ON DELETE',
+	'ON UPDATE' => 'ON UPDATE',
+	'Index Type' => '인덱스 형',
+	'Column (length)' => '열 (길이)',
+	'View has been dropped.' => '보기를 삭제했습니다.',
+	'View has been altered.' => '보기를 변경했습니다.',
+	'View has been created.' => '보기를 만들었습니다.',
+	'Alter view' => '보기 변경',
+	'Create view' => '뷰 만들기',
+	'Name' => '이름',
+	'Process list' => '프로세스 목록',
+	'%d process(es) have been killed.' => '%d 프로세스를 강제 종료되었습니다.',
+	'Kill' => '강제 종료',
+	'Parameter name' => '참조 여명',
+	'Database schema' => '구조',
+	'Create procedure' => '시저 만들기',
+	'Create function' => '함수 만들기',
+	'Routine has been dropped.' => '루틴 만들기',
+	'Routine has been altered.' => '루틴 변경',
+	'Routine has been created.' => '루틴 만들기',
+	'Alter function' => '함수의 변경',
+	'Alter procedure' => '시저 변경',
+	'Return type' => '반환 형식',
+	'Add trigger' => '트리거 추가',
+	'Trigger has been dropped.' => '트리거를 제거했습니다.',
+	'Trigger has been altered.' => '트리거를 변경했습니다.',
+	'Trigger has been created.' => '트리거를 추가했습니다.',
+	'Alter trigger' => '트리거 변경',
+	'Create trigger' => '트리거 만들기',
+	'Time' => '시간',
+	'Event' => '이벤트',
+	'%s version: %s through PHP extension %s' => '%s 버전 %s, PHP 확장 %s',
+	'%d row(s)' => '%d 행',
+	'Remove' => '제외',
+	'Are you sure?' => '실행 하시겠습니까?',
+	'Privileges' => '권한',
+	'Create user' => '사용자 만들기',
+	'User has been dropped.' => '사용자 삭제',
+	'User has been altered.' => '사용자 변경',
+	'User has been created.' => '사용자 만들기',
+	'Hashed' => 'Hashed',
+	'Column' => '열',
+	'Routine' => '루틴',
+	'Grant' => '권한 부여',
+	'Revoke' => '권한 취소',
+	'Logged as: %s' => '로그 : %s',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST 데이터가 너무 큽니다. 데이터 크기를 줄이거나 %s 설정을 늘리십시오.',
+	'Move up' => '상',
+	'Move down' => '아래',
+	'Export' => '내보내기',
+	'Tables' => '테이블',
+	'Data' => '데이터',
+	'Output' => '출력',
+	'open' => '열',
+	'save' => '저장',
+	'Format' => '형식',
+	'Functions' => '함수',
+	'Aggregation' => '집합',
+	'Event has been dropped.' => '삭제했습니다.',
+	'Event has been altered.' => '변경했습니다.',
+	'Event has been created.' => '만들었습니다.',
+	'Alter event' => '변경',
+	'Create event' => '만들기',
+	'Start' => '시작',
+	'End' => '종료',
+	'Every' => '매번',
+	'Status' => '상태',
+	'On completion preserve' => '완성 후 저장',
+	'Events' => '이벤트',
+	'Schedule' => '일정',
+	'At given time' => '지정 시간',
+	'Tables have been truncated.' => '테이블을 truncate했습니다.',
+	'Tables have been moved.' => '테이블을 옮겼습니다.',
+	'Tables and views' => '테이블과 뷰',
+	'Engine' => '엔진',
+	'Collation' => '정렬',
+	'Data Length' => '데이터 길이',
+	'Index Length' => '인덱스 길이',
+	'Data Free' => '여유',
+	'Rows' => '행',
+	',' => ',',
+	'0123456789' => '0123456789',
+	'Analyze' => '분석',
+	'Optimize' => '최적화',
+	'Check' => '확인',
+	'Repair' => '복구',
+	'Truncate' => 'Truncate',
+	'Move to other database' => '다른 데이터베이스로 이동',
+	'Move' => '이동',
+	'Save and continue edit' => '저장하고 계속',
+	'original' => '원래',
+	'%d item(s) have been affected.' => '%d를 갱신했습니다.',
+	'whole result' => '모든 결과',
+	'Tables have been dropped.' => '테이블을 삭제했습니다.',
+	'Clone' => '복제',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => '정의 가능한 최대 필드 수를 초과했습니다. %s를 늘리십시오.',
+	'Partition by' => '파티션',
+	'Partitions' => '파티션',
+	'Partition name' => '파티션 이름',
+	'Values' => '값',
+	'%d row(s) have been imported.' => '%d 행을 가져 왔습니다.',
+	'Show structure' => '구조',
+	'anywhere' => '모든',
+	'Import' => '가져 오기',
+	'Stop on error' => '오류의 경우 중지',
+	'Select data' => '데이터',
+	'%.3f s' => '%.3f 초',
+	'$1-$3-$5' => '$1-$3-$5',
+	'[yyyy]-mm-dd' => '[yyyy]-mm-dd',
+	'History' => '역사',
+	'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.' => '원본 및 대상 열은 동일한 데이터 형식이어야합니다. 목표 컬럼에 인덱스와 데이터가 존재해야합니다.',
+	'Relations' => '관계',
+	'Run file' => '파일을 실행',
+	'Clear' => '삭제',
+	'Maximum allowed file size is %sB.' => '파일의 최대 크기 %sB',
+	'Numbers' => '숫자',
+	'Date and time' => '시간',
+	'Strings' => '문자열',
+	'Binary' => '이진',
+	'Lists' => '목록',
+	'Editor' => '에디터',
+	'E-mail' => '메일',
+	'From' => '보낸 사람',
+	'Subject' => '제목',
+	'Send' => '보내기',
+	'%d e-mail(s) have been sent.' => '%d 메일을 보냈습니다.',
+	'Webserver file %s' => 'Web 서버 파일 %s',
+	'File does not exist.' => '파일이 존재하지 않습니다.',
+	'%d in total' => '총 %d',
+	'Permanent login' => '영구적으로 로그인',
+	'Databases have been dropped.' => '데이터베이스를 삭제했습니다.',
+	'Search data in tables' => '데이터 검색',
+	'Schema' => '스키마',
+	'Alter schema' => '스키마 변경',
+	'Create schema' => '스키마 추가',
+	'Schema has been dropped.' => '스키마를 삭제했습니다.',
+	'Schema has been created.' => '스키마를 추가했습니다.',
+	'Schema has been altered.' => '스키마를 변경했습니다.',
+	'Sequences' => '시퀀스',
+	'Create sequence' => '시퀀스 만들기',
+	'Alter sequence' => '순서 변경',
+	'Sequence has been dropped.' => '시퀀스를 제거했습니다.',
+	'Sequence has been created.' => '시퀀스를 추가했습니다.',
+	'Sequence has been altered.' => '순서를 변경했습니다.',
+	'User types' => '사용자 정의 형',
+	'Create type' => '사용자 정의 형식 만들기',
+	'Alter type' => '사용자 정의 형식 변경',
+	'Type has been dropped.' => '사용자 정의 형식을 삭제했습니다.',
+	'Type has been created.' => '사용자 정의 형식을 추가했습니다.',
+	'Use edit link to modify this value.' => '링크 편집',
+	'last' => '마지막',
+	'From server' => '서버에서 실행',
+	'System' => '데이터베이스 형식',
+	'empty' => '하늘',
+	'Network' => '네트워크 형',
+	'Geometry' => '기하 형',
+	'File exists.' => '파일이 이미 있습니다.',
+	'Attachments' => '첨부 파일',
+	'Item%s has been inserted.' => '%s 항목을 삽입했습니다.',
+	'now' => '현재 시간',
+	'%d query(s) executed OK.' => '%d 쿼리를 실행했습니다.',
+	'Show only errors' => '오류 만 표시',
+	'Refresh' => '새로 고침',
+	'Invalid schema.' => '잘못된 스키마',
+	'Please use one of the extensions %s.' => '하나의 확장 기능을 사용하십시오 %s',
+	'ltr' => 'ltr',
+	'Tables have been copied.' => '테이블을 복사했습니다',
+	'Copy' => '복사',
+	'Permanent link' => '영구 링크',
+	'Edit all' => '모든 편집',
+	'HH:MM:SS' => '시:분:초',
+);

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',
@@ -78,7 +77,6 @@ $translations = array(
 	'Use' => 'Naudoti',
 	'Select database' => 'Pasirinkti duomenų bazę',
 	'Invalid database.' => 'Neteisinga duomenų bazė.',
-	'Create new database' => 'Sukurti naują duomenų bazę',
 	'Database has been dropped.' => 'Duomenų bazė panaikinta.',
 	'Databases have been dropped.' => 'Duomenų bazės panaikintos.',
 	'Database has been created.' => 'Duomenų bazė sukurta.',
@@ -93,6 +91,7 @@ $translations = array(
 	
 	// thousands separator - must contain single byte
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Engine' => 'Variklis',
 	'Collation' => 'Lyginimas',
 	'Data Length' => 'Duomenų ilgis',
@@ -144,7 +143,6 @@ $translations = array(
 	'No tables.' => 'Nėra lentelių.',
 	'Alter table' => 'Redaguoti lentelę',
 	'Create table' => 'Sukurti lentelę',
-	'Create new table' => 'Sukurti naują lentelę',
 	'Table has been dropped.' => 'Lentelė pašalinta.',
 	'Tables have been dropped.' => 'Lentelės pašalintos.',
 	'Table has been altered.' => 'Lentelė pakeista.',
@@ -165,7 +163,7 @@ $translations = array(
 	'Move up' => 'Perkelti į viršų',
 	'Move down' => 'Perkelti žemyn',
 	'Remove' => 'Pašalinti',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Viršytas maksimalus leidžiamų stulpelių kiekis. Padidinkite %s ir %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Viršytas maksimalus leidžiamų stulpelių kiekis. Padidinkite %s.',
 	
 	'Partition by' => 'Skirstyti pagal',
 	'Partitions' => 'Skirsniai',
@@ -231,7 +229,6 @@ $translations = array(
 	'%d row(s)' => array('%d įrašas', '%d įrašai', '%d įrašų'),
 	'Page' => 'Puslapis',
 	'last' => 'paskutinis',
-	'Last page' => 'Paskutinis puslapis',
 	'whole result' => 'visas rezultatas',
 	'%d byte(s)' => array('%d baitas', '%d baigai', '%d baitų'),
 	
@@ -239,7 +236,6 @@ $translations = array(
 	'%d row(s) have been imported.' => array('%d įrašas įkelta.', '%d įrašai įkelti.', '%d įrašų įkelta.'),
 	
 	// in-place editing in select
-	'Double click on a value to modify it.' => 'Du kartus spragtelėkite pelyte norėdami redaguoti.',
 	'Use edit link to modify this value.' => 'Norėdami redaguoti reikšmę naudokite redagavimo nuorodą.',
 	
 	// %s can contain auto-increment value
@@ -296,7 +292,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

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Wachtwoord',
 	'Select database' => 'Database selecteren',
 	'Invalid database.' => 'Ongeldige database.',
-	'Create new database' => 'Nieuwe database',
 	'Table has been dropped.' => 'Tabel verwijderd.',
 	'Table has been altered.' => 'Tabel aangepast.',
 	'Table has been created.' => 'Tabel aangemaakt.',
@@ -32,13 +31,11 @@ $translations = array(
 	'Alter database' => 'Database aanpassen',
 	'Create database' => 'Database aanmaken',
 	'SQL command' => 'SQL opdracht',
-	'Dump' => 'Exporteer',
 	'Logout' => 'Uitloggen',
 	'database' => 'database',
 	'Use' => 'Gebruik',
 	'No tables.' => 'Geen tabellen.',
 	'select' => 'kies',
-	'Create new table' => 'Nieuwe tabel',
 	'Item has been deleted.' => 'Item verwijderd.',
 	'Item has been updated.' => 'Item aangepast.',
 	'Item%s has been inserted.' => 'Item%s toegevoegd.',
@@ -63,7 +60,7 @@ $translations = array(
 	'Action' => 'Acties',
 	'edit' => 'bewerk',
 	'Page' => 'Pagina',
-	'Query executed OK, %d row(s) affected.' => array('Query uitgevoerd, %d rij geraakt.', 'Query uitgevoerd, %d rijen geraakt.'),
+	'Query executed OK, %d row(s) affected.' => array('Query uitgevoerd, %d rij geraakt.', 'Query uitgevoerd, %d rijen beïnvloed.'),
 	'Error in query' => 'Fout in query',
 	'Execute' => 'Uitvoeren',
 	'Table' => 'Tabel',
@@ -181,6 +178,7 @@ $translations = array(
 	'Data Free' => 'Data Vrij',
 	'Rows' => 'Rijen',
 	',' => '.',
+	'0123456789' => '0123456789',
 	'Analyze' => 'Analyseer',
 	'Optimize' => 'Optimaliseer',
 	'Check' => 'Controleer',
@@ -191,7 +189,7 @@ $translations = array(
 	'%d item(s) have been affected.' => array('%d item aangepast.', '%d items aangepast.'),
 	'whole result' => 'volledig resultaat',
 	'Clone' => 'Dupliceer',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Maximum aantal velden bereikt. Verhoog %s en %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maximum aantal velden bereikt. Verhoog %s.',
 	'Partition by' => 'Partitioneren op',
 	'Partitions' => 'Partities',
 	'Partition name' => 'Partitie naam',
@@ -226,7 +224,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',
@@ -244,7 +241,7 @@ $translations = array(
 	'Alter type' => 'Type wijzigen',
 	'Type has been dropped.' => 'Type verwijderd.',
 	'Type has been created.' => 'Type aangemaakt.',
-	'Double click on a value to modify it.' => 'Dubbelklik op een waarde om deze te bewerken.',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+klik op een waarde om deze te bewerken.',
 	'Use edit link to modify this value.' => 'Gebruik de link "bewerk" om deze waarde te wijzigen.',
 	'last' => 'laatste',
 	'From server' => 'Van server',
@@ -258,7 +255,6 @@ $translations = array(
 	'Attachments' => 'Bijlagen',
 	'%d query(s) executed OK.' => array('%d query succesvol uitgevoerd.', '%d querys succesvol uitgevoerd'),
 	'Show only errors' => 'Enkel fouten tonen',
-	'Last page' => 'Laatste pagina',
 	'Refresh' => 'Vernieuwen',
 	'Invalid schema.' => 'Ongeldig schema.',
 	'Please use one of the extensions %s.' => 'Gebruik 1 van volgende extensies: %s.',

adminer/lang/no.inc.php

@@ -0,0 +1,282 @@
+<?php
+$translations = array(
+	'System' => 'System',
+	'Server' => 'Server',
+	'Username' => 'Brukernavn',
+	'Password' => 'Passord',
+	'Permanent login' => 'Permanent login',
+	'Login' => 'Logg inn',
+	'Logout' => 'Logg ut',
+	'Logged as: %s' => 'Logget inn som: %s',
+	'Logout successful.' => 'Utlogging vellykket.',
+	'Invalid credentials.' => 'Ugylding innloggingsinformasjon.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Master-passord er utløpt. <a href="https://www.adminer.org/en/extension/" target="_blank">Implementer</a> en metode for %s for å gjøre det permanent.',
+	'Language' => 'Språk',
+	'Invalid CSRF token. Send the form again.' => 'Ugylding CSRF-token - Send inn skjemaet igjen.',
+	'No extension' => 'Ingen utvidelse',
+	'None of the supported PHP extensions (%s) are available.' => 'Ingen av de støttede PHP-utvidelsene (%s) er tilgjengelige.',
+	'Session support must be enabled.' => 'Økt-støtte må være skrudd på.',
+	'Session expired, please login again.' => 'Økt utløpt - vennligst logg inn på nytt.',
+	'%s version: %s through PHP extension %s' => '%s versjon: %s via PHP-utvidelse %s',
+	'Refresh' => 'Gjenoppfrisk',
+	'ltr' => 'venstre-til-høyre',
+	'Privileges' => 'Privilegier',
+	'Create user' => 'Lag bruker',
+	'User has been dropped.' => 'Bruker slettet.',
+	'User has been altered.' => 'Bruker endret.',
+	'User has been created.' => 'Bruker opprettet.',
+	'Hashed' => 'Hashet',
+	'Column' => 'Kolonne',
+	'Routine' => 'Rutine',
+	'Grant' => 'Gi privilegier',
+	'Revoke' => 'Trekk tilbake',
+	'Process list' => 'Prosessliste',
+	'%d process(es) have been killed.' => array('%d prosess avsluttet.', '%d prosesser avsluttet.'),
+	'Kill' => 'Avslutt',
+	'Variables' => 'Variabler',
+	'Status' => 'Status',
+	'SQL command' => 'SQL-kommando',
+	'%d query(s) executed OK.' => array('%d kall utført OK.', '%d kall utført OK.'),
+	'Query executed OK, %d row(s) affected.' => array('Kall utført OK, %d rad påvirket.', 'Kall utført OK, %d rader påvirket.'),
+	'No commands to execute.' => 'Ingen kommandoer å utføre.',
+	'Error in query' => 'Feil i forespørsel',
+	'Execute' => 'Kjør',
+	'Stop on error' => 'Stopp ved feil',
+	'Show only errors' => 'Vis bare feil',
+	'%.3f s' => '%.3f s',
+	'History' => 'Historie',
+	'Clear' => 'Tøm skjema',
+	'Edit all' => 'Rediger alle',
+	'File upload' => 'Filopplasting',
+	'From server' => 'Fra server',
+	'Webserver file %s' => 'Webserver-fil %s',
+	'Run file' => 'Kjør fil',
+	'File does not exist.' => 'Filen eksisterer ikke.',
+	'File uploads are disabled.' => 'Filopplastinger ikke tillatt.',
+	'Unable to upload a file.' => 'Kunne ikke laste opp fil.',
+	'Maximum allowed file size is %sB.' => 'Maksimum tillatte filstørrelse er %sB.',
+	'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',
+	'Output' => 'Resultat',
+	'open' => 'åpne',
+	'save' => 'lagre',
+	'Format' => 'Format',
+	'Data' => 'Data',
+	'Database' => 'Database',
+	'database' => 'database',
+	'Use' => 'Bruk',
+	'Select database' => 'Velg database',
+	'Invalid database.' => 'Ugyldig database.',
+	'Database has been dropped.' => 'Databasen har blitt slettet.',
+	'Databases have been dropped.' => 'Databasene har blitt slettet.',
+	'Database has been created.' => 'Databasen er opprettet.',
+	'Database has been renamed.' => 'Databasen har fått nytt navn.',
+	'Database has been altered.' => 'Databasen er endret.',
+	'Alter database' => 'Endre database',
+	'Create database' => 'Opprett database',
+	'Database schema' => 'Databaseskjema',
+	'Permanent link' => 'Permanent lenke',
+	',' => ' ',
+	'0123456789' => '0123456789',
+	'Engine' => 'Motor',
+	'Collation' => 'Tekstsortering',
+	'Data Length' => 'Datalengde',
+	'Index Length' => 'Indekslengde',
+	'Data Free' => 'Frie data',
+	'Rows' => 'Rader',
+	'%d in total' => '%d totalt',
+	'Analyze' => 'Analyser',
+	'Optimize' => 'Optimaliser',
+	'Vacuum' => 'Støvsug',
+	'Check' => 'Sjekk',
+	'Repair' => 'Reparer',
+	'Truncate' => 'Avkort',
+	'Tables have been truncated.' => 'Tabellene har blitt avkortet.',
+	'Move to other database' => 'Flytt til annen database',
+	'Move' => 'Flytt',
+	'Tables have been moved.' => 'Tabellene har blitt flyttet.',
+	'Copy' => 'Kopier',
+	'Tables have been copied.' => 'Tabellene har blitt kopiert.',
+	'Routines' => 'Rutiner',
+	'Routine has been called, %d row(s) affected.' => array('Rutinen er utført, %d rad påvirket.', 'Rutinen er utført, %d rader påvirket.'),
+	'Call' => 'Kall',
+	'Parameter name' => 'Parameternavn',
+	'Create procedure' => 'Opprett prosedyre',
+	'Create function' => 'Opprett funksjon',
+	'Routine has been dropped.' => 'Rutinen er slettet.',
+	'Routine has been altered.' => 'Rutinen er endret.',
+	'Routine has been created.' => 'Rutinen er opprettet.',
+	'Alter function' => 'Endre funksjon',
+	'Alter procedure' => 'Endre prosedyre',
+	'Return type' => 'Returtype',
+	'Events' => 'Eventer',
+	'Event has been dropped.' => 'Eventen er slettet.',
+	'Event has been altered.' => 'Eventen er endret.',
+	'Event has been created.' => 'Eventen er opprettet.',
+	'Alter event' => 'Endre event',
+	'Create event' => 'Opprett event',
+	'At given time' => 'På gitte tid',
+	'Every' => 'Hver',
+	'Schedule' => 'Tidsplan',
+	'Start' => 'Start',
+	'End' => 'Slutt',
+	'On completion preserve' => 'Ved fullførelse bevar',
+	'Tables' => 'Tabeller',
+	'Tables and views' => 'Tabeller og views',
+	'Table' => 'Tabell',
+	'No tables.' => 'Ingen tabeller.',
+	'Alter table' => 'Endre tabell',
+	'Create table' => 'Opprett tabell',
+	'Table has been dropped.' => 'Tabellen er slettet.',
+	'Tables have been dropped.' => 'Tabellene er slettet.',
+	'Tables have been optimized.' => 'Tabellene er blitt optimalisert.',
+	'Table has been altered.' => 'Tabellen er endret.',
+	'Table has been created.' => 'Tabellen er opprettet.',
+	'Table name' => 'Tabellnavn',
+	'Show structure' => 'Vis struktur',
+	'engine' => 'mottor',
+	'collation' => 'sortering',
+	'Column name' => 'Kolonnenavn',
+	'Type' => 'Type',
+	'Length' => 'Lengde',
+	'Auto Increment' => 'Autoinkrement',
+	'Options' => 'Valg',
+	'Comment' => 'Kommentarer',
+	'Default values' => 'Standardverdier',
+	'Drop' => 'Dropp',
+	'Are you sure?' => 'Er du sikker?',
+	'Move up' => 'Flytt opp',
+	'Move down' => 'Flytt ned',
+	'Remove' => 'Fjern',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Maksimum antall feltnavn overskredet - venligst øk %s.',
+	'Partition by' => 'Partisjoner ved',
+	'Partitions' => 'Partisjoner',
+	'Partition name' => 'Partisjonsnavn',
+	'Values' => 'Verdier',
+	'View' => 'View',
+	'View has been dropped.' => 'Viewet er slettet.',
+	'View has been altered.' => 'Viewet er endret.',
+	'View has been created.' => 'Viewet er opprettet.',
+	'Alter view' => 'Endre view',
+	'Create view' => 'Lag nytt view',
+	'Indexes' => 'Indekser',
+	'Indexes have been altered.' => 'Indeksene er endret.',
+	'Alter indexes' => 'Endre indekser',
+	'Add next' => 'Legg til neste',
+	'Index Type' => 'Indekstype',
+	'Column (length)' => 'Kolonne (lengde)',
+	'Foreign keys' => 'Fremmednøkler',
+	'Foreign key' => 'Fremmednøkkel',
+	'Foreign key has been dropped.' => 'Fremmednøkkelen er slettet.',
+	'Foreign key has been altered.' => 'Fremmednøkkelen er endret.',
+	'Foreign key has been created.' => 'Fremmednøkkelen er opprettet.',
+	'Target table' => 'Måltabell',
+	'Change' => 'Endre',
+	'Source' => 'Kilde',
+	'Target' => 'Mål',
+	'Add column' => 'Legg til kolonne',
+	'Alter' => 'Endre',
+	'Add foreign key' => 'Legg til fremmednøkkel',
+	'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ål-kolonner må ha samme datatype, det må være en indeks på mål-kolonnen, og dataene som refereres til må eksistere.',
+	'Triggers' => 'Triggere',
+	'Add trigger' => 'Legg til trigger',
+	'Trigger has been dropped.' => 'Triggeren er slettet.',
+	'Trigger has been altered.' => 'Triggeren er endret.',
+	'Trigger has been created.' => 'Triggeren er opprettet.',
+	'Alter trigger' => 'Endre trigger',
+	'Create trigger' => 'Opprett trigger',
+	'Time' => 'Tid',
+	'Event' => 'Hendelse',
+	'Name' => 'Navn',
+	'select' => 'Vis',
+	'Select' => 'Velg',
+	'Select data' => 'Velg data',
+	'Functions' => 'Funksjoner',
+	'Aggregation' => 'Sammenfatning',
+	'Search' => 'Søk',
+	'anywhere' => 'hvorsomhelst',
+	'Search data in tables' => 'Søk data i tabeller',
+	'Sort' => 'Sorter',
+	'descending' => 'minkende',
+	'Limit' => 'Skranke',
+	'Text length' => 'Tekstlengde',
+	'Action' => 'Handling',
+	'Full table scan' => 'Full tabell-scan',
+	'Unable to select the table' => 'Kan ikke velge tabellen',
+	'No rows.' => 'Ingen rader.',
+	'%d row(s)' => array('%d rad', '%d rader'),
+	'Page' => 'Side',
+	'last' => 'siste',
+	'Load more data' => 'Last mer data',
+	'Loading' => 'Laster',
+	'whole result' => 'hele resultatet',
+	'%d byte(s)' => array('%d byte', '%d bytes'),
+	'Import' => 'Importer',
+	'%d row(s) have been imported.' => array('%d rad er importert.', '%d rader er importert.'),
+	'File must be in UTF-8 encoding.' => 'Filen må være i UTF8-tegnkoding.',
+	'Modify' => 'Endre',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+klikk på en verdi for å endre den.',
+	'Use edit link to modify this value.' => 'Bruk rediger-lengde for å endre dennne verdien.',
+	'Item%s has been inserted.' => 'Rad%s er satt inn.',
+	'Item has been deleted.' => 'Raden er slettet.',
+	'Item has been updated.' => 'Raden er oppdatert.',
+	'%d item(s) have been affected.' => array('%d rad påvirket.', '%d rader påvirket.'),
+	'New item' => 'Ny rad',
+	'original' => 'original',
+	'empty' => 'tom',
+	'edit' => 'rediger',
+	'Edit' => 'Rediger',
+	'Insert' => 'Sett inn',
+	'Save' => 'Lagre',
+	'Save and continue edit' => 'Lagre og fortsett å redigere',
+	'Save and insert next' => 'Lagre og sett inn neste',
+	'Selected' => 'Valgt',
+	'Clone' => 'Klon',
+	'Delete' => 'Slett',
+	'You have no privileges to update this table.' => 'Du mangler rettighetene som trengs for å endre denne tabellen.',
+	'E-mail' => 'E-post',
+	'From' => 'Fra',
+	'Subject' => 'Tittel',
+	'Attachments' => 'Vedlegg',
+	'Send' => 'Send',
+	'%d e-mail(s) have been sent.' => array('%d epost sendt.', '%d eposter sendt.'),
+	'Numbers' => 'Nummer',
+	'Date and time' => 'Dato og tid',
+	'Strings' => 'Strenger',
+	'Binary' => 'Binære',
+	'Lists' => 'Lister',
+	'Network' => 'Nettverk',
+	'Geometry' => 'Geometri',
+	'Relations' => 'Relasjoner',
+	'Editor' => 'Redigering',
+	'$1-$3-$5' => '$6/$4 $1',
+	'[yyyy]-mm-dd' => 'd/m [åååå]',
+	'HH:MM:SS' => 'HH:MM:SS',
+	'now' => 'nå',
+	'yes' => 'ja',
+	'no' => 'nei',
+	'File exists.' => 'Filen finnes.',
+	'Please use one of the extensions %s.' => 'Vennligst bruk en av filendelsene %s.',
+	'Alter schema' => 'Endre skjema',
+	'Create schema' => 'Opprett skjema',
+	'Schema has been dropped.' => 'Skjemaet er slettet.',
+	'Schema has been created.' => 'Skjemaet er opprettet.',
+	'Schema has been altered.' => 'Skjemaet er endret.',
+	'Schema' => 'Skjema',
+	'Invalid schema.' => 'Ugylding skjema.',
+	'Sequences' => 'Sekvenser',
+	'Create sequence' => 'Opprett sekvens',
+	'Sequence has been dropped.' => 'Sekvensen er slettet.',
+	'Sequence has been created.' => 'Sekvensen er opprettet.',
+	'Sequence has been altered.' => 'Sekvensen er endret.',
+	'Alter sequence' => 'Endre sekvens',
+	'User types' => 'Brukertyper',
+	'Create type' => 'Opprett type',
+	'Type has been dropped.' => 'Type er slettet.',
+	'Type has been created.' => 'Type er opprettet.',
+	'Alter type' => 'Endre type',
+	'Saving' => 'Lagrer',
+);

adminer/lang/pl.inc.php

@@ -11,8 +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="https://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="https://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.',
@@ -64,9 +67,10 @@ $translations = array(
 	'Unable to upload a file.' => 'Wgranie pliku było niemożliwe.',
 	'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',
@@ -78,7 +82,6 @@ $translations = array(
 	'Use' => 'Wybierz',
 	'Select database' => 'Wybierz bazę danych',
 	'Invalid database.' => 'Nie znaleziono bazy danych.',
-	'Create new database' => 'Utwórz nową bazę danych',
 	'Database has been dropped.' => 'Baza danych została usunięta.',
 	'Databases have been dropped.' => 'Bazy danych zostały usunięte.',
 	'Database has been created.' => 'Baza danych została utworzona.',
@@ -93,6 +96,7 @@ $translations = array(
 	
 	// thousands separator - must contain single byte
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Engine' => 'Składowanie',
 	'Collation' => 'Porównywanie znaków',
 	'Data Length' => 'Rozmiar danych',
@@ -102,6 +106,7 @@ $translations = array(
 	'%d in total' => '%d w sumie',
 	'Analyze' => 'Analizuj',
 	'Optimize' => 'Optymalizuj',
+	'Vacuum' => 'Wyczyść',
 	'Check' => 'Sprawdź',
 	'Repair' => 'Napraw',
 	'Truncate' => 'Opróżnij',
@@ -144,7 +149,6 @@ $translations = array(
 	'No tables.' => 'Brak tabel.',
 	'Alter table' => 'Zmień tabelę',
 	'Create table' => 'Utwórz tabelę',
-	'Create new table' => 'Utwórz nową tabelę',
 	'Table has been dropped.' => 'Tabela została usunięta.',
 	'Tables have been dropped.' => 'Tabele zostały usunięte.',
 	'Tables have been optimized.' => 'Tabele zostały zoptymalizowane.',
@@ -160,13 +164,16 @@ $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ń',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Przekroczono maksymalną liczbę pól. Zwiększ %s i %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Przekroczono maksymalną liczbę pól. Zwiększ %s.',
 	
 	'Partition by' => 'Partycjonowanie',
 	'Partitions' => 'Partycje',
@@ -174,6 +181,7 @@ $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.',
@@ -227,20 +235,24 @@ $translations = array(
 	'Limit' => 'Limit',
 	'Text length' => 'Długość tekstu',
 	'Action' => 'Czynność',
+	'Full table scan' => 'Wymaga pełnego przeskanowania tabeli',
 	'Unable to select the table' => 'Nie udało się pobrać danych z tabeli',
 	'No rows.' => 'Brak rekordów.',
 	'%d row(s)' => array('%d rekord', '%d rekordy', '%d rekordów'),
 	'Page' => 'Strona',
 	'last' => 'ostatni',
-	'Last page' => 'Ostatnia strona',
+	'Load more data' => 'Wczytaj więcej danych',
+	'Loading' => 'Wczytywanie',
 	'whole result' => 'wybierz wszystkie',
 	'%d byte(s)' => array('%d bajt', '%d bajty', '%d bajtów'),
 	
 	'Import' => 'Import',
 	'%d row(s) have been imported.' => array('%d rekord został zaimportowany.', '%d rekordy zostały zaimportowane.', '%d rekordów zostało zaimportowanych.'),
+	'File must be in UTF-8 encoding.' => 'Kodowanie pliku musi być ustawione na UTF-8.',
 	
 	// in-place editing in select
-	'Double click on a value to modify it.' => 'Kliknij podwójnie wartość, aby ją edytować.',
+	'Modify' => 'Zmień',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+kliknij wartość, aby ją edytować.',
 	'Use edit link to modify this value.' => 'Użyj linku edycji aby zmienić tę wartość.',
 	
 	// %s can contain auto-increment value
@@ -256,10 +268,13 @@ $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',
 	
 	'E-mail' => 'E-mail',
 	'From' => 'Nadawca',
@@ -299,7 +314,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

@@ -0,0 +1,263 @@
+<?php
+$translations = array(
+	'Login' => 'Entrar',
+	'Logout successful.' => 'Saída bem sucedida.',
+	'Invalid credentials.' => 'Identificação inválida.',
+	'Server' => 'Servidor',
+	'Username' => 'Usuário',
+	'Password' => 'Senha',
+	'Select database' => 'Selecionar Base de dados',
+	'Invalid database.' => 'Base de dados inválida.',
+	'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',
+	'collation' => 'collation',
+	'Column name' => 'Nome da coluna',
+	'Type' => 'Tipo',
+	'Length' => 'Tamanho',
+	'Auto Increment' => 'Incremento Automático',
+	'Options' => 'Opções',
+	'Save' => 'Salvar',
+	'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',
+	'Logout' => 'Sair',
+	'database' => 'base de dados',
+	'Use' => 'Usar',
+	'No tables.' => 'Não existem tabelas.',
+	'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' => 'Deletar',
+	'Database' => 'Base de dados',
+	'Routines' => 'Rotinas',
+	'Indexes have been altered.' => 'Os Índices foram alterados.',
+	'Indexes' => 'Índices',
+	'Alter indexes' => 'Alterar índices',
+	'Add next' => 'Adicionar proximo',
+	'Language' => 'Idioma',
+	'Select' => 'Selecionar',
+	'New item' => 'Novo Registro',
+	'Search' => 'Procurar',
+	'Sort' => 'Ordenar',
+	'descending' => 'decrescente',
+	'Limit' => 'Limite',
+	'No rows.' => 'Não existem registros.',
+	'Action' => 'Ação',
+	'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 estrangeiras',
+	'Triggers' => 'Triggers',
+	'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 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('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.' => '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.' => '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' => '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.' => '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 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.' => '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.' => '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?' => 'Você tem certeza?',
+	'Privileges' => 'Privilégios',
+	'Create user' => 'Criar Usuário',
+	'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',
+	'Grant' => 'Conceder',
+	'Revoke' => 'Impedir',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST data demasiado grande. Reduza o tamanho ou aumente a diretiva de configuração %s.',
+	'Logged as: %s' => 'Logado como: %s',
+	'Move up' => 'Mover acima',
+	'Move down' => 'Mover abaixo',
+	'Functions' => 'Funções',
+	'Aggregation' => 'Adições',
+	'Export' => 'Exportar',
+	'Output' => 'Saída',
+	'open' => 'abrir',
+	'save' => 'salvar',
+	'Format' => 'Formato',
+	'Tables' => 'Tabelas',
+	'Data' => 'Dados',
+	'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',
+	'Every' => 'Cada',
+	'Events' => 'Eventos',
+	'Schedule' => 'Agenda',
+	'Start' => 'Início',
+	'End' => 'Fim',
+	'Status' => 'Estado',
+	'On completion preserve' => 'Ao completar preservar',
+	'Tables and views' => 'Tabelas e Visões',
+	'Data Length' => 'Tamanho de dados',
+	'Index Length' => 'Tamanho de índice',
+	'Data Free' => 'Espaço Livre',
+	'Collation' => 'Colação',
+	'Analyze' => 'Analizar',
+	'Optimize' => 'Otimizar',
+	'Check' => 'Verificar',
+	'Repair' => 'Reparar',
+	'Truncate' => 'Truncar',
+	'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 para outra Base de dados',
+	'Move' => 'Mover',
+	'Engine' => 'Motor',
+	'Save and continue edit' => 'Salvar e continuar editando',
+	'original' => 'original',
+	'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.',
+	'Partition by' => 'Particionar por',
+	'Partitions' => 'Partições',
+	'Partition name' => 'Nome da Partição',
+	'Values' => 'Valores',
+	'%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',
+	'%.3f s' => '%.3f s',
+	'$1-$3-$5' => '$5/$3/$1',
+	'[yyyy]-mm-dd' => 'dd/mm/[aaaa]',
+	'History' => 'Histórico',
+	'Variables' => 'Variáveis',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'As colunas de origen e destino devem ser do mesmo tipo, deve existir um índice entre as colunas de destino e o registro referenciado deve existir.',
+	'Relations' => 'Relações',
+	'Run file' => 'Executar Arquivo',
+	'Clear' => 'Limpar',
+	'Maximum allowed file size is %sB.' => 'Tamanho máximo do arquivo permitido é %sB.',
+	'Numbers' => 'Números',
+	'Date and time' => 'Data e hora',
+	'Strings' => 'Cadena',
+	'Binary' => 'Binário',
+	'Lists' => 'Listas',
+	'Editor' => 'Editor',
+	'E-mail' => 'E-mail',
+	'From' => 'De',
+	'Subject' => 'Assunto',
+	'Send' => 'Enviar',
+	'%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' => 'Login permanente',
+	'Databases have been dropped.' => 'A Base de dados foi apagada.',
+	'Search data in tables' => 'Buscar dados nas Tabelas',
+	'Schema' => 'Esquema',
+	'Alter schema' => 'Alterar esquema',
+	'Create schema' => 'Criar esquema',
+	'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ê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' => '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' => 'A partir do servidor',
+	'System' => 'Sistema',
+	'Select data' => 'Selecionar dados',
+	'Show structure' => 'Mostrar estrutura',
+	'empty' => 'vazio',
+	'Network' => 'Rede',
+	'Geometry' => 'Geometria',
+	'File exists.' => 'Arquivo já existe.',
+	'Attachments' => 'Anexos',
+	'%d query(s) executed OK.' => array('%d consulta sql executada corretamente.', '%d consultas sql executadas corretamente.'),
+	'Show only errors' => 'Mostrar somente erros',
+	'Refresh' => 'Atualizar',
+	'Invalid schema.' => 'Esquema inválido.',
+	'Please use one of the extensions %s.' => 'Por favor use uma das extensões %s.',
+	'now' => 'agora',
+	'ltr' => 'ltr',
+);

adminer/lang/pt.inc.php

@@ -1,14 +1,13 @@
 <?php
 $translations = array(
 	'Login' => 'Entrar',
-	'Logout successful.' => 'Saida bem sucedida.',
+	'Logout successful.' => 'Sessão terminada com sucesso.',
 	'Invalid credentials.' => 'Identificação inválida.',
 	'Server' => 'Servidor',
-	'Username' => 'Usuário',
+	'Username' => 'Nome de utilizador',
 	'Password' => 'Senha',
 	'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.',
@@ -22,7 +21,7 @@ $translations = array(
 	'Length' => 'Tamanho',
 	'Auto Increment' => 'Incremento Automático',
 	'Options' => 'Opções',
-	'Save' => 'Salvar',
+	'Save' => 'Guardar',
 	'Drop' => 'Remover',
 	'Database has been dropped.' => 'Base de dados eliminada.',
 	'Database has been created.' => 'Base de dados criada.',
@@ -31,42 +30,40 @@ $translations = array(
 	'Alter database' => 'Modificar Base de dados',
 	'Create database' => 'Criar Base de dados',
 	'SQL command' => 'Comando SQL',
-	'Dump' => 'Exportar',
-	'Logout' => 'Sair',
+	'Logout' => 'Terminar sessão',
 	'database' => 'base de dados',
 	'Use' => 'Usar',
 	'No tables.' => 'Não existem tabelas.',
-	'select' => 'registros',
-	'Create new table' => 'Nova tabela',
-	'Item has been deleted.' => 'Registro eliminado.',
-	'Item has been updated.' => 'Registro modificado.',
-	'Item%s has been inserted.' => 'Registro%s inserido.',
+	'select' => 'registos',
+	'Item has been deleted.' => 'Registo eliminado.',
+	'Item has been updated.' => 'Registo modificado.',
+	'Item%s has been inserted.' => 'Registo%s inserido.',
 	'Edit' => 'Modificar',
 	'Insert' => 'Inserir',
-	'Save and insert next' => 'Salvar e inserir outro',
-	'Delete' => 'Apagar',
+	'Save and insert next' => 'Guardar e inserir outro',
+	'Delete' => 'Eliminar',
 	'Database' => 'Base de dados',
 	'Routines' => 'Procedimentos',
 	'Indexes have been altered.' => 'Índices modificados.',
 	'Indexes' => 'Índices',
 	'Alter indexes' => 'Modificar índices',
-	'Add next' => 'Adicionar proximo',
+	'Add next' => 'Adicionar próximo',
 	'Language' => 'Idioma',
 	'Select' => 'Selecionar',
-	'New item' => 'Novo Registro',
+	'New item' => 'Novo Registo',
 	'Search' => 'Procurar',
 	'Sort' => 'Ordenar',
 	'descending' => 'decrescente',
 	'Limit' => 'Limite',
-	'No rows.' => 'Não existem registros.',
+	'No rows.' => 'Não existem registos.',
 	'Action' => 'Ação',
 	'edit' => 'modificar',
 	'Page' => 'Página',
-	'Query executed OK, %d row(s) affected.' => array('Consulta executada, %d registro afetado.', 'Consulta executada, %d registros afetados.'),
+	'Query executed OK, %d row(s) affected.' => array('Consulta executada, %d registo afetado.', 'Consulta executada, %d registos afetados.'),
 	'Error in query' => 'Erro na consulta',
 	'Execute' => 'Executar',
 	'Table' => 'Tabela',
-	'Foreign keys' => 'Chaves foráneas',
+	'Foreign keys' => 'Chaves estrangeiras',
 	'Triggers' => 'Triggers',
 	'View' => 'Visualizar',
 	'Unable to select the table' => 'Não é possivel selecionar a Tabela',
@@ -75,27 +72,27 @@ $translations = array(
 	'Default values' => 'Valores predeterminados',
 	'%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.'),
+	'Unable to upload a file.' => 'Não é possível enviar o ficheiro.',
+	'File upload' => 'Importar ficheiro',
+	'File uploads are disabled.' => 'Importação de ficheiros desativada.',
+	'Routine has been called, %d row(s) affected.' => array('Consulta executada, %d registo afetado.', 'Consulta executada, %d registos afetados.'),
 	'Call' => 'Chamar',
-	'No extension' => 'Não há extension',
+	'No extension' => 'Não há extensão',
 	'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.',
-	'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',
+	'Session support must be enabled.' => 'As sessões devem estar ativas.',
+	'Session expired, please login again.' => 'Sessão expirada, por favor entre de novo.',
+	'Text length' => 'Tamanho do texto',
+	'Foreign key has been dropped.' => 'Chave estrangeira eliminada.',
+	'Foreign key has been altered.' => 'Chave estrangeira modificada.',
+	'Foreign key has been created.' => 'Chave estrangeira 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',
+	'Add foreign key' => 'Adicionar Chave estrangeira',
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => 'Tipo de índice',
@@ -118,7 +115,7 @@ $translations = array(
 	'Routine has been created.' => 'Procedimento criado.',
 	'Alter function' => 'Modificar Função',
 	'Alter procedure' => 'Modificar procedimento',
-	'Return type' => 'Tipo de valor de regreso',
+	'Return type' => 'Tipo de valor de regresso',
 	'Add trigger' => 'Adicionar trigger',
 	'Trigger has been dropped.' => 'Trigger eliminado.',
 	'Trigger has been altered.' => 'Trigger modificado.',
@@ -128,29 +125,29 @@ $translations = array(
 	'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'),
+	'%d row(s)' => array('%d registo', '%d registos'),
 	'Remove' => 'Remover',
-	'Are you sure?' => 'Está seguro?',
+	'Are you sure?' => 'Tem a 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.',
+	'Create user' => 'Criar utilizador',
+	'User has been dropped.' => 'Utilizador eliminado.',
+	'User has been altered.' => 'Utilizador modificado.',
+	'User has been created.' => 'Utilizador criado.',
 	'Hashed' => 'Hash',
 	'Column' => 'Coluna',
 	'Routine' => 'Rotina',
 	'Grant' => 'Conceder',
 	'Revoke' => 'Impedir',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST data demasiado grande. Reduza o tamanho ou aumente a diretiva de configuração %s.',
-	'Logged as: %s' => 'Logado como: %s',
-	'Move up' => 'Mover acima',
-	'Move down' => 'Mover abaixo',
+	'Logged as: %s' => 'Ligado como: %s',
+	'Move up' => 'Mover para cima',
+	'Move down' => 'Mover para baixo',
 	'Functions' => 'Funções',
 	'Aggregation' => 'Adições',
 	'Export' => 'Exportar',
 	'Output' => 'Saída',
-	'open' => 'mostrar',
-	'save' => 'salvas',
+	'open' => 'abrir',
+	'save' => 'guardar',
 	'Format' => 'Formato',
 	'Tables' => 'Tabelas',
 	'Data' => 'Dados',
@@ -159,14 +156,14 @@ $translations = array(
 	'Event has been created.' => 'Evento criado.',
 	'Alter event' => 'Modificar Evento',
 	'Create event' => 'Criar Evento',
-	'At given time' => 'A hora determinada',
+	'At given time' => 'À hora determinada',
 	'Every' => 'Cada',
 	'Events' => 'Eventos',
 	'Schedule' => 'Agenda',
 	'Start' => 'Início',
 	'End' => 'Fim',
 	'Status' => 'Estado',
-	'On completion preserve' => 'Ao completar preservar',
+	'On completion preserve' => 'Preservar ao completar',
 	'Tables and views' => 'Tabelas e vistas',
 	'Data Length' => 'Tamanho de dados',
 	'Index Length' => 'Tamanho de índice',
@@ -178,24 +175,25 @@ $translations = array(
 	'Repair' => 'Reparar',
 	'Truncate' => 'Truncar',
 	'Tables have been truncated.' => 'Tabelas truncadas (truncate).',
-	'Rows' => 'Registros',
+	'Rows' => 'Registos',
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'As Tabelas foram movidas.',
 	'Move to other database' => 'Mover outra Base de dados',
 	'Move' => 'Mover',
 	'Engine' => 'Motor',
-	'Save and continue edit' => 'Salvar e continuar editando',
+	'Save and continue edit' => 'Guardar e continuar a edição',
 	'original' => 'original',
-	'Tables have been dropped.' => 'Tabelas eliminadas.',
+	'Tables have been dropped.' => 'As tabelas foram eliminadas.',
 	'%d item(s) have been affected.' => array('%d item afetado.', '%d itens afetados.'),
 	'whole result' => 'resultado completo',
 	'Clone' => 'Clonar',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Quantidade máxima de campos permitidos excedidos. Por favor aumente %s e %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Quantidade máxima de campos permitidos excedidos. Por favor aumente %s.',
 	'Partition by' => 'Particionar por',
 	'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 registo importado.', '%d registos importados.'),
 	'anywhere' => 'qualquer local',
 	'Import' => 'Importar',
 	'Stop on error' => 'Parar em caso de erro',
@@ -204,14 +202,14 @@ $translations = array(
 	'[yyyy]-mm-dd' => 'dd/mm/[aaaa]',
 	'History' => 'Histórico',
 	'Variables' => 'Variáveis',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'As colunas de origen e destino devem ser do mesmo tipo, deve existir um índice entre as colunas de destino e o registro referenciado deve 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.' => 'As colunas de origen e destino devem ser do mesmo tipo, deve existir um índice entre as colunas de destino e o registo referenciado deve existir.',
 	'Relations' => 'Relações',
-	'Run file' => 'Executar Arquivo',
+	'Run file' => 'Executar ficheiro',
 	'Clear' => 'Limpar',
-	'Maximum allowed file size is %sB.' => 'Tamanho máximo do arquivo é %sB.',
+	'Maximum allowed file size is %sB.' => 'Tamanho máximo do ficheiro é %sB.',
 	'Numbers' => 'Números',
 	'Date and time' => 'Data e hora',
-	'Strings' => 'Cadena',
+	'Strings' => 'Cadeia',
 	'Binary' => 'Binário',
 	'Lists' => 'Listas',
 	'Editor' => 'Editor',
@@ -220,13 +218,12 @@ $translations = array(
 	'Subject' => 'Assunto',
 	'Send' => 'Enviar',
 	'%d e-mail(s) have been sent.' => array('%d email enviado.', '%d emails enviados.'),
-	'Webserver file %s' => 'Arquivo do servidor web %s',
-	'File does not exist.' => 'Arquivo não existe.',
+	'Webserver file %s' => 'Ficheiro do servidor web %s',
+	'File does not exist.' => 'Ficheiro não existe.',
 	'%d in total' => '%d no total',
-	'Permanent login' => 'Salvar Senha',
+	'Permanent login' => 'Memorizar a senha',
 	'Databases have been dropped.' => 'Bases de dados eliminadas.',
-	'Search data in tables' => 'Buscar dados nas Tabelas',
-	'schema' => 'esquema',
+	'Search data in tables' => 'Pesquisar dados nas Tabelas',
 	'Schema' => 'Esquema',
 	'Alter schema' => 'Modificar esquema',
 	'Create schema' => 'Criar esquema',
@@ -239,26 +236,25 @@ $translations = array(
 	'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',
+	'User types' => 'Tipos definidos pelo utilizador',
 	'Create type' => 'Criar tipo',
 	'Alter type' => 'Modificar tipo',
 	'Type has been dropped.' => 'Tipo eliminado.',
 	'Type has been created.' => 'Tipo criado.',
-	'Double click on a value to modify it.' => 'Clique duas vezes sobre o valor para edita-lo.',
+	'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.',
 	'last' => 'último',
-	'From server' => 'Desde servidor',
+	'From server' => 'Do servidor',
 	'System' => 'Motor de Base de dados',
 	'Select data' => 'Selecionar dados',
 	'Show structure' => 'Mostrar estrutura',
 	'empty' => 'vazio',
 	'Network' => 'Rede',
 	'Geometry' => 'Geometria',
-	'File exists.' => 'Arquivo já existe.',
+	'File exists.' => 'Ficheiro já existe.',
 	'Attachments' => 'Anexos',
 	'%d query(s) executed OK.' => array('%d consulta sql executada corretamente.', '%d consultas sql executadas corretamente.'),
 	'Show only errors' => 'Mostrar somente erros',
-	'Last page' => 'Última página',
 	'Refresh' => 'Atualizar',
 	'Invalid schema.' => 'Esquema inválido.',
 	'Please use one of the extensions %s.' => 'Por favor use uma das extensões %s.',

adminer/lang/ro.inc.php

@@ -1,14 +1,13 @@
 <?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',
 	'Password' => 'Parola',
 	'Select database' => 'Alege baza de date',
 	'Invalid database.' => 'Bază de deate invalidă.',
-	'Create new database' => 'Crează o bază de date nouă',
 	'Table has been dropped.' => 'Tabelul a fost șters.',
 	'Table has been altered.' => 'Tabelul a fost modificat.',
 	'Table has been created.' => 'Tabelul a fost creat.',
@@ -31,13 +30,11 @@ $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.',
 	'select' => 'selectează',
-	'Create new table' => 'Crează tabel nou',
 	'Item has been deleted.' => 'Înregistrare a fost ștearsă.',
 	'Item has been updated.' => 'Înregistrare a fost înnoită.',
 	'Item%s has been inserted.' => 'Înregistrarea%s a fost inserată.',
@@ -47,9 +44,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ă',
@@ -63,11 +60,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.',
@@ -78,24 +75,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',
@@ -103,11 +100,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',
@@ -119,7 +116,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.',
@@ -130,8 +127,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.',
@@ -148,7 +145,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',
@@ -164,12 +161,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ă',
@@ -180,6 +177,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ă',
@@ -196,8 +194,8 @@ $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',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Numărul maxim de înscrieri disponibile a fost atins. Majorați %s și %s.',
+	'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',
 	'$1-$3-$5' => '$5.$3.$1',
@@ -207,11 +205,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',
@@ -219,14 +217,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ă',
@@ -244,21 +241,20 @@ $translations = array(
 	'Alter type' => 'Modifică tip',
 	'Type has been dropped.' => 'Tiipul a fost șters.',
 	'Type has been created.' => 'Crează tip nou.',
-	'Double click on a value to modify it.' => 'Dublu click pe o valoare pentru a o modifica.',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+click pe o valoare pentru a o modifica.',
 	'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',
-	'Last page' => 'Ultima pagină',
 	'Refresh' => 'Împrospătează',
 	'Invalid schema.' => 'Schemă incorectă.',
 	'Please use one of the extensions %s.' => 'Folosiți una din următoarele extensii %s.',

adminer/lang/ru.inc.php

@@ -7,15 +7,14 @@ $translations = array(
 	'Username' => 'Имя пользователя',
 	'Password' => 'Пароль',
 	'Select database' => 'Выбрать базу данных',
-	'Invalid database.' => 'Плохая база данных.',
-	'Create new database' => 'Создать новую базу данных',
+	'Invalid database.' => 'Неверная база данных.',
 	'Table has been dropped.' => 'Таблица была удалена.',
 	'Table has been altered.' => 'Таблица была изменена.',
 	'Table has been created.' => 'Таблица была создана.',
 	'Alter table' => 'Изменить таблицу',
 	'Create table' => 'Создать таблицу',
 	'Table name' => 'Название таблицы',
-	'engine' => 'тип',
+	'engine' => 'Тип таблицы',
 	'collation' => 'режим сопоставления',
 	'Column name' => 'Название поля',
 	'Type' => 'Тип',
@@ -30,27 +29,25 @@ $translations = array(
 	'Database has been altered.' => 'База данных была изменена.',
 	'Alter database' => 'Изменить базу данных',
 	'Create database' => 'Создать базу данных',
-	'SQL command' => 'SQL запрос',
-	'Dump' => 'Дамп',
+	'SQL command' => 'SQL-запрос',
 	'Logout' => 'Выйти',
 	'database' => 'база данных',
 	'Use' => 'Выбрать',
 	'No tables.' => 'В базе данных нет таблиц.',
 	'select' => 'выбрать',
-	'Create new table' => 'Создать новую таблицу',
 	'Item has been deleted.' => 'Запись удалена.',
 	'Item has been updated.' => 'Запись обновлена.',
 	'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' => 'Новая запись',
@@ -62,7 +59,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' => 'Таблица',
@@ -70,7 +67,7 @@ $translations = array(
 	'Triggers' => 'Триггеры',
 	'View' => 'Представление',
 	'Unable to select the table' => 'Не удалось получить данные из таблицы',
-	'Invalid CSRF token. Send the form again.' => 'Недействительный CSRF токен. Отправите форму ещё раз.',
+	'Invalid CSRF token. Send the form again.' => 'Недействительный CSRF-токен. Отправите форму ещё раз.',
 	'Comment' => 'Комментарий',
 	'Default values' => 'Значения по умолчанию',
 	'%d byte(s)' => array('%d байт', '%d байта', '%d байтов'),
@@ -81,25 +78,25 @@ $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' => 'Результирующая таблица',
 	'Change' => 'Изменить',
 	'Source' => 'Источник',
 	'Target' => 'Цель',
-	'Add column' => 'Добавить колонку',
+	'Add column' => 'Добавить поле',
 	'Alter' => 'Изменить',
 	'Add foreign key' => 'Добавить внешний ключ',
 	'ON DELETE' => 'При стирании',
 	'ON UPDATE' => 'При обновлении',
 	'Index Type' => 'Тип индекса',
-	'Column (length)' => 'Колонка (длина)',
+	'Column (length)' => 'Поле (длина)',
 	'View has been dropped.' => 'Представление было удалено.',
 	'View has been altered.' => 'Представление было изменено.',
 	'View has been created.' => 'Представление было создано.',
@@ -107,7 +104,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' => 'Схема базы данных',
@@ -120,8 +117,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' => 'Создать триггер',
@@ -133,15 +130,15 @@ $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' => 'Колонка',
+	'Column' => 'поле',
 	'Routine' => 'Процедура',
 	'Grant' => 'Позволить',
 	'Revoke' => 'Запретить',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Слишком большой объем POST-данных. Пошлите меньший объем данных или увеличьте параметр конфигурационной директивы %s.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Слишком большой объем POST-данных. Пошлите меньший объём данных или увеличьте параметр конфигурационной директивы %s.',
 	'Logged as: %s' => 'Вы вошли как: %s',
 	'Move up' => 'Переместить вверх',
 	'Move down' => 'Переместить вниз',
@@ -180,10 +177,11 @@ $translations = array(
 	'Tables have been truncated.' => 'Таблицы были очищены.',
 	'Rows' => 'Строк',
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'Таблицы были перемещены.',
-	'Move to other database' => 'Переместить в другою базу данных',
+	'Move to other database' => 'Переместить в другую базу данных',
 	'Move' => 'Переместить',
-	'Engine' => 'Тип',
+	'Engine' => 'Тип таблиц',
 	'Save and continue edit' => 'Сохранить и продолжить редактирование',
 	'original' => 'исходный',
 	'%d item(s) have been affected.' => array('Была изменена %d запись.', 'Были изменены %d записи.', 'Было изменено %d записей.'),
@@ -197,27 +195,27 @@ $translations = array(
 	'%d row(s) have been imported.' => array('Импортирована %d строка.', 'Импортировано %d строки.', 'Импортировано %d строк.'),
 	'Import' => 'Импорт',
 	'Stop on error' => 'Остановить при ошибке',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Достигнуто максимальное значение количества доступных полей. Увеличьте %s и %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Достигнуто максимальное значение количества доступных полей. Увеличьте %s.',
 	'anywhere' => 'в любом месте',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$5.$3.$1',
 	'[yyyy]-mm-dd' => 'дд.мм.[гггг]',
 	'History' => 'История',
 	'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.' => 'Колонки должны иметь одинаковые типы данных, в результирующей колонке должен быть индекс, данные для импорта должны существовать.',
-	'Relations' => 'Реляции',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Поля должны иметь одинаковые типы данных, в результирующем поле должен быть индекс, данные для импорта должны существовать.',
+	'Relations' => 'Отношения',
 	'Run file' => 'Запустить файл',
 	'Clear' => 'Очистить',
-	'Maximum allowed file size is %sB.' => 'Максимальный разрешенный размер файла - %sB.',
-	'Numbers' => 'Число',
+	'Maximum allowed file size is %sB.' => 'Максимальный разрешённый размер файла — %sB.',
+	'Numbers' => 'Числа',
 	'Date and time' => 'Дата и время',
 	'Strings' => 'Строки',
 	'Binary' => 'Двоичный тип',
 	'Lists' => 'Списки',
 	'Editor' => 'Редактор',
-	'E-mail' => 'Электропочта',
+	'E-mail' => 'Эл. почта',
 	'From' => 'От',
-	'Subject' => 'Кому',
+	'Subject' => 'Тема',
 	'Send' => 'Послать',
 	'%d e-mail(s) have been sent.' => array('Было отправлено %d письмо.', 'Было отправлено %d письма.', 'Было отправлено %d писем.'),
 	'Webserver file %s' => 'Файл %s на вебсервере',
@@ -226,7 +224,6 @@ $translations = array(
 	'Permanent login' => 'Оставаться в системе',
 	'Databases have been dropped.' => 'Базы данных удалены.',
 	'Search data in tables' => 'Поиск в таблицах',
-	'schema' => 'схема',
 	'Schema' => 'Схема',
 	'Alter schema' => 'Изменить схему',
 	'Create schema' => 'Новая схема',
@@ -244,7 +241,7 @@ $translations = array(
 	'Alter type' => 'Изменить тип',
 	'Type has been dropped.' => 'Тип удален.',
 	'Type has been created.' => 'Создан новый тип.',
-	'Double click on a value to modify it.' => 'Кликни два раза по значению, чтобы его изменить.',
+	'Ctrl+click on a value to modify it.' => 'Выполните Ctrl+Щелчок мышью по значению, чтобы его изменить.',
 	'Use edit link to modify this value.' => 'Изменить это значение можно с помощью ссылки «изменить».',
 	'last' => 'последняя',
 	'From server' => 'С сервера',
@@ -255,10 +252,9 @@ $translations = array(
 	'Network' => 'Сеть',
 	'Geometry' => 'Геометрия',
 	'File exists.' => 'Файл уже существует.',
-	'Attachments' => 'Прикрепленные файлы',
+	'Attachments' => 'Прикреплённые файлы',
 	'%d query(s) executed OK.' => array('%d запрос выполнен успешно.', '%d запроса выполнено успешно.', '%d запросов выполнено успешно.'),
 	'Show only errors' => 'Только ошибки',
-	'Last page' => 'Последняя страница',
 	'Refresh' => 'Обновить',
 	'Invalid schema.' => 'Неправильная схема.',
 	'Please use one of the extensions %s.' => 'Используйте одно из этих расширений %s.',
@@ -269,4 +265,32 @@ $translations = array(
 	'Permanent link' => 'Постоянная ссылка',
 	'Edit all' => 'Редактировать всё',
 	'HH:MM:SS' => 'ЧЧ:ММ:СС',
+	'Tables have been optimized.' => 'Таблицы оптимизированы.',
+	'Materialized view' => 'Материализованное представление',
+	'Vacuum' => 'Вакуум',
+	'Selected' => 'Выбранные',
+	'Replication' => 'Репликация',
+	'Master status' => 'состояние мастер-сервера',
+	'Slave status' => 'состояние ведомого сервера',
+	'File must be in UTF-8 encoding.' => 'Файл должен быть в кодировке UTF-8.',
+	'Modify' => 'Изменить',
+	'Loading' => 'Загрузка',
+	'Load more data' => 'Загрузить ещё данные',
+	'ATTACH queries are not supported.' => 'ATTACH-запросы не поддерживаются.',
+	'%d / ' => '%d / ',
+	'Limit rows' => 'Лимит строк',
+	'<a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to use SQLite.' => '<a href="https://www.adminer.org/en/extension/" target="_blank">Реализуйте</a> метод %s, чтобы использовать SQLite.',
+	'Default value' => 'Значение по умолчанию',
+	'Full table scan' => 'Анализ полной таблицы',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Слишком много неудачных попыток входа. Попробуйте снова через %d минуту.', 'Слишком много неудачных попыток входа. Попробуйте снова через %d минуты.', 'Слишком много неудачных попыток входа. Попробуйте снова через %d минут.'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to make it permanent.' => 'Мастер-пароль истёк. <a href="https://www.adminer.org/en/extension/" target="_blank">Реализуйте</a> метод %s, чтобы сделать его постоянным.',
+	'If you did not send this request from Adminer then close this page.' => 'Если вы не посылали этот запрос из Adminer, закройте эту страницу.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Вы можете закачать большой SQL-файл по FTP и затем импортировать его с сервера.',
+	'Size' => 'Размер',
+	'Compute' => 'Вычислить',
+	'You are offline.' => 'Вы не выполнили вход.',
+	'You have no privileges to update this table.' => 'У вас нет прав на обновление этой таблицы.',
+	'Saving' => 'Сохранение',
+	'yes' => 'Да',
+	'no' => 'Нет',
 );

adminer/lang/sk.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'Heslo',
 	'Select database' => 'Vybrať databázu',
 	'Invalid database.' => 'Nesprávna databáza.',
-	'Create new database' => 'Vytvoriť novú databázu',
 	'Table has been dropped.' => 'Tabuľka bola odstránená.',
 	'Table has been altered.' => 'Tabuľka bola zmenená.',
 	'Table has been created.' => 'Tabuľka bola vytvorená.',
@@ -32,13 +31,11 @@ $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ť',
 	'No tables.' => 'Žiadne tabuľky.',
 	'select' => 'vypísať',
-	'Create new table' => 'Vytvoriť novú tabuľku',
 	'Item has been deleted.' => 'Položka bola vymazaná.',
 	'Item has been updated.' => 'Položka bola aktualizovaná.',
 	'Item%s has been inserted.' => 'Položka%s bola vložená.',
@@ -181,6 +178,7 @@ $translations = array(
 	'Data Free' => 'Voľné miesto',
 	'Rows' => 'Riadky',
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Analyze' => 'Analyzovať',
 	'Optimize' => 'Optimalizovať',
 	'Check' => 'Skontrolovať',
@@ -198,7 +196,7 @@ $translations = array(
 	'%d row(s) have been imported.' => array('Bol importovaný %d záznam.', 'Boli importované %d záznamy.', 'Bolo importovaných %d záznamov.'),
 	'Import' => 'Import',
 	'Stop on error' => 'Zastaviť pri chybe',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Bol prekročený maximálny počet povolených polí. Zvýšte prosím %s a %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Bol prekročený maximálny počet povolených polí. Zvýšte prosím %s.',
 	'anywhere' => 'kdekoľvek',
 	'%.3f s' => '%.3f s',
 	'$1-$3-$5' => '$6.$4.$1',
@@ -231,7 +229,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',
@@ -244,7 +241,7 @@ $translations = array(
 	'Type has been dropped.' => 'Typ bol odstránený.',
 	'Type has been created.' => 'Typ bol vytvorený.',
 	'Alter type' => 'Pozmeniť typ',
-	'Double click on a value to modify it.' => 'Dvojkliknite na políčko, ktoré chcete zmeniť.',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+kliknite na políčko, ktoré chcete zmeniť.',
 	'Use edit link to modify this value.' => 'Pre zmenu tejto hodnoty použite odkaz upraviť.',
 	'last' => 'posledný',
 	'From server' => 'Zo serveru',
@@ -258,7 +255,6 @@ $translations = array(
 	'Attachments' => 'Prílohy',
 	'%d query(s) executed OK.' => array('Bol vykonaný %d dotaz.', 'Boli vykonané %d dotazy.', 'Bolo vykonaných %d dotazov.'),
 	'Show only errors' => 'Zobraziť iba chyby',
-	'Last page' => 'Posledná stránka',
 	'Refresh' => 'Obnoviť',
 	'Invalid schema.' => 'Neplatné schéma.',
 	'Please use one of the extensions %s.' => 'Prosím vyberte jednu z koncoviek %s.',

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',
@@ -77,7 +76,6 @@ $translations = array(
 	'Use' => 'Uporabi',
 	'Select database' => 'Izberi bazo',
 	'Invalid database.' => 'Neveljavna baza.',
-	'Create new database' => 'Ustvari novo bazo',
 	'Database has been dropped.' => 'Baza je zavržena.',
 	'Databases have been dropped.' => 'Baze so zavržene.',
 	'Database has been created.' => 'Baza je ustvarjena.',
@@ -89,6 +87,7 @@ $translations = array(
 	
 	// thousands separator - must contain single byte
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Engine' => 'Pogon',
 	'Collation' => 'Zbiranje',
 	'Data Length' => 'Velikost podatkov',
@@ -140,7 +139,6 @@ $translations = array(
 	'No tables.' => 'Ni tabel.',
 	'Alter table' => 'Spremeni tabelo',
 	'Create table' => 'Ustvari tabelo',
-	'Create new table' => 'Ustvari novo tabelo',
 	'Table has been dropped.' => 'Tabela je zavržena.',
 	'Tables have been dropped.' => 'Tabele so zavržene.',
 	'Table has been altered.' => 'Tabela je spremenjena.',
@@ -161,7 +159,7 @@ $translations = array(
 	'Move up' => 'Premakni gor',
 	'Move down' => 'Premakni dol',
 	'Remove' => 'Odstrani',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Največje število dovoljenih polje je preseženo. Prosimo, povečajte %s in %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Največje število dovoljenih polje je preseženo. Prosimo, povečajte %s.',
 	
 	'Partition by' => 'Porazdeli po',
 	'Partitions' => 'Porazdelitve',
@@ -227,7 +225,6 @@ $translations = array(
 	'%d row(s)' => array('%d vrstica', '%d vrstici', '%d vrstice', '%d vrstic'),
 	'Page' => 'Stran',
 	'last' => 'Zadnja',
-	'Last page' => 'Zadnja stran',
 	'whole result' => 'cel razultat',
 	'%d byte(s)' => array('%d bajt', '%d bajta', '%d bajti', '%d bajtov'),
 	
@@ -235,7 +232,7 @@ $translations = array(
 	'%d row(s) have been imported.' => array('Uvožena je %d vrstica.', 'Uvoženi sta %d vrstici.', 'Uvožene so %d vrstice.', 'Uvoženih je %d vrstic.'),
 	
 	// in-place editing in select
-	'Double click on a value to modify it.' => 'Dvojni klik na vrednost za urejanje.',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+klik na vrednost za urejanje.',
 	'Use edit link to modify this value.' => 'Uporabite urejanje povezave za spreminjanje te vrednosti.',
 	
 	// %s can contain auto-increment value
@@ -290,7 +287,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' => 'сачувај',
@@ -78,7 +77,6 @@ $translations = array(
 	'Use' => 'Користи',
 	'Select database' => 'Изаберите базу',
 	'Invalid database.' => 'Неисправна база података.',
-	'Create new database' => 'Направи нову базу података',
 	'Database has been dropped.' => 'База података је избрисана.',
 	'Databases have been dropped.' => 'Базњ података су избрисане.',
 	'Database has been created.' => 'База података је креирана.',
@@ -93,6 +91,7 @@ $translations = array(
 
 	// thousands separator - must contain single byte
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Engine' => 'Механизам',
 	'Collation' => 'Сравњивање',
 	'Data Length' => 'Дужина података',
@@ -144,7 +143,6 @@ $translations = array(
 	'No tables.' => 'Без табела.',
 	'Alter table' => 'Уреди табелу',
 	'Create table' => 'Направи табелу',
-	'Create new table' => 'направи нову табелу',
 	'Table has been dropped.' => 'Табела је избрисана.',
 	'Tables have been dropped.' => 'Табеле су избрисане.',
 	'Tables have been optimized.' => 'Табеле су оптимизоване.',
@@ -166,7 +164,7 @@ $translations = array(
 	'Move up' => 'Помери на горе',
 	'Move down' => 'Помери на доле',
 	'Remove' => 'Уклони',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Премашен је максимални број дозвољених поља. Молим увећајте %s и %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Премашен је максимални број дозвољених поља. Молим увећајте %s.',
 
 	'Partition by' => 'Подели по',
 	'Partitions' => 'Поделе',
@@ -233,7 +231,6 @@ $translations = array(
 	'%d row(s)' => array('%d ред', '%d реда', '%d редова'),
 	'Page' => 'Страна',
 	'last' => 'последња',
-	'Last page' => 'Последња страна',
 	'Loading'  => 'Учитавам',
 	'Load more data'  => 'Учитавам још података',
 	'whole result' => 'цео резултат',
@@ -243,7 +240,7 @@ $translations = array(
 	'%d row(s) have been imported.' => array('%d ред је увежен.', '%d реда су увежена.', '%d редова је увежено.'),
 
 	// in-place editing in select
-	'Double click on a value to modify it.' => 'Дупли клик на вредност за измену.',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+клик на вредност за измену.',
 	'Use edit link to modify this value.' => 'Користи везу за измену ове вредности.',
 
 	// %s can contain auto-increment value
@@ -302,7 +299,6 @@ $translations = array(
 	'Schema has been dropped.' => 'Шема је избрисана.',
 	'Schema has been created.' => 'Шема је креирана.',
 	'Schema has been altered.' => 'Шема је измењена.',
-	'schema' => 'шема',
 	'Schema' => 'Шема',
 	'Invalid schema.' => 'Шема није исправна.',
 

adminer/lang/ta.inc.php

@@ -8,7 +8,6 @@ $translations = array(
 	'Password' => 'க‌ட‌வுச்சொல்',
 	'Select database' => 'த‌க‌வ‌ல்த‌ள‌த்தை தேர்வு செய்',
 	'Invalid database.' => 'த‌க‌வ‌ல்த‌ள‌ம் ச‌ரியானதல்ல‌.',
-	'Create new database' => 'புதிய‌ த‌க‌வ‌ல்த‌ள‌த்தை உருவாக்கு',
 	'Table has been dropped.' => 'அட்ட‌வ‌ணை நீக்க‌ப்ப‌ட்ட‌து.',
 	'Table has been altered.' => 'அட்ட‌வணை மாற்ற‌ப்ப‌ட்ட‌து.',
 	'Table has been created.' => 'அட்ட‌வ‌ணை உருவாக்க‌ப்ப‌ட்ட‌து.',
@@ -31,13 +30,11 @@ $translations = array(
 	'Alter database' => 'த‌க‌வ‌ல்த‌ள‌த்தை மாற்று',
 	'Create database' => 'த‌க‌வ‌ல்த‌ள‌த்தை உருவாக்கு',
 	'SQL command' => 'SQL க‌ட்ட‌ளை',
-	'Dump' => 'Dump',
 	'Logout' => 'வெளியேறு',
 	'database' => 'த‌க‌வ‌ல்த‌ள‌ம்',
 	'Use' => 'உப‌யோகி',
 	'No tables.' => 'அட்ட‌வ‌ணை இல்லை.',
 	'select' => 'தேர்வு செய்',
-	'Create new table' => 'புதிய‌ அட்ட‌வ‌ணையை உருவாக்கு',
 	'Item has been deleted.' => 'உருப்படி நீக்க‌ப்ப‌ட்ட‌து.',
 	'Item has been updated.' => 'உருப்ப‌டி புதுப்பிக்க‌ப்ப‌ட்ட‌து.',
 	'Edit' => 'தொகு',
@@ -177,6 +174,7 @@ $translations = array(
 	'Tables have been truncated.' => 'அட்ட‌வ‌ணை குறைக்க‌ப்ப‌ட்ட‌து (truncated).',
 	'Rows' => 'வ‌ரிசைக‌ள்',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Tables have been moved.' => 'அட்ட‌வ‌ணை ந‌க‌ர்த்த‌ப்ப‌ட்ட‌து.',
 	'Move to other database' => 'ம‌ற்ற‌ த‌க‌வ‌ல் தள‌த்திற்க்கு ந‌க‌ர்த்து',
 	'Move' => 'ந‌க‌ர்த்து',
@@ -187,7 +185,7 @@ $translations = array(
 	'%d item(s) have been affected.' => array('%d உருப்ப‌டி மாற்ற‌ம‌டைந்தது.', '%d உருப்ப‌டிக‌ள் மாற்ற‌ம‌டைந்த‌ன‌.'),
 	'whole result' => 'முழுமையான‌ முடிவு',
 	'Clone' => 'ந‌க‌லி (Clone)',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'அனும‌திக்க‌ப்ப‌ட்ட‌ அதிக‌ப‌ட்ச‌ கோப்புக‌ளின் எண்ணிக்கை மீற‌ப்ப‌ட்ட‌து. த‌ய‌வு செய்து %s ம‌ற்றும் %s யை அதிக‌ரிக்க‌வும்.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'அனும‌திக்க‌ப்ப‌ட்ட‌ அதிக‌ப‌ட்ச‌ கோப்புக‌ளின் எண்ணிக்கை மீற‌ப்ப‌ட்ட‌து. த‌ய‌வு செய்து %s ம‌ற்றும் %s யை அதிக‌ரிக்க‌வும்.',
 	'Partition by' => 'பிரித்த‌து',
 	'Partitions' => 'பிரிவுக‌ள்',
 	'Partition name' => 'பிரிவின் பெய‌ர்',
@@ -234,7 +232,6 @@ $translations = array(
 	'Schema has been dropped.' => 'அமைப்புமுறை நீக்க‌ப்ப‌ட்ட‌து.',
 	'Schema has been created.' => 'அமைப்புமுறை உருவாக்க‌ப்ப‌ட்ட‌து.',
 	'Schema has been altered.' => 'அமைப்புமுறை மாற்ற‌ப்ப‌ட்ட‌து.',
-	'Double click on a value to modify it.' => 'ம‌திப்பினை மாற்ற அத‌ன் மீது இருமுறை சொடுக்க‌வும் (Double click).',
 	'Use edit link to modify this value.' => 'இந்த‌ ம‌திப்பினை மாற்ற‌, தொகுப்பு இணைப்பினை உப‌யோகிக்க‌வும்.',
 	'last' => 'க‌டைசி',
 	'Sequence has been dropped.' => 'வ‌ரிசைமுறை நீக்க‌ப்ப‌ட்ட‌து.',
@@ -248,7 +245,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',
@@ -259,7 +255,6 @@ $translations = array(
 	'now' => 'இப்பொழுது',
 	'%d query(s) executed OK.' => array('%d வின‌வ‌ல் செய‌ல்ப‌டுத்த‌ப்ப‌ட்ட‌து.', '%d வின‌வ‌ல்க‌ள் செய‌ல்ப‌டுத்த‌ப்ப‌ட்ட‌ன‌.'),
 	'Show only errors' => 'பிழைக‌ளை ம‌ட்டும் காண்பிக்க‌வும்',
-	'Last page' => 'க‌டைசி ப‌க்க‌ம்',
 	'Refresh' => 'புதுப்பி (Refresh)',
 	'Invalid schema.' => 'அமைப்புமுறை ச‌ரியான‌த‌ல்ல‌ (Invalid Schema).',
 	'Please use one of the extensions %s.' => 'த‌ய‌வு செய்து ஒரு விரிவினை %s (extension) உப‌யோகிக்க‌வும்.',

adminer/lang/th.inc.php

@@ -0,0 +1,268 @@
+<?php
+$translations = array(
+	'Login' => 'เข้าสู่ระบบ',
+	'Logout successful.' => 'ออกจากระบบเรียบร้อยแล้ว.',
+	'Invalid credentials.' => 'ข้อมูลไม่ถูกต้อง.',
+	'Server' => 'เซอเวอร์',
+	'Username' => 'ชื่อผู้ใช้งาน',
+	'Password' => 'รหัสผ่าน',
+	'Select database' => 'เลือกฐานข้อมูล',
+	'Invalid database.' => 'ฐานข้อมูลไม่ถูกต้อง.',
+	'Table has been dropped.' => 'ลบตารางแล้ว.',
+	'Table has been altered.' => 'แก้ไขตารางแล้ว.',
+	'Table has been created.' => 'สร้างตารางใหม่แล้ว.',
+	'Alter table' => 'เปลี่ยนแปลงตารางแล้ว',
+	'Create table' => 'สร้างตารางใหม่',
+	'Table name' => 'ชื่อตาราง',
+	'engine' => 'ชนิดของฐานข้อมูล',
+	'collation' => 'การตรวจทาน',
+	'Column name' => 'ชื่อคอลัมน์',
+	'Type' => 'ชนิด',
+	'Length' => 'ความยาว',
+	'Auto Increment' => 'เพิ่มลำดับโดยอัตโนมัติ',
+	'Options' => 'ตัวเลือก',
+	'Save' => 'บันทึก',
+	'Drop' => 'ลบ',
+	'Database has been dropped.' => 'ฐานข้อมูลถูกลบแล้ว.',
+	'Database has been created.' => 'สร้างฐานข้อมูลใหม่แล้ว.',
+	'Database has been renamed.' => 'เปลี่ยนชื่อฐานข้อมูลแล้ว.',
+	'Database has been altered.' => 'เปลี่ยนแปลงฐานข้อมูลแล้ว.',
+	'Alter database' => 'เปลี่ยนแปลงฐานข้อมูล',
+	'Create database' => 'สร้างฐานข้อมูล',
+	'SQL command' => 'คำสั่ง SQL',
+	'Logout' => 'ออกจากระบบ',
+	'database' => 'ฐานข้อมูล',
+	'Use' => 'ใช้งาน',
+	'No tables.' => 'ไม่พบตาราง.',
+	'select' => 'เลือก',
+	'Item has been deleted.' => 'รายการถูกลบแล้ว.',
+	'Item has been updated.' => 'ปรับปรุงรายการแล้ว.',
+	'Item%s has been inserted.' => 'มี%s รายการ ถูกเพิ่มแล้ว.',
+	'Edit' => 'แก้ไข',
+	'Insert' => 'เพิ่ม',
+	'Save and insert next' => 'บันทึกแล้วเพิ่มรายการถัดไป',
+	'Delete' => 'ลบ',
+	'Database' => 'ฐานข้อมูล',
+	'Routines' => 'รูทีน',
+	'Indexes have been altered.' => 'เปลี่ยนแปลงดัชนีแล้ว.',
+	'Indexes' => 'ดัชนี',
+	'Alter indexes' => 'เปลี่ยนแปลงดัชนี',
+	'Add next' => 'เพิ่มรายการถัดไป',
+	'Language' => 'ภาษา',
+	'Select' => 'เลือก',
+	'New item' => 'รายการใหม่',
+	'Search' => 'ค้นหา',
+	'Sort' => 'เรียงลำดับ',
+	'descending' => 'มากไปน้อย',
+	'Limit' => 'จำกัด',
+	'No rows.' => 'ไม่มีแถวของตาราง.',
+	'Action' => 'ดำเนินการ',
+	'edit' => 'แก้ไข',
+	'Page' => 'หน้า',
+	'Query executed OK, %d row(s) affected.' => 'ประมวลผลคำสั่งแล้ว มี %d ถูกดำเนินการ.',
+	'Error in query' => 'คำสั่งไม่ถูกต้อง',
+	'Execute' => 'ประมวลผล',
+	'Table' => 'ตาราง',
+	'Foreign keys' => 'คีย์คู่แข่ง',
+	'Triggers' => 'ทริกเกอร์',
+	'View' => 'วิว',
+	'Unable to select the table' => 'ไม่สามารถเลือกตารางได้',
+	'Invalid CSRF token. Send the form again.' => 'เครื่องหมาย CSRF ไม่ถูกต้อง ส่งข้อมูลใหม่อีกครั้ง.',
+	'Comment' => 'หมายเหตุ',
+	'Default values' => 'ค่าเริ่มต้น',
+	'%d byte(s)' => '%d ไบท์',
+	'No commands to execute.' => 'ไม่มีคำสั่งที่จะประมวลผล.',
+	'Unable to upload a file.' => 'ไม่สามารถอัปโหลดไฟล์ได้.',
+	'File upload' => 'อัปโหลดไฟล์',
+	'File uploads are disabled.' => 'การอัปโหลดไฟล์ถูกปิดการใช้งาน.',
+	'Routine has been called, %d row(s) affected.' => 'รูทีนถูกเรียกใช้งาน มี %d แถวถูกดำเนินการ.',
+	'Call' => 'เรียกใช้งาน',
+	'No extension' => 'ไม่พบส่วนเสริม',
+	'None of the supported PHP extensions (%s) are available.' => 'ไม่มีส่วนเสริมของ PHP (%s) ที่สามารถใช้งานได้.',
+	'Session support must be enabled.' => 'ต้องเปิดใช้งาน Session.',
+	'Session expired, please login again.' => 'Session หมดอายุแล้ว กรุณาเข้าสู่ระบบใหม่อีกครั้ง.',
+	'Text length' => 'ความยาวของอักษร',
+	'Foreign key has been dropped.' => 'คีย์คู่แข่งถูกลบแล้ว.',
+	'Foreign key has been altered.' => 'คีย์คู่แข่งถูกเปลี่ยนแปลงแล้ว.',
+	'Foreign key has been created.' => 'คีย์คู่แข่งถูกสร้างแล้ว.',
+	'Foreign key' => 'คีย์คู่แข่ง',
+	'Target table' => 'คารางเป้าหมาย',
+	'Change' => 'แก้ไข',
+	'Source' => 'แหล่งข้อมูล',
+	'Target' => 'เป้าหมาย',
+	'Add column' => 'เพิ่มคอลัมน์',
+	'Alter' => 'เปลี่ยนแปลง',
+	'Add foreign key' => 'เพิ่มคีย์คู่แข่ง',
+	'ON DELETE' => 'ON DELETE',
+	'ON UPDATE' => 'ON UPDATE',
+	'Index Type' => 'ชนิดของดัชนี',
+	'Column (length)' => 'คอลัมน์ (ความยาว)',
+	'View has been dropped.' => 'วิวถูกลบแล้ว.',
+	'View has been altered.' => 'วิวถูกเปลี่ยนแปลงแล้ว.',
+	'View has been created.' => 'วิวถูกสร้างแล้ว.',
+	'Alter view' => 'เปลี่ยนแปลงวิว',
+	'Create view' => 'เพิ่มวิว',
+	'Name' => 'ชื่อ',
+	'Process list' => 'รายการของกระบวนการ',
+	'%d process(es) have been killed.' => 'มี %d กระบวนการถูกทำลายแล้ว.',
+	'Kill' => 'ทำลาย',
+	'Parameter name' => 'ชื่อพารามิเตอร์',
+	'Database schema' => 'Schema ของฐานข้อมูล',
+	'Create procedure' => 'สร้าง procedure',
+	'Create function' => 'สร้าง Function',
+	'Routine has been dropped.' => 'Routine ถูกลบแล้ว.',
+	'Routine has been altered.' => 'Routine ถูกเปลี่ยนแปลงแล้ว.',
+	'Routine has been created.' => 'Routine ถูกสร้างแล้ว.',
+	'Alter function' => 'เปลี่ยนแปลง Function',
+	'Alter procedure' => 'เปลี่ยนแปลง procedure',
+	'Return type' => 'ประเภทของค่าที่คืนกลับ',
+	'Add trigger' => 'เพิ่ม trigger',
+	'Trigger has been dropped.' => 'Trigger ถูกลบแล้ว.',
+	'Trigger has been altered.' => 'Trigger ถูกเปลี่ยนแปลงแล้ว.',
+	'Trigger has been created.' => 'Trigger ถูกสร้างแล้ว.',
+	'Alter trigger' => 'เปลี่ยนแปลง Trigger',
+	'Create trigger' => 'สร้าง Trigger',
+	'Time' => 'เวลา',
+	'Event' => 'เหตุการณ์',
+	'%s version: %s through PHP extension %s' => '%s รุ่น: %s ผ่านส่วนขยาย PHP %s',
+	'%d row(s)' => '%d แถว',
+	'Remove' => 'ลบ',
+	'Are you sure?' => 'คุณแน่ใจแล้วหรือ',
+	'Privileges' => 'สิทธิ์',
+	'Create user' => 'สร้างผู้ใช้งาน',
+	'User has been dropped.' => 'ลบผู้ใช้งานแล้ว.',
+	'User has been altered.' => 'เปลี่ยนแปลงผู้ใช้งานแล้ว.',
+	'User has been created.' => 'สร้างผู้ใช้งานแล้ว.',
+	'Hashed' => 'Hash',
+	'Column' => 'คอลัมน์',
+	'Routine' => 'รูทีน',
+	'Grant' => 'การอนุญาต',
+	'Revoke' => 'ยกเลิก',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'ข้อมูลที่ส่งเข้ามีขนาดใหญ่เกิน คุณสามารถ เพิ่ม-ลดขนาดได้ที่ %s คำสั่งการตั้งค่า.',
+	'Logged as: %s' => 'สวัสดีคุณ: %s',
+	'Move up' => 'ย้ายไปข้างบน',
+	'Move down' => 'ย้ายลงล่าง',
+	'Functions' => 'ฟังก์ชั่น',
+	'Aggregation' => 'รวบรวม',
+	'Export' => 'ส่งออก',
+	'Output' => 'ข้อมูลที่ส่งออก',
+	'open' => 'เปิด',
+	'save' => 'บันทึก',
+	'Format' => 'รูปแบบ',
+	'Tables' => 'ตาราง',
+	'Data' => 'ข้อมูล',
+	'Event has been dropped.' => 'เหตุการณ์ถูกลบแล้ว.',
+	'Event has been altered.' => 'เหตุการณ์ถูกเปลี่ยนแปลงแล้ว.',
+	'Event has been created.' => 'เหตุการณ์ถูกสร้างแล้ว.',
+	'Alter event' => 'เปลี่ยนแปลงเหตุการณ์',
+	'Create event' => 'สร้างเหตุการณ์',
+	'At given time' => 'ในเวลาที่กำหนด',
+	'Every' => 'ทุกๆ',
+	'Events' => 'เหตุการณ์',
+	'Schedule' => 'กำหนดการณ์',
+	'Start' => 'เริ่มต้น',
+	'End' => 'สิ้นสุด',
+	'Status' => 'สถานะ',
+	'On completion preserve' => 'เมื่อเสร็จสิ้นการสงวน',
+	'Tables and views' => 'ตารางและวิว',
+	'Data Length' => 'ความยาวของข้อมูล',
+	'Index Length' => 'ความยาวของดัชนี',
+	'Data Free' => 'พื้นที่ว่าง',
+	'Collation' => 'การตรวจทาน',
+	'Analyze' => 'วิเคราะห์',
+	'Optimize' => 'เพิ่มประสิทธิภาพ',
+	'Check' => 'ตรวจสอบ',
+	'Repair' => 'ซ่อมแซม',
+	'Truncate' => 'ตัดทิ้ง',
+	'Tables have been truncated.' => 'เคลียร์ตารางแล้ว (truncate).',
+	'Rows' => 'แถว',
+	',' => ' ',
+	'0123456789' => '0123456789',
+	'Tables have been moved.' => 'ตารางถูกย้ายแล้ว.',
+	'Move to other database' => 'ย้ายไปยังฐานข้อมูลอื่น',
+	'Move' => 'ย้าย',
+	'Engine' => 'ชนิดของฐานข้อมูล',
+	'Save and continue edit' => 'บันทึกและแก้ไขข้อมูลอื่นๆต่อ',
+	'original' => 'ต้นฉบับ',
+	'Tables have been dropped.' => 'ตารางถูกลบแล้ว.',
+	'%d item(s) have been affected.' => 'มี %d รายการถูกดำเนินการแล้ว.',
+	'whole result' => 'รวมผล',
+	'Clone' => 'ทำซ้ำ',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'จำนวนสูงสุดของฟิลด์อนุญาตให้เกิน กรุณาเพิ่มอีก %s.',
+	'Partition by' => 'พาร์ทิชันโดย',
+	'Partitions' => 'พาร์ทิชัน',
+	'Partition name' => 'ชื่อของพาร์ทิชัน',
+	'Values' => 'ค่า',
+	'%d row(s) have been imported.' => '%d แถวถูกนำเข้าแล้ว.',
+	'anywhere' => 'ทุกแห่ง',
+	'Import' => 'นำเข้า',
+	'Stop on error' => 'หยุดการทำงานเมื่อเออเรอ',
+	'%.3f s' => '%.3f วินาที',
+	'$1-$3-$5' => '$5/$3/$1',
+	'[yyyy]-mm-dd' => 'วันที่/เดือน/[ปี]',
+	'History' => 'ประวัติ',
+	'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.' => 'แหล่งที่มาและเป้าหมายของคอลมัน์ต้องมีชนิดข้อมูลเดียวกัน คือต้องมีดัชนีและข้อมูลอ้างอิงของคอลัมน์เป้าหมาย.',
+	'Relations' => 'ความสำพันธ์',
+	'Run file' => 'ทำงานจากไฟล์',
+	'Clear' => 'เคลียร์',
+	'Maximum allowed file size is %sB.' => 'ขนาดไฟล์สูงสุดที่อนุญาตให้ใช้งานคือ %sB.',
+	'Numbers' => 'ตัวเลข',
+	'Date and time' => 'วันและเวลา',
+	'Strings' => 'ตัวอักษร',
+	'Binary' => 'เลขฐานสอง',
+	'Lists' => 'รายการ',
+	'Editor' => 'ผู้แก้ไข',
+	'E-mail' => 'อีเมล์',
+	'From' => 'จาก',
+	'Subject' => 'หัวข้อ',
+	'Send' => 'ส่ง',
+	'%d e-mail(s) have been sent.' => 'มี %d อีเมล์ ถูกส่งออกแล้ว.',
+	'Webserver file %s' => 'Webserver file %s',
+	'File does not exist.' => 'ไม่มีไฟล์.',
+	'%d in total' => '%d ของทั้งหมด',
+	'Permanent login' => 'จดจำการเข้าสู่ระบบตลอดไป',
+	'Databases have been dropped.' => 'ฐานข้อมูลถูกลบแล้ว.',
+	'Search data in tables' => 'ค้นหาในตาราง',
+	'Schema' => 'Schema',
+	'Alter schema' => 'เปลี่ยนแปลง schema',
+	'Create schema' => 'สร้าง schema',
+	'Schema has been dropped.' => 'Schema ถูกลบแล้ว.',
+	'Schema has been created.' => 'Schema ถูกสร้างแล้ว.',
+	'Schema has been altered.' => 'Schema ถูกเปลี่ยนแปลงแล้ว.',
+	'Sequences' => 'Sequences',
+	'Create sequence' => 'Sequence ถูกสร้างแล้ว',
+	'Alter sequence' => 'Sequence ถูกเปลี่ยนแปลงแล้ว',
+	'Sequence has been dropped.' => 'Sequence ถูกลบแล้ว.',
+	'Sequence has been created.' => 'Sequence ถูกสร้างแล้ว.',
+	'Sequence has been altered.' => 'Sequence ถูกเปลี่ยนแปลงแล้ว.',
+	'User types' => 'ประเภทผู้ใช้งาน',
+	'Create type' => 'สร้างประเภทผู้ใช้งาน',
+	'Alter type' => 'แก้ไขประเภท',
+	'Type has been dropped.' => 'ประเภทถูกลบแล้ว.',
+	'Type has been created.' => 'ประเภทถูกสร้างแล้ว.',
+	'Ctrl+click on a value to modify it.' => 'กด Ctrl+click เพื่อแก้ไขค่า.',
+	'Use edit link to modify this value.' => 'ใช้ลิงค์ แก้ไข เพื่อปรับเปลี่ยนค่านี้.',
+	'last' => 'ล่าสุด',
+	'From server' => 'จากเซเวอร์',
+	'System' => 'ระบบ',
+	'Select data' => 'เลือกข้อมูล',
+	'Show structure' => 'แสดงโครงสร้าง',
+	'empty' => 'ว่างเปล่า',
+	'Network' => 'เครื่องข่าย',
+	'Geometry' => 'เรขาคณิต',
+	'File exists.' => 'มีไฟล์นี้อยู่แล้ว.',
+	'Attachments' => 'ไฟล์แนบ',
+	'%d query(s) executed OK.' => '%d คำสั่งถูกดำเนินการแล้ว.',
+	'Show only errors' => 'แสดงเฉพาะเออเรอ',
+	'Refresh' => 'โหลดใหม่',
+	'Invalid schema.' => 'schema ไม่ถูกต้อง.',
+	'Please use one of the extensions %s.' => 'กรุณาใช้ส่วนเสริมอย่างน้อย 1 ส่วนเสริมจากทั้งหมด %s.',
+	'now' => 'ตอนนี้',
+	'ltr' => 'ltr',
+	'Tables have been copied.' => 'ทำซ้ำตารางฐานข้อมูลแล้ว.',
+	'Copy' => 'ทำซ้ำ',
+	'Permanent link' => 'ลิงค์ถาวร',
+	'Edit all' => 'แก้ไขทั้งหมด',
+	'HH:MM:SS' => 'HH:MM:SS',
+);

adminer/lang/tr.inc.php

@@ -5,146 +5,149 @@ $translations = array(
 	'Server' => 'Sunucu',
 	'Username' => 'Kullanıcı',
 	'Password' => 'Parola',
-	'Permanent login' => 'Kalıcı giriş',
+	'Permanent login' => 'Beni hatırla',
 	'Login' => 'Giriş',
 	'Logout' => 'Çıkış',
 	'Logged as: %s' => '%s olarak giriş yapıldı.',
-	'Logout successful.' => 'Başarıyla çıkıldı.',
+	'Logout successful.' => 'Başarıyla çıkış yapıldı.',
 	'Invalid credentials.' => 'Geçersiz kimlik.',
 	'Language' => 'Dil',
-	'Invalid CSRF token. Send the form again.' => 'Geçersiz Cross-site request forgery (CSRF) jetonu. Forumu tekrar yolla.',
+	'Invalid CSRF token. Send the form again.' => 'Geçersiz (CSRF) jetonu. Formu tekrar yolla.',
 	'No extension' => 'Uzantı yok',
-	'None of the supported PHP extensions (%s) are available.' => 'Desteklenen PHP uzantılarından (%s) hiçbiri mevcut değil.',
+	'None of the supported PHP extensions (%s) are available.' => 'Desteklenen PHP eklentilerinden (%s) hiçbiri mevcut değil.',
 	'Session support must be enabled.' => 'Oturum desteği etkin olmalıdır.',
 	'Session expired, please login again.' => 'Oturum süresi doldu, lütfen tekrar giriş yapın.',
-	'%s version: %s through PHP extension %s' => '%s sürüm: %s PHP uzantısı ile %s',
+	'%s version: %s through PHP extension %s' => '%s sürüm: %s, %s PHP eklentisi ile',
 	'Refresh' => 'Tazele',
-	
+
 	// text direction
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'İzinler',
-	'Create user' => 'Kullanıcı yarat',
-	'User has been dropped.' => 'Kullanıcı düşürüldü.',
+	'Create user' => 'Kullanıcı oluştur',
+	'User has been dropped.' => 'Kullanıcı silindi.',
 	'User has been altered.' => 'Kullanıcı değiştirildi.',
-	'User has been created.' => 'Kullanıcı yaratıldı.',
-	'Hashed' => 'Harmanlandı.',
+	'User has been created.' => 'Kullanıcı oluşturuldu.',
+	'Hashed' => 'Harmanlandı',
 	'Column' => 'Kolon',
 	'Routine' => 'Yordam',
-	'Grant' => 'İmtiyaz',
-	'Revoke' => 'Geri al',
-	
+	'Grant' => 'Yetki Ver',
+	'Revoke' => 'Yetki Kaldır',
+
 	'Process list' => 'İşlem listesi',
-	'%d process(es) have been killed.' => array('%d süreç öldürüldü.', '%d adet süreç öldürüldü.'),
-	'Kill' => 'Öldür',
-	
+	'%d process(es) have been killed.' => array('%d işlem sonlandırıldı.', '%d adet işlem sonlandırıldı.'),
+	'Kill' => 'Sonlandır',
+
 	'Variables' => 'Değişkenler',
 	'Status' => 'Durum',
-	
+
 	'SQL command' => 'SQL komutu',
-	'%d query(s) executed OK.' => array('%d sorgunun işletilmesi tamamlandı.', '%d kadar sorgunun işletilmesi tamamlandı.'),
-	'Query executed OK, %d row(s) affected.' => array('Sorgu işletilmesi tamamlandı. %d sıra(row) etkilendi.', 'Sorgu işletilmesi tamamlandı. Bundan %d kadar sıra etkilendi.'),
-	'No commands to execute.' => 'İşletilmek için komut yok.',
+	'%d query(s) executed OK.' => array('%d sorgu başarıyla çalıştırıldı.', '%d adet sorgu başarıyla çalıştırıldı.'),
+	'Query executed OK, %d row(s) affected.' => array('Sorgu başarıyla çalıştırıldı, %d adet kayıt etkilendi.', 'Sorgu başarıyla çalıştırıldı, %d adet kayıt etkilendi.'),
+	'No commands to execute.' => 'Çalıştırılacak komut yok.',
 	'Error in query' => 'Sorguda hata',
-	'Execute' => 'İşlet',
-	'Stop on error' => 'Dur hata',
+	'Execute' => 'Çalıştır',
+	'Stop on error' => 'Hata oluşursa dur',
 	'Show only errors' => 'Sadece hataları göster.',
 	// sprintf() format for time of the command
 	'%.3f s' => '%.3f s',
-	'History' => 'Tarih',
-	'Clear' => 'Boşluk',
-	
+	'History' => 'Geçmiş',
+	'Clear' => 'Temizle',
+	'Edit all' => 'Tümünü düzenle',
+
 	'File upload' => 'Dosya gönder',
 	'From server' => 'Sunucudan',
 	'Webserver file %s' => '%s web sunucusu dosyası',
-	'Run file' => 'Dosya çalıştır',
+	'Run file' => 'Dosyayı çalıştır',
 	'File does not exist.' => 'Dosya mevcut değil.',
 	'File uploads are disabled.' => 'Dosya gönderimi etkin değil.',
 	'Unable to upload a file.' => 'Dosya gönderilemiyor.',
-	'Maximum allowed file size is %sB.' => 'Bir dosya için izin verilen dosya sınırı %sB.',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Çok büyük POST verisi, veriyi azaltın ya da ayar yönergesini uygun olarak yapılandırın.',
-	
-	'Export' => 'İhraç',
-	'Dump' => 'Döküm',
+	'Maximum allowed file size is %sB.' => 'İzin verilen dosya boyutu sınırı %sB.',
+	'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',
 	'Output' => 'Çıktı',
 	'open' => 'aç',
 	'save' => 'kaydet',
 	'Format' => 'Biçim',
 	'Data' => 'Veri',
-	
-	'Database' => 'Veritabanı',
-	'database' => 'veritabanı',
+
+	'Database' => 'Veri Tabanı',
+	'database' => 'veri tabanı',
 	'Use' => 'Kullan',
-	'Select database' => 'Veritabanı seç',
-	'Invalid database.' => 'Geçersiz veritabanı.',
-	'Create new database' => 'Yeni veritabanı yarat',
-	'Database has been dropped.' => 'Veritabanı düşürüldü.',
-	'Databases have been dropped.' => 'Veritabanları düşüüldü.',
-	'Database has been created.' => 'Veritabanı yaratıldı.',
-	'Database has been renamed.' => 'Veritabanının ismi değiştirildi.',
-	'Database has been altered.' => 'Veritabanı değiştirildi.',
-	'Alter database' => 'Veritabanı değiştir',
-	'Create database' => 'Veritabanı yarat',
-	'Database schema' => 'Veritabanı şeması',
-	
+	'Select database' => 'Veri tabanı seç',
+	'Invalid database.' => 'Geçersiz veri tabanı.',
+	'Database has been dropped.' => 'Veri tabanı silindi.',
+	'Databases have been dropped.' => 'Veritabanları silindi.',
+	'Database has been created.' => 'Veri tabanı oluşturuldu.',
+	'Database has been renamed.' => 'Veri tabanının ismi değiştirildi.',
+	'Database has been altered.' => 'Veri tabanı değiştirildi.',
+	'Alter database' => 'Veri tabanını değiştir',
+	'Create database' => 'Veri tabanı oluştur',
+	'Database schema' => 'Veri tabanı şeması',
+
+	// link to current database schema layout
+	'Permanent link' => 'Kalıcı bağlantı',
+
 	// thousands separator - must contain single byte
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Engine' => 'Motor',
 	'Collation' => 'Karşılaştırma',
-	'Data Length' => 'Veri uzunluğu',
-	'Index Length' => 'Dizin uzunluğu',
-	'Data Free' => 'Serbest veri',
-	'Rows' => 'Sıralar (Rows)',
-	'%d in total' => '%d toplamda',
-	'Analyze' => 'Çözümleme',
-	'Optimize' => 'En uygun hale getirme',
-	'Check' => 'Denetleme',
-	'Repair' => 'Tamir',
-	'Truncate' => 'Buda',
-	'Tables have been truncated.' => 'Tablolar budandı.',
-	'Move to other database' => 'Diğer veritabanına taşı',
+	'Data Length' => 'Veri Uzunluğu',
+	'Index Length' => 'Dizin Uzunluğu',
+	'Data Free' => 'Boş Veri',
+	'Rows' => 'Kayıtlar',
+	'%d in total' => 'toplam %d',
+	'Analyze' => 'Çözümle',
+	'Optimize' => 'En uygun hale getir',
+	'Check' => 'Denetle',
+	'Repair' => 'Tamir Et',
+	'Truncate' => 'Boşalt',
+	'Tables have been truncated.' => 'Tablolar boşaltıldı.',
+	'Move to other database' => 'Başka veri tabanına taşı',
 	'Move' => 'Taşı',
 	'Tables have been moved.' => 'Tablolar taşındı.',
 	'Copy' => 'Kopyala',
 	'Tables have been copied.' => 'Tablolar kopyalandı.',
-	
+
 	'Routines' => 'Yordamlar',
-	'Routine has been called, %d row(s) affected.' => array('Yordam çağrıldı, %d sıra(row) etkilendi.', 'Yordam çağrıldı, %d sıralar(rows) etkilendi.'),
-	'Call' => 'Çağrı',
+	'Routine has been called, %d row(s) affected.' => array('Yordam çağrıldı, %d adet kayıt etkilendi.', 'Yordam çağrıldı, %d kayıt etkilendi.'),
+	'Call' => 'Çağır',
 	'Parameter name' => 'Parametre adı',
-	'Create procedure' => 'Yöntem yarat',
-	'Create function' => 'Fonksiyon yarat',
-	'Routine has been dropped.' => 'Yordam düşürüldü.',
+	'Create procedure' => 'Yöntem oluştur',
+	'Create function' => 'Fonksiyon oluştur',
+	'Routine has been dropped.' => 'Yordam silindi.',
 	'Routine has been altered.' => 'Yordam değiştirildi.',
-	'Routine has been created.' => 'Yordam yaratıldı.',
-	'Alter function' => 'Değiştirme fonksyionu',
-	'Alter procedure' => 'Değiştirme yöntemi',
+	'Routine has been created.' => 'Yordam oluşturuldu.',
+	'Alter function' => 'Fonksyionu değiştir',
+	'Alter procedure' => 'Yöntemi değiştir',
 	'Return type' => 'Geri dönüş türü',
-	
+
 	'Events' => 'Olaylar',
-	'Event has been dropped.' => 'Olay düşüdüldü.',
+	'Event has been dropped.' => 'Olay silindi.',
 	'Event has been altered.' => 'Olay değiştirildi.',
-	'Event has been created.' => 'Olay yaratıldı.',
-	'Alter event' => 'Değiştirme olayı',
-	'Create event' => 'Yaratma olayı',
-	'At given time' => 'Bir anda',
-	'Every' => 'Herzaman',
+	'Event has been created.' => 'Olay oluşturuldu.',
+	'Alter event' => 'Olayı değiştir',
+	'Create event' => 'Olay oluştur',
+	'At given time' => 'Verilen zamanda',
+	'Every' => 'Her zaman',
 	'Schedule' => 'Takvimli',
 	'Start' => 'Başla',
 	'End' => 'Son',
-	'On completion preserve' => 'Tamamlama koruması AÇIK',
-	
+	'On completion preserve' => 'Tamamlama koruması',
+
 	'Tables' => 'Tablolar',
 	'Tables and views' => 'Tablolar ve görünümler',
 	'Table' => 'Tablo',
 	'No tables.' => 'Tablo yok.',
-	'Alter table' => 'Tablo değiştir',
-	'Create table' => 'Tablo yarat',
-	'Create new table' => 'Yeni tablo yarat',
-	'Table has been dropped.' => 'Tablo düşürüldü.',
-	'Tables have been dropped.' => 'Tablolar düşürüldü.',
+	'Alter table' => 'Tabloyu değiştir',
+	'Create table' => 'Tablo oluştur',
+	'Table has been dropped.' => 'Tablo silindi.',
+	'Tables have been dropped.' => 'Tablolar silindi.',
+	'Tables have been optimized.' => 'Tablolar en uygun hale getirildi.',
 	'Table has been altered.' => 'Tablo değiştirildi.',
-	'Table has been created.' => 'Tablo yaratıldı.',
+	'Table has been created.' => 'Tablo oluşturuldu.',
 	'Table name' => 'Tablo adı',
 	'Show structure' => 'Yapıyı göster',
 	'engine' => 'motor',
@@ -152,160 +155,165 @@ $translations = array(
 	'Column name' => 'Kolon adı',
 	'Type' => 'Tür',
 	'Length' => 'Uzunluk',
-	'Auto Increment' => 'Otomatik yükselt',
+	'Auto Increment' => 'Otomatik Artır',
 	'Options' => 'Seçenekler',
 	'Comment' => 'Yorum',
 	'Default values' => 'Varsayılan değerler',
-	'Drop' => 'Düşür',
-	'Are you sure?' => 'Emin misin?',
+	'Drop' => 'Sil',
+	'Are you sure?' => 'Emin misiniz?',
 	'Move up' => 'Yukarı taşı',
-	'Move down' => 'AŞağı taş',
-	'Remove' => 'Kaldır',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'kabul edilebilir alan sayısı aşıldı. Lütfen %s ve %s düşürün.',
-	
-	'Partition by' => 'Bölümü tarafından',
+	'Move down' => 'Aşağı taşı',
+	'Remove' => 'Sil',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'İzin verilen en fazla alan sayısı aşıldı. Lütfen %s değerlerini artırın.',
+
+	'Partition by' => 'Bununla bölümle',
 	'Partitions' => 'Bölümler',
-	'Partition name' => 'BÖlüm adı',
+	'Partition name' => 'Bölüm adı',
 	'Values' => 'Değerler',
-	
+
 	'View' => 'Görünüm',
-	'View has been dropped.' => 'Görünüm düşürüldü.',
+	'View has been dropped.' => 'Görünüm silindi.',
 	'View has been altered.' => 'Görünüm değiştirildi.',
-	'View has been created.' => 'Görünüm yaratıldı.',
-	'Alter view' => 'Değişim görünüm',
-	'Create view' => 'Görünüm yarat',
-	
+	'View has been created.' => 'Görünüm oluşturuldu.',
+	'Alter view' => 'Görünümü değiştir',
+	'Create view' => 'Görünüm oluştur',
+
 	'Indexes' => 'Dizinler',
-	'Indexes have been altered.' => 'Dizinler değiştirilidi.',
+	'Indexes have been altered.' => 'Dizinler değiştirildi.',
 	'Alter indexes' => 'Dizinleri değiştir',
-	'Add next' => 'Sonraya ekle',
+	'Add next' => 'Bundan sonra ekle',
 	'Index Type' => 'Dizin Türü',
 	'Column (length)' => 'Kolon (uzunluğu)',
-	
+
 	'Foreign keys' => 'Dış anahtarlar',
 	'Foreign key' => 'Dış anahtar',
-	'Foreign key has been dropped.' => 'Dış anahtar düşürüldü.',
-	'Foreign key has been altered.' => 'Dış anahtar değiştir.',
-	'Foreign key has been created.' => 'Dış anahtar yarat.',
+	'Foreign key has been dropped.' => 'Dış anahtar silindi.',
+	'Foreign key has been altered.' => 'Dış anahtar değiştirildi.',
+	'Foreign key has been created.' => 'Dış anahtar oluşturuldu.',
 	'Target table' => 'Hedef tablo',
-	'Change' => 'Değiş',
+	'Change' => 'Değiştir',
 	'Source' => 'Kaynak',
 	'Target' => 'Hedef',
-	'Add column' => 'Kolon eklde',
+	'Add column' => 'Kolon ekle',
 	'Alter' => 'Değiştir',
 	'Add foreign key' => 'Dış anahtar ekle',
-	'ON DELETE' => 'Silinmek üzere',
-	'ON UPDATE' => 'Yükseltilmek üzere',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Kaynak ve hedef kolonlar aynı veri türü olmak zorunda, hedef kolonda bir dizin ve başvurulan veri bulunmalı.',
-	
+	'ON DELETE' => 'ON DELETE (Hedefteki Kayıt Silinirse)',
+	'ON UPDATE' => 'ON UPDATE (Hedefteki Kayıt Değiştirilirse)',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Kaynak ve hedef kolonlar aynı veri türünde olmalı, hedef kolonlarda dizin bulunmalı ve başvurulan veri mevcut olmalı.',
+
 	'Triggers' => 'Tetikler',
 	'Add trigger' => 'Tetik ekle',
-	'Trigger has been dropped.' => 'Tetik düşürüldü.',
+	'Trigger has been dropped.' => 'Tetik silindi.',
 	'Trigger has been altered.' => 'Tetik değiştirildi.',
-	'Trigger has been created.' => 'Tetik yaratıldı.',
-	'Alter trigger' => 'Tetik değiştir.',
-	'Create trigger' => 'Tetik yarat',
+	'Trigger has been created.' => 'Tetik oluşturuldu.',
+	'Alter trigger' => 'Tetiği değiştir.',
+	'Create trigger' => 'Tetik oluştur',
 	'Time' => 'Zaman',
 	'Event' => 'Olay',
 	'Name' => 'Ad',
-	
+
 	'select' => 'seç',
 	'Select' => 'Seç',
 	'Select data' => 'Veri seç',
 	'Functions' => 'Fonksiyonlar',
 	'Aggregation' => 'Kümeleme',
-	'Search' => 'Arama',
-	'anywhere' => 'herhangi bir yer',
-	'Search data in tables' => 'Tablolarda veri ara.',
+	'Search' => 'Ara',
+	'anywhere' => 'hiçbir yerde',
+	'Search data in tables' => 'Tablolarda veri ara',
 	'Sort' => 'Sırala',
 	'descending' => 'azalan',
 	'Limit' => 'sınır',
 	'Text length' => 'Yazı uzunluğu',
 	'Action' => 'Eylem',
+	'Full table scan' => 'Tam tablo tarama',
 	'Unable to select the table' => 'Tablo seçilemedi',
-	'No rows.' => 'Sıra yok.',
-	'%d row(s)' => array('%d sıra)', '%d kadar sıra'),
+	'No rows.' => 'Kayıt yok.',
+	'%d row(s)' => array('%d kayıt', '%d adet kayıt'),
 	'Page' => 'Sayfa',
 	'last' => 'son',
-	'Last page' => 'Son sayfa',
+	'Load more data' => 'Daha fazla veri yükle',
+	'Loading' => 'Yükleniyor',
 	'whole result' => 'tüm sonuç',
-	'%d byte(s)' => array('%d bayt', '%d kadar bayt'),
-	
-	'Import' => 'İthal',
-	'%d row(s) have been imported.' => array('%d sıra ithal edildi.', '%d kadar sıra ithal edildi.'),
-	
+	'%d byte(s)' => array('%d bayt', '%d bayt'),
+
+	'Import' => 'İçeri Aktar',
+	'%d row(s) have been imported.' => array('%d kayıt içeri aktarıldı.', '%d adet kayıt içeri aktarıldı.'),
+
 	// in-place editing in select
-	'Double click on a value to modify it.' => 'Değerin üzerine çift tıklayın ve değiştirin.',
+	'Ctrl+click on a value to modify it.' => 'Bir değeri değiştirmek için üzerine Ctrl+tıklayın.',
 	'Use edit link to modify this value.' => 'Değeri değiştirmek için düzenleme bağlantısını kullanın.',
-	
+
 	// %s can contain auto-increment value
-	'Item%s has been inserted.' => 'Öğeler eklendi.',
-	'Item has been deleted.' => 'Öğe silindi.',
-	'Item has been updated.' => 'Öğe güncellendi.',
-	'%d item(s) have been affected.' => array('%d öğe etkilendi.', '%d kadar öğe etkilendi.'),
-	'New item' => 'Yeni öğe',
+	'Item%s has been inserted.' => 'Kayıt%s eklendi.',
+	'Item has been deleted.' => 'Kayıt silindi.',
+	'Item has been updated.' => 'Kayıt güncellendi.',
+	'%d item(s) have been affected.' => array('%d kayıt etkilendi.', '%d adet kayıt etkilendi.'),
+	'New item' => 'Yeni kayıt',
 	'original' => 'orijinal',
 	// label for value '' in enum data type
 	'empty' => 'boş',
-	'edit' => 'düzen',
-	'Edit' => 'Düzen',
+	'edit' => 'düzenle',
+	'Edit' => 'Düzenle',
 	'Insert' => 'Ekle',
 	'Save' => 'Kaydet',
 	'Save and continue edit' => 'Kaydet ve düzenlemeye devam et',
-	'Save and insert next' => 'Kaydet ve sonrakin ekle',
-	'Clone' => 'Klonla',
+	'Save and insert next' => 'Kaydet ve sonrakini ekle',
+	'Clone' => 'Kopyala',
 	'Delete' => 'Sil',
-	
+
 	'E-mail' => 'E-posta',
 	'From' => 'Gönderen',
 	'Subject' => 'Konu',
 	'Attachments' => 'Ekler',
 	'Send' => 'Gönder',
-	'%d e-mail(s) have been sent.' => array('%d e-posta dönderildi.', '%d kadar e-posta gönderildi.'),
-	
+	'%d e-mail(s) have been sent.' => array('%d e-posta gönderildi.', '%d adet e-posta gönderildi.'),
+
 	// data type descriptions
 	'Numbers' => 'Sayılar',
 	'Date and time' => 'Tarih ve zaman',
-	'Strings' => 'Sözcükler',
+	'Strings' => 'Dizge',
 	'Binary' => 'İkili',
 	'Lists' => 'Listeler',
 	'Network' => 'Ağ',
 	'Geometry' => 'Geometri',
 	'Relations' => 'İlişkiler',
-	
+
 	'Editor' => 'Düzenleyici',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$6.$4.$1',
 	// hint for date format - use language equivalents for day, month and year shortcuts
-	'[yyyy]-mm-dd' => 'd.m.[rrrr]',
+	'[yyyy]-mm-dd' => '[yyyy]-aa-gg',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'SS:DD:ss',
 	'now' => 'şimdi',
-	
+	'yes' => 'evet',
+	'no' => 'hayır',
+
 	// general SQLite error in create, drop or rename database
-	'File exists.' => 'Dosya mevcut.',
+	'File exists.' => 'Dosya zaten mevcut.',
 	'Please use one of the extensions %s.' => '%s uzantılarından birini kullanın.',
-	
+
 	// PostgreSQL and MS SQL schema support
-	'Alter schema' => 'Değişim şeması',
-	'Create schema' => 'Yaratım şeması',
-	'Schema has been dropped.' => 'Şema düşürüldü.',
-	'Schema has been created.' => 'Şema yaratıldı.',
+	'Alter schema' => 'Şemayı değiştir',
+	'Create schema' => 'Şema oluştur',
+	'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.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Diziler',
-	'Create sequence' => 'Dizi yarat',
-	'Sequence has been dropped.' => 'Dizi düşürüldü.',
-	'Sequence has been created.' => 'Dizi yaratıldı.',
+	'Create sequence' => 'Dizi oluştur',
+	'Sequence has been dropped.' => 'Dizi silindi.',
+	'Sequence has been created.' => 'Dizi oluşturuldu.',
 	'Sequence has been altered.' => 'Dizi değiştirildi.',
-	'Alter sequence' => 'Dizi değiştir',
-	
+	'Alter sequence' => 'Diziyi değiştir',
+
 	// PostgreSQL user types support
 	'User types' => 'Kullanıcı türleri',
-	'Create type' => 'Tür yarat',
-	'Type has been dropped.' => 'Tür düşürüldü.',
-	'Type has been created.' => 'Tür yaratıldı.',
-	'Alter type' => 'Tür değiştir',
+	'Create type' => 'Tür oluştur',
+	'Type has been dropped.' => 'Tür silindi.',
+	'Type has been created.' => 'Tür oluşturuldu.',
+	'Alter type' => 'Türü değiştir',
 );

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' => 'зберегти',
@@ -78,7 +77,6 @@ $translations = array(
 	'Use' => 'Обрати',
 	'Select database' => 'Обрати базу даних',
 	'Invalid database.' => 'Погана база даних.',
-	'Create new database' => 'Створити нову базу даних',
 	'Database has been dropped.' => 'Базу даних було видалено.',
 	'Databases have been dropped.' => 'Бази даних були видалені.',
 	'Database has been created.' => 'Базу даних було створено.',
@@ -93,6 +91,7 @@ $translations = array(
 	
 	// thousands separator - must contain single byte
 	',' => ' ',
+	'0123456789' => '0123456789',
 	'Engine' => 'Рушій',
 	'Collation' => 'Співставлення',
 	'Data Length' => 'Об\'єм даних',
@@ -144,7 +143,6 @@ $translations = array(
 	'No tables.' => 'Нема таблиць.',
 	'Alter table' => 'Змінити таблицю',
 	'Create table' => 'Створити таблицю',
-	'Create new table' => 'Створити нову таблицю',
 	'Table has been dropped.' => 'Таблицю було видалено.',
 	'Tables have been dropped.' => 'Таблиці були видалені.',
 	'Tables have been optimized.' => 'Таблиці були оптимізовані.',
@@ -166,7 +164,7 @@ $translations = array(
 	'Move up' => 'Пересунути вгору',
 	'Move down' => 'Пересунути вниз',
 	'Remove' => 'Видалити',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'Досягнута максимальна кількість доступних полів. Будь ласка, збільшіть %s і %s.',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Досягнута максимальна кількість доступних полів. Будь ласка, збільшіть %s.',
 	
 	'Partition by' => 'Розділити по',
 	'Partitions' => 'Розділи',
@@ -232,7 +230,6 @@ $translations = array(
 	'%d row(s)' => array('%d рядок', '%d рядки', '%d рядків'),
 	'Page' => 'Сторінка',
 	'last' => 'остання',
-	'Last page' => 'Остання сторінка',
 	'whole result' => 'весь результат',
 	'%d byte(s)' => array('%d байт', '%d байта', '%d байтів'),
 	
@@ -240,7 +237,7 @@ $translations = array(
 	'%d row(s) have been imported.' => array('%d рядок було імпортовано.', '%d рядки було імпортовано.', '%d рядків було імпортовано.'),
 	
 	// in-place editing in select
-	'Double click on a value to modify it.' => 'Двічі клікніть на значенні щоб змінити його.',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+клікніть на значенні щоб змінити його.',
 	'Use edit link to modify this value.' => 'Використовуйте посилання щоб змінити це значення.',
 	
 	// %s can contain auto-increment value
@@ -299,7 +296,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,328 @@
+<?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="https://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="https://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.',
+	'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

@@ -1,321 +1,342 @@
 <?php
 $translations = array(
 	// label for database system selection (MySQL, SQLite, ...)
-	'System' => 'xx',
-	'Server' => 'xx',
-	'Username' => 'xx',
-	'Password' => 'xx',
-	'Permanent login' => 'xx',
-	'Login' => 'xx',
-	'Logout' => 'xx',
-	'Logged as: %s' => 'xx',
-	'Logout successful.' => 'xx',
-	'Invalid credentials.' => 'xx',
-	'Language' => 'xx',
-	'Invalid CSRF token. Send the form again.' => 'xx',
-	'No extension' => 'xx',
-	'None of the supported PHP extensions (%s) are available.' => 'xx',
-	'Session support must be enabled.' => 'xx',
-	'Session expired, please login again.' => 'xx',
-	'%s version: %s through PHP extension %s' => 'xx',
-	'Refresh' => 'xx',
+	'System' => 'Xx',
+	'Server' => 'Xx',
+	'Username' => 'Xx',
+	'Password' => 'Xx',
+	'Permanent login' => 'Xx',
+	'Login' => 'Xx',
+	'Logout' => 'Xx',
+	'Logged as: %s' => 'Xx',
+	'Logout successful.' => 'Xx.',
+	'Invalid credentials.' => 'Xx.',
+	'<a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to use SQLite.' => 'Xx.',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Xx.', 'Xx.'),
+	'Master password expired. <a href="https://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.',
+	'If you did not send this request from Adminer then close this page.' => 'Xx.',
+	'No extension' => 'Xx',
+	'None of the supported PHP extensions (%s) are available.' => 'Xx.',
+	'Session support must be enabled.' => 'Xx.',
+	'Session expired, please login again.' => 'Xx.',
+	'%s version: %s through PHP extension %s' => 'Xx',
+	'Refresh' => 'Xx',
 	
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'xx',
 	
-	'Privileges' => 'xx',
-	'Create user' => 'xx',
-	'User has been dropped.' => 'xx',
-	'User has been altered.' => 'xx',
-	'User has been created.' => 'xx',
-	'Hashed' => 'xx',
-	'Column' => 'xx',
-	'Routine' => 'xx',
-	'Grant' => 'xx',
-	'Revoke' => 'xx',
+	'Privileges' => 'Xx',
+	'Create user' => 'Xx',
+	'User has been dropped.' => 'Xx.',
+	'User has been altered.' => 'Xx.',
+	'User has been created.' => 'Xx.',
+	'Hashed' => 'Xx',
+	'Column' => 'Xx',
+	'Routine' => 'Xx',
+	'Grant' => 'Xx',
+	'Revoke' => 'Xx',
 	
-	'Process list' => 'xx',
-	'%d process(es) have been killed.' => array('xx', 'xx'),
-	'Kill' => 'xx',
+	'Process list' => 'Xx',
+	'%d process(es) have been killed.' => array('Xx.', 'Xx.'),
+	'Kill' => 'Xx',
 	
-	'Variables' => 'xx',
-	'Status' => 'xx',
+	'Variables' => 'Xx',
+	'Status' => 'Xx',
 	
-	'SQL command' => 'xx',
-	'%d query(s) executed OK.' => array('xx', 'xx'),
-	'Query executed OK, %d row(s) affected.' => array('xx', 'xx'),
-	'No commands to execute.' => 'xx',
-	'Error in query' => 'xx',
-	'Execute' => 'xx',
-	'Stop on error' => 'xx',
-	'Show only errors' => 'xx',
+	'Replication' => 'Xx',
+	'Master status' => 'Xx',
+	'Slave status' => 'Xx',
+	
+	'SQL command' => 'Xx',
+	'%d query(s) executed OK.' => array('Xx.', 'Xx.'),
+	'Query executed OK, %d row(s) affected.' => array('Xx.', 'Xx.'),
+	'No commands to execute.' => 'Xx.',
+	'Error in query' => 'Xx',
+	'ATTACH queries are not supported.' => 'Xx.',
+	'Execute' => 'Xx',
+	'Stop on error' => 'Xx',
+	'Show only errors' => 'Xx',
 	// sprintf() format for time of the command
 	'%.3f s' => 'xx',
-	'History' => 'xx',
-	'Clear' => 'xx',
-	'Edit all' => 'xx',
+	'History' => 'Xx',
+	'Clear' => 'Xx',
+	'Edit all' => 'Xx',
 	
-	'File upload' => 'xx',
-	'From server' => 'xx',
-	'Webserver file %s' => 'xx',
-	'Run file' => 'xx',
-	'File does not exist.' => 'xx',
-	'File uploads are disabled.' => 'xx',
-	'Unable to upload a file.' => 'xx',
-	'Maximum allowed file size is %sB.' => 'xx',
-	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'xx',
+	'File upload' => 'Xx',
+	'From server' => 'Xx',
+	'Webserver file %s' => 'Xx',
+	'Run file' => 'Xx',
+	'File does not exist.' => 'Xx.',
+	'File uploads are disabled.' => 'Xx.',
+	'Unable to upload a file.' => 'Xx.',
+	'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',
+	'Export' => 'Xx',
+	'Output' => 'Xx',
 	'open' => 'xx',
 	'save' => 'xx',
-	'Format' => 'xx',
-	'Data' => 'xx',
+	'Saving' => 'Xx',
+	'Format' => 'Xx',
+	'Data' => 'Xx',
 	
-	'Database' => 'xx',
+	'Database' => 'Xx',
 	'database' => 'xx',
-	'Use' => 'xx',
-	'Select database' => 'xx',
-	'Invalid database.' => 'xx',
-	'Create new database' => 'xx',
-	'Database has been dropped.' => 'xx',
-	'Databases have been dropped.' => 'xx',
-	'Database has been created.' => 'xx',
-	'Database has been renamed.' => 'xx',
-	'Database has been altered.' => 'xx',
-	'Alter database' => 'xx',
-	'Create database' => 'xx',
-	'Database schema' => 'xx',
+	'Use' => 'Xx',
+	'Select database' => 'Xx',
+	'Invalid database.' => 'Xx.',
+	'Database has been dropped.' => 'Xx.',
+	'Databases have been dropped.' => 'Xx.',
+	'Database has been created.' => 'Xx.',
+	'Database has been renamed.' => 'Xx.',
+	'Database has been altered.' => 'Xx.',
+	'Alter database' => 'Xx',
+	'Create database' => 'Xx',
+	'Database schema' => 'Xx',
 	
 	// link to current database schema layout
-	'Permanent link' => 'xx',
+	'Permanent link' => 'Xx',
 	
 	// thousands separator - must contain single byte
-	',' => 'xx',
-	'Engine' => 'xx',
-	'Collation' => 'xx',
-	'Data Length' => 'xx',
-	'Index Length' => 'xx',
-	'Data Free' => 'xx',
-	'Rows' => 'xx',
+	',' => 'x',
+	'0123456789' => 'xxxxxxxxxx',
+	'Engine' => 'Xx',
+	'Collation' => 'Xx',
+	'Data Length' => 'Xx',
+	'Index Length' => 'Xx',
+	'Data Free' => 'Xx',
+	'Rows' => 'Xx',
 	'%d in total' => 'xx',
-	'Analyze' => 'xx',
-	'Optimize' => 'xx',
-	'Check' => 'xx',
-	'Repair' => 'xx',
-	'Truncate' => 'xx',
-	'Tables have been truncated.' => 'xx',
-	'Move to other database' => 'xx',
-	'Move' => 'xx',
-	'Tables have been moved.' => 'xx',
-	'Copy' => 'xx',
-	'Tables have been copied.' => 'xx',
+	'Analyze' => 'Xx',
+	'Optimize' => 'Xx',
+	'Vacuum' => 'Xx',
+	'Check' => 'Xx',
+	'Repair' => 'Xx',
+	'Truncate' => 'Xx',
+	'Tables have been truncated.' => 'Xx.',
+	'Move to other database' => 'Xx',
+	'Move' => 'Xx',
+	'Tables have been moved.' => 'Xx.',
+	'Copy' => 'Xx',
+	'Tables have been copied.' => 'Xx.',
 	
-	'Routines' => 'xx',
-	'Routine has been called, %d row(s) affected.' => array('xx', 'xx'),
-	'Call' => 'xx',
-	'Parameter name' => 'xx',
-	'Create procedure' => 'xx',
-	'Create function' => 'xx',
-	'Routine has been dropped.' => 'xx',
-	'Routine has been altered.' => 'xx',
-	'Routine has been created.' => 'xx',
-	'Alter function' => 'xx',
-	'Alter procedure' => 'xx',
-	'Return type' => 'xx',
+	'Routines' => 'Xx',
+	'Routine has been called, %d row(s) affected.' => array('Xx.', 'Xx.'),
+	'Call' => 'Xx',
+	'Parameter name' => 'Xx',
+	'Create procedure' => 'Xx',
+	'Create function' => 'Xx',
+	'Routine has been dropped.' => 'Xx.',
+	'Routine has been altered.' => 'Xx.',
+	'Routine has been created.' => 'Xx.',
+	'Alter function' => 'Xx',
+	'Alter procedure' => 'Xx',
+	'Return type' => 'Xx',
 	
-	'Events' => 'xx',
-	'Event has been dropped.' => 'xx',
-	'Event has been altered.' => 'xx',
-	'Event has been created.' => 'xx',
-	'Alter event' => 'xx',
-	'Create event' => 'xx',
-	'At given time' => 'xx',
-	'Every' => 'xx',
-	'Schedule' => 'xx',
-	'Start' => 'xx',
-	'End' => 'xx',
-	'On completion preserve' => 'xx',
+	'Events' => 'Xx',
+	'Event has been dropped.' => 'Xx.',
+	'Event has been altered.' => 'Xx.',
+	'Event has been created.' => 'Xx.',
+	'Alter event' => 'Xx',
+	'Create event' => 'Xx',
+	'At given time' => 'Xx',
+	'Every' => 'Xx',
+	'Schedule' => 'Xx',
+	'Start' => 'Xx',
+	'End' => 'Xx',
+	'On completion preserve' => 'Xx',
 	
-	'Tables' => 'xx',
-	'Tables and views' => 'xx',
-	'Table' => 'xx',
-	'No tables.' => 'xx',
-	'Alter table' => 'xx',
-	'Create table' => 'xx',
-	'Create new table' => 'xx',
-	'Table has been dropped.' => 'xx',
-	'Tables have been dropped.' => 'xx',
-	'Tables have been optimized.' => 'xx',
-	'Table has been altered.' => 'xx',
-	'Table has been created.' => 'xx',
-	'Table name' => 'xx',
-	'Show structure' => 'xx',
+	'Tables' => 'Xx',
+	'Tables and views' => 'Xx',
+	'Table' => 'Xx',
+	'No tables.' => 'Xx.',
+	'Alter table' => 'Xx',
+	'Create table' => 'Xx',
+	'Table has been dropped.' => 'Xx.',
+	'Tables have been dropped.' => 'Xx.',
+	'Tables have been optimized.' => 'Xx.',
+	'Table has been altered.' => 'Xx.',
+	'Table has been created.' => 'Xx.',
+	'Table name' => 'Xx',
+	'Show structure' => 'Xx',
 	'engine' => 'xx',
 	'collation' => 'xx',
-	'Column name' => 'xx',
-	'Type' => 'xx',
-	'Length' => 'xx',
-	'Auto Increment' => 'xx',
-	'Options' => 'xx',
-	'Comment' => 'xx',
-	'Default values' => 'xx',
-	'Drop' => 'xx',
-	'Are you sure?' => 'xx',
-	'Move up' => 'xx',
-	'Move down' => 'xx',
-	'Remove' => 'xx',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => 'xx',
+	'Column name' => 'Xx',
+	'Type' => 'Xx',
+	'Length' => 'Xx',
+	'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',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Xx.',
 	
-	'Partition by' => 'xx',
-	'Partitions' => 'xx',
-	'Partition name' => 'xx',
-	'Values' => 'xx',
+	'Partition by' => 'Xx',
+	'Partitions' => 'Xx',
+	'Partition name' => 'Xx',
+	'Values' => 'Xx',
 	
-	'View' => 'xx',
-	'View has been dropped.' => 'xx',
-	'View has been altered.' => 'xx',
-	'View has been created.' => 'xx',
-	'Alter view' => 'xx',
-	'Create view' => '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',
 	
-	'Indexes' => 'xx',
-	'Indexes have been altered.' => 'xx',
-	'Alter indexes' => 'xx',
-	'Add next' => 'xx',
-	'Index Type' => 'xx',
-	'Column (length)' => 'xx',
+	'Indexes' => 'Xx',
+	'Indexes have been altered.' => 'Xx.',
+	'Alter indexes' => 'Xx',
+	'Add next' => 'Xx',
+	'Index Type' => 'Xx',
+	'Column (length)' => 'Xx',
 	
-	'Foreign keys' => 'xx',
-	'Foreign key' => 'xx',
-	'Foreign key has been dropped.' => 'xx',
-	'Foreign key has been altered.' => 'xx',
-	'Foreign key has been created.' => 'xx',
-	'Target table' => 'xx',
-	'Change' => 'xx',
-	'Source' => 'xx',
-	'Target' => 'xx',
-	'Add column' => 'xx',
-	'Alter' => 'xx',
-	'Add foreign key' => 'xx',
-	'ON DELETE' => 'xx',
-	'ON UPDATE' => 'xx',
-	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'xx',
+	'Foreign keys' => 'Xx',
+	'Foreign key' => 'Xx',
+	'Foreign key has been dropped.' => 'Xx.',
+	'Foreign key has been altered.' => 'Xx.',
+	'Foreign key has been created.' => 'Xx.',
+	'Target table' => 'Xx',
+	'Change' => 'Xx',
+	'Source' => 'Xx',
+	'Target' => 'Xx',
+	'Add column' => 'Xx',
+	'Alter' => 'Xx',
+	'Add foreign key' => 'Xx',
+	'ON DELETE' => 'Xx',
+	'ON UPDATE' => 'Xx',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Xx.',
 	
-	'Triggers' => 'xx',
-	'Add trigger' => 'xx',
-	'Trigger has been dropped.' => 'xx',
-	'Trigger has been altered.' => 'xx',
-	'Trigger has been created.' => 'xx',
-	'Alter trigger' => 'xx',
-	'Create trigger' => 'xx',
-	'Time' => 'xx',
-	'Event' => 'xx',
-	'Name' => 'xx',
+	'Triggers' => 'Xx',
+	'Add trigger' => 'Xx',
+	'Trigger has been dropped.' => 'Xx.',
+	'Trigger has been altered.' => 'Xx.',
+	'Trigger has been created.' => 'Xx.',
+	'Alter trigger' => 'Xx',
+	'Create trigger' => 'Xx',
+	'Time' => 'Xx',
+	'Event' => 'Xx',
+	'Name' => 'Xx',
 	
 	'select' => 'xx',
-	'Select' => 'xx',
-	'Select data' => 'xx',
-	'Functions' => 'xx',
-	'Aggregation' => 'xx',
-	'Search' => 'xx',
+	'Select' => 'Xx',
+	'Select data' => 'Xx',
+	'Functions' => 'Xx',
+	'Aggregation' => 'Xx',
+	'Search' => 'Xx',
 	'anywhere' => 'xx',
-	'Search data in tables' => 'xx',
-	'Sort' => 'xx',
+	'Search data in tables' => 'Xx',
+	'Sort' => 'Xx',
 	'descending' => 'xx',
-	'Limit' => 'xx',
-	'Text length' => 'xx',
-	'Action' => 'xx',
-	'Full table scan' => 'xx',
-	'Unable to select the table' => 'xx',
-	'No rows.' => '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',
+	'Page' => 'Xx',
 	'last' => 'xx',
-	'Last page' => 'xx',
+	'Load more data' => 'Xx',
+	'Loading' => 'Xx',
 	'whole result' => 'xx',
 	'%d byte(s)' => array('xx', 'xx'),
 	
-	'Import' => 'xx',
-	'%d row(s) have been imported.' => array('xx', 'xx'),
+	'Import' => 'Xx',
+	'%d row(s) have been imported.' => array('Xx.', 'Xx.'),
+	'File must be in UTF-8 encoding.' => 'Xx.',
 	
 	// in-place editing in select
-	'Double click on a value to modify it.' => 'xx',
-	'Use edit link to modify this value.' => 'xx',
+	'Modify' => 'Xx',
+	'Ctrl+click on a value to modify it.' => 'Xx.',
+	'Use edit link to modify this value.' => 'Xx.',
 	
 	// %s can contain auto-increment value
-	'Item%s has been inserted.' => 'xx',
-	'Item has been deleted.' => 'xx',
-	'Item has been updated.' => 'xx',
-	'%d item(s) have been affected.' => array('xx', 'xx'),
-	'New item' => 'xx',
+	'Item%s has been inserted.' => 'Xx.',
+	'Item has been deleted.' => 'Xx.',
+	'Item has been updated.' => 'Xx.',
+	'%d item(s) have been affected.' => array('Xx.', 'Xx.'),
+	'New item' => 'Xx',
 	'original' => 'xx',
 	// label for value '' in enum data type
 	'empty' => 'xx',
 	'edit' => 'xx',
-	'Edit' => 'xx',
-	'Insert' => 'xx',
-	'Save' => 'xx',
-	'Save and continue edit' => 'xx',
-	'Save and insert next' => 'xx',
-	'Clone' => 'xx',
-	'Delete' => 'xx',
+	'Edit' => 'Xx',
+	'Insert' => 'Xx',
+	'Save' => 'Xx',
+	'Save and continue edit' => 'Xx',
+	'Save and insert next' => 'Xx',
+	'Selected' => 'Xx',
+	'Clone' => 'Xx',
+	'Delete' => 'Xx',
+	'You have no privileges to update this table.' => 'Xx.',
 	
-	'E-mail' => 'xx',
-	'From' => 'xx',
-	'Subject' => 'xx',
-	'Attachments' => 'xx',
-	'Send' => 'xx',
-	'%d e-mail(s) have been sent.' => array('xx', 'xx'),
+	'E-mail' => 'Xx',
+	'From' => 'Xx',
+	'Subject' => 'Xx',
+	'Attachments' => 'Xx',
+	'Send' => 'Xx',
+	'%d e-mail(s) have been sent.' => array('Xx.', 'Xx.'),
 	
 	// data type descriptions
-	'Numbers' => 'xx',
-	'Date and time' => 'xx',
-	'Strings' => 'xx',
-	'Binary' => 'xx',
-	'Lists' => 'xx',
-	'Network' => 'xx',
-	'Geometry' => 'xx',
-	'Relations' => 'xx',
+	'Numbers' => 'Xx',
+	'Date and time' => 'Xx',
+	'Strings' => 'Xx',
+	'Binary' => 'Xx',
+	'Lists' => 'Xx',
+	'Network' => 'Xx',
+	'Geometry' => 'Xx',
+	'Relations' => 'Xx',
 	
-	'Editor' => 'xx',
+	'Editor' => 'Xx',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => 'xx',
 	// hint for date format - use language equivalents for day, month and year shortcuts
 	'[yyyy]-mm-dd' => 'xx',
 	// hint for time format - use language equivalents for hour, minute and second shortcuts
-	'HH:MM:SS' => 'xx',
+	'HH:MM:SS' => 'Xx',
 	'now' => 'xx',
 	'yes' => 'xx',
 	'no' => 'xx',
 	
 	// general SQLite error in create, drop or rename database
-	'File exists.' => 'xx',
-	'Please use one of the extensions %s.' => 'xx',
+	'File exists.' => 'Xx.',
+	'Please use one of the extensions %s.' => 'Xx.',
 	
 	// PostgreSQL and MS SQL schema support
-	'Alter schema' => 'xx',
-	'Create schema' => 'xx',
-	'Schema has been dropped.' => 'xx',
-	'Schema has been created.' => 'xx',
-	'Schema has been altered.' => 'xx',
-	'schema' => 'xx',
-	'Schema' => 'xx',
-	'Invalid schema.' => 'xx',
+	'Alter schema' => 'Xx',
+	'Create schema' => 'Xx',
+	'Schema has been dropped.' => 'Xx.',
+	'Schema has been created.' => 'Xx.',
+	'Schema has been altered.' => 'Xx.',
+	'Schema' => 'Xx',
+	'Invalid schema.' => 'Xx.',
 	
 	// PostgreSQL sequences support
-	'Sequences' => 'xx',
-	'Create sequence' => 'xx',
-	'Sequence has been dropped.' => 'xx',
-	'Sequence has been created.' => 'xx',
-	'Sequence has been altered.' => 'xx',
-	'Alter sequence' => 'xx',
+	'Sequences' => 'Xx',
+	'Create sequence' => 'Xx',
+	'Sequence has been dropped.' => 'Xx.',
+	'Sequence has been created.' => 'Xx.',
+	'Sequence has been altered.' => 'Xx.',
+	'Alter sequence' => 'Xx',
 	
 	// PostgreSQL user types support
-	'User types' => 'xx',
-	'Create type' => 'xx',
-	'Type has been dropped.' => 'xx',
-	'Type has been created.' => 'xx',
-	'Alter type' => 'xx',
+	'User types' => 'Xx',
+	'Create type' => 'Xx',
+	'Type has been dropped.' => 'Xx.',
+	'Type has been created.' => 'Xx.',
+	'Alter type' => 'Xx',
 );

adminer/lang/zh-tw.inc.php

@@ -1,70 +1,67 @@
 <?php
 $translations = array(
 	'Login' => '登入',
-	'Logout successful.' => '登出成功。',
+	'Logout successful.' => '成功登出。',
 	'Invalid credentials.' => '無效的憑證。',
 	'Server' => '伺服器',
 	'Username' => '帳號',
 	'Password' => '密碼',
 	'Select database' => '選擇資料庫',
 	'Invalid database.' => '無效的資料庫。',
-	'Create new database' => '建立新資料庫',
-	'Table has been altered.' => '資料表已更改。',
-	'Table has been created.' => '資料表已更改。',
-	'Alter table' => '更改資料表',
-	'Create table' => '建立資料表表',
+	'Table has been altered.' => '資料表已修改。',
+	'Table has been created.' => '資料表已修改。',
+	'Alter table' => '修改資料表',
+	'Create table' => '建立資料表',
 	'Table name' => '資料表名稱',
 	'engine' => '引擎',
 	'collation' => '校對',
 	'Column name' => '列名',
 	'Type' => '類型',
 	'Length' => '長度',
-	'Auto Increment' => '自動增加',
+	'Auto Increment' => '自動遞增',
 	'Options' => '選項',
 	'Save' => '儲存',
-	'Drop' => '丟棄',
+	'Drop' => '刪除',
 	'Database has been dropped.' => '資料庫已刪除。',
 	'Database has been created.' => '已建立資料庫。',
 	'Database has been renamed.' => '已重新命名資料庫。',
-	'Database has been altered.' => '已更改資料庫。',
-	'Alter database' => '更改資料庫',
+	'Database has been altered.' => '已修改資料庫。',
+	'Alter database' => '修改資料庫',
 	'Create database' => '建立資料庫',
 	'SQL command' => 'SQL命令',
-	'Dump' => '導入/導出',
 	'Logout' => '登出',
 	'database' => '資料庫',
 	'Use' => '使用',
 	'No tables.' => '沒有資料表。',
 	'select' => '選擇',
-	'Create new table' => '建立新資料表',
 	'Item has been updated.' => '已更新項目。',
-	'Item%s has been inserted.' => '已插入項目%s。',
+	'Item%s has been inserted.' => '已新增項目%s。',
 	'Edit' => '編輯',
-	'Insert' => '插入',
-	'Save and insert next' => '儲存並插入下一個',
+	'Insert' => '新增',
+	'Save and insert next' => '儲存並新增下一筆',
 	'Delete' => '刪除',
 	'Database' => '資料庫',
 	'Routines' => '程序',
-	'Indexes have been altered.' => '已更改索引。',
+	'Indexes have been altered.' => '已修改索引。',
 	'Indexes' => '索引',
-	'Alter indexes' => '更改索引',
-	'Add next' => '新增下一個',
+	'Alter indexes' => '修改索引',
+	'Add next' => '新增下一筆',
 	'Language' => '語言',
 	'Select' => '選擇',
-	'New item' => '新建項',
+	'New item' => '新增項目',
 	'Search' => '搜尋',
 	'Sort' => '排序',
-	'descending' => '降冪',
+	'descending' => '降冪(遞減)',
 	'Limit' => '限定',
 	'No rows.' => '沒有行。',
 	'Action' => '動作',
 	'edit' => '編輯',
 	'Page' => '頁',
 	'Query executed OK, %d row(s) affected.' => '執行查詢OK，%d行受影響',
-	'Error in query' => '查詢出錯',
+	'Error in query' => '查詢發生錯誤',
 	'Execute' => '執行',
 	'Table' => '資料表',
-	'Foreign keys' => '外鍵',
+	'Foreign keys' => '外來鍵',
 	'Triggers' => '觸發器',
 	'View' => '檢視表',
 	'Unable to select the table' => '無法選擇該資料表',
@@ -75,53 +72,53 @@ $translations = array(
 	'No commands to execute.' => '沒有命令可執行。',
 	'Unable to upload a file.' => '無法上傳檔案。',
 	'File upload' => '檔案上傳',
-	'File uploads are disabled.' => '檔案上傳被禁用。',
+	'File uploads are disabled.' => '檔案上傳已經被停用。',
 	'Routine has been called, %d row(s) affected.' => '程序已被執行，%d行被影響',
 	'Call' => '呼叫',
-	'No extension' => '沒有 擴充模組',
+	'No extension' => '無擴充模組',
 	'None of the supported PHP extensions (%s) are available.' => '沒有任何支援的PHP擴充模組（%s）。',
 	'Session support must be enabled.' => 'Session 必須被啟用。',
 	'Session expired, please login again.' => 'Session 已過期，請重新登入。',
 	'Text length' => 'Text 長度',
-	'Foreign key has been dropped.' => '已刪除外鍵。',
-	'Foreign key has been altered.' => '已更改外鍵。',
-	'Foreign key has been created.' => '已建立外鍵。',
-	'Foreign key' => '外鍵',
+	'Foreign key has been dropped.' => '已刪除外來鍵。',
+	'Foreign key has been altered.' => '已修改外來鍵。',
+	'Foreign key has been created.' => '已建立外來鍵。',
+	'Foreign key' => '外來鍵',
 	'Target table' => '目標資料表',
-	'Change' => '更改',
+	'Change' => '修改',
 	'Source' => '來源',
 	'Target' => '目標',
 	'Add column' => '新增資料列',
-	'Alter' => '更改',
-	'Add foreign key' => '新增外鍵',
+	'Alter' => '修改',
+	'Add foreign key' => '新增外來鍵',
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => '索引類型',
 	'Column (length)' => '列（長度）',
-	'View has been dropped.' => '已丟棄檢視表。',
-	'View has been altered.' => '已更改檢視表。',
+	'View has been dropped.' => '已刪除檢視表。',
+	'View has been altered.' => '已修改檢視表。',
 	'View has been created.' => '已建立檢視表。',
-	'Alter view' => '更改檢視表',
+	'Alter view' => '修改檢視表',
 	'Create view' => '建立檢視表',
 	'Name' => '名稱',
-	'Process list' => '進程列表',
+	'Process list' => '處理程序列表',
 	'%d process(es) have been killed.' => '%d 個 Process(es) 被終止',
 	'Kill' => '終止',
 	'Parameter name' => '參數名稱',
 	'Database schema' => '資料庫架構',
 	'Create procedure' => '建立預存程序',
 	'Create function' => '建立函數',
-	'Routine has been dropped.' => '已丟棄程序。',
-	'Routine has been altered.' => '已更改子程序。',
+	'Routine has been dropped.' => '已刪除程序。',
+	'Routine has been altered.' => '已修改子程序。',
 	'Routine has been created.' => '已建立子程序。',
-	'Alter function' => '更改函數',
-	'Alter procedure' => '更改過程',
-	'Return type' => '返回類型',
+	'Alter function' => '修改函數',
+	'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' => '更改觸發器',
+	'Alter trigger' => '修改觸發器',
 	'Create trigger' => '建立觸發器',
 	'Time' => '時間',
 	'Event' => '事件',
@@ -131,8 +128,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' => 'Hashed',
 	'Column' => '列',
@@ -152,18 +149,18 @@ $translations = array(
 	'Format' => '格式',
 	'Functions' => '函數',
 	'Aggregation' => '集合',
-	'Event has been dropped.' => '已丟棄事件。',
-	'Event has been altered.' => '已更改事件。',
+	'Event has been dropped.' => '已刪除事件。',
+	'Event has been altered.' => '已修改事件。',
 	'Event has been created.' => '已建立事件。',
-	'Alter event' => '更改事件',
+	'Alter event' => '修改事件',
 	'Create event' => '建立事件',
 	'Start' => '開始',
 	'End' => '結束',
 	'Every' => '每',
 	'Status' => '狀態',
-	'On completion preserve' => '在完成後保存',
+	'On completion preserve' => '在完成後儲存',
 	'Events' => '事件',
-	'Schedule' => '調度',
+	'Schedule' => '排程',
 	'At given time' => '在指定時間',
 	'Tables have been truncated.' => '已清空資料表。',
 	'Tables have been moved.' => '已轉移資料表。',
@@ -175,49 +172,50 @@ $translations = array(
 	'Data Free' => '資料空閒',
 	'Rows' => '行數',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Analyze' => '分析',
-	'Optimize' => '優化',
+	'Optimize' => '最佳化',
 	'Check' => '檢查',
 	'Repair' => '修復',
 	'Truncate' => '清空',
 	'Move to other database' => '轉移到其它資料庫',
 	'Move' => '轉移',
-	'Save and continue edit' => '保存並繼續編輯',
+	'Save and continue edit' => '儲存並繼續編輯',
 	'original' => '原始',
 	'%d item(s) have been affected.' => '%d個項目受到影響。',
 	'whole result' => '所有結果',
-	'Tables have been dropped.' => '已丟棄表。',
+	'Tables have been dropped.' => '已經將資料表刪除。',
 	'Clone' => '複製',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => '超過最多允許的字段數量。請增加%s和%s 。',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => '超過允許的字段數量的最大值。請增加%s。',
 	'Partition by' => '分區類型',
 	'Partitions' => '分區',
-	'Partition name' => '分區名',
+	'Partition name' => '分區名稱',
 	'Values' => '值',
-	'%d row(s) have been imported.' => '%d行已導入。',
+	'%d row(s) have been imported.' => '已匯入%d行。',
 	'anywhere' => '任意位置',
 	'Import' => '匯入',
 	'Stop on error' => '出錯時停止',
 	'%.3f s' => '%.3f秒',
 	'$1-$3-$5' => '$1.$3.$5',
 	'[yyyy]-mm-dd' => '[yyyy].mm.dd',
-	'History' => '歷史',
+	'History' => '紀錄',
 	'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.' => '源列和目標列必須具有相同的數據類型，在目標列上必須有一個索引並且引用的數據必須存在。',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => '來源列和目標列必須具有相同的資料類型，在目標列上必須有一個索引並且引用的資料必須存在。',
 	'Relations' => '關聯',
 	'Run file' => '執行檔案',
 	'Clear' => '清除',
 	'Maximum allowed file size is %sB.' => '允許的檔案上限大小為%sB',
 	'Numbers' => '數字',
 	'Date and time' => '日期時間',
-	'Strings' => '字符串',
-	'Binary' => '二進制',
+	'Strings' => '字串',
+	'Binary' => '二進位',
 	'Lists' => '列表',
 	'Editor' => '編輯器',
 	'E-mail' => '電子郵件',
 	'From' => '來自',
-	'Subject' => '主題',
-	'Send' => '發送',
-	'%d e-mail(s) have been sent.' => '已發送 %d 封郵件。',
+	'Subject' => '主旨',
+	'Send' => '寄出',
+	'%d e-mail(s) have been sent.' => '已寄出 %d 封郵件。',
 	'Webserver file %s' => '網頁伺服器檔案 %s',
 	'File does not exist.' => '檔案不存在',
 	'Item has been deleted.' => '該項目已被刪除',
@@ -226,31 +224,29 @@ $translations = array(
 	'Table has been dropped.' => '已經刪除資料表。',
 	'Databases have been dropped.' => '資料庫已刪除。',
 	'Search data in tables' => '在資料庫搜尋',
-	'schema' => '資料表結構',
 	'Schema' => '資料表結構',
-	'Alter schema' => '更改資料表結構',
+	'Alter schema' => '修改資料表結構',
 	'Create schema' => '建立資料表結構',
 	'Schema has been dropped.' => '已刪除資料表結構。',
 	'Schema has been created.' => '已建立資料表結構。',
-	'Schema has been altered.' => '已更改資料表結構。',
-	'Sequences' => 'Sequences',
-	'Create sequence' => '建立 sequence',
-	'Alter sequence' => '更改 sequence',
-	'Sequence has been dropped.' => '已刪除 sequence。',
-	'Sequence has been created.' => '已建立 sequence。',
-	'Sequence has been altered.' => '已更改 sequence。',
+	'Schema has been altered.' => '已修改資料表結構。',
+	'Sequences' => '序列',
+	'Create sequence' => '建立序列',
+	'Alter sequence' => '修改序列',
+	'Sequence has been dropped.' => '已刪除序列。',
+	'Sequence has been created.' => '已建立序列。',
+	'Sequence has been altered.' => '已修改序列。',
 	'User types' => '使用者類型',
 	'Create type' => '建立類型',
-	'Alter type' => '更改類型',
+	'Alter type' => '修改類型',
 	'Type has been dropped.' => '已刪除類型。',
 	'Type has been created.' => '已建立類型。',
-	'Double click on a value to modify it.' => '雙擊以進行修改。',
 	'Use edit link to modify this value.' => '使用編輯連結來修改。',
 	'last' => '最後一頁',
 	'From server' => '從伺服器',
 	'System' => '資料庫系統',
 	'Select data' => '選擇資料',
-	'Show structure' => '秀出結構',
+	'Show structure' => '顯示結構',
 	'empty' => '空值',
 	'Network' => '網路',
 	'Geometry' => '幾何',
@@ -258,15 +254,14 @@ $translations = array(
 	'Attachments' => '附件',
 	'%d query(s) executed OK.' => '已順利執行 %d 個查詢。',
 	'Show only errors' => '僅顯示錯誤訊息',
-	'Last page' => '最後一頁',
 	'Refresh' => '重新載入',
 	'Invalid schema.' => '無效的資料表結構。',
-	'Please use one of the extensions %s.' => '請使用下列其中一個 extension %s。',
+	'Please use one of the extensions %s.' => '請使用下列其中一個擴充模組 %s。',
 	'now' => '現在',
 	'ltr' => 'ltr',
-	'Tables have been copied.' => '表格已經複製',
+	'Tables have been copied.' => '資料表已經複製',
 	'Copy' => '複製',
-	'Permanent link' => '永久鏈接',
+	'Permanent link' => '永久連結',
 	'Edit all' => '編輯全部',
 	'HH:MM:SS' => 'HH:MM:SS',
 );

adminer/lang/zh.inc.php

@@ -8,36 +8,33 @@ $translations = array(
 	'Password' => '密码',
 	'Select database' => '选择数据库',
 	'Invalid database.' => '无效数据库。',
-	'Create new database' => '创建新数据库',
-	'Table has been dropped.' => '已丢弃表。',
-	'Table has been altered.' => '已更改表。',
+	'Table has been dropped.' => '已删除表。',
+	'Table has been altered.' => '已修改表。',
 	'Table has been created.' => '已创建表。',
-	'Alter table' => '更改表',
+	'Alter table' => '修改表',
 	'Create table' => '创建表',
 	'Table name' => '表名',
 	'engine' => '引擎',
 	'collation' => '校对',
-	'Column name' => '列名',
+	'Column name' => '字段名',
 	'Type' => '类型',
 	'Length' => '长度',
 	'Auto Increment' => '自动增量',
 	'Options' => '选项',
 	'Save' => '保存',
-	'Drop' => '丢弃',
-	'Database has been dropped.' => '已丢弃数据库。',
+	'Drop' => '删除',
+	'Database has been dropped.' => '已删除数据库。',
 	'Database has been created.' => '已创建数据库。',
 	'Database has been renamed.' => '已重命名数据库。',
-	'Database has been altered.' => '已更改数据库。',
-	'Alter database' => '更改数据库',
+	'Database has been altered.' => '已修改数据库。',
+	'Alter database' => '修改数据库',
 	'Create database' => '创建数据库',
 	'SQL command' => 'SQL命令',
-	'Dump' => '导出',
 	'Logout' => '注销',
 	'database' => '数据库',
 	'Use' => '使用',
 	'No tables.' => '没有表。',
 	'select' => '选择',
-	'Create new table' => '创建新表',
 	'Item has been deleted.' => '已删除项目。',
 	'Item has been updated.' => '已更新项目。',
 	'Item%s has been inserted.' => '已插入项目%s。',
@@ -47,22 +44,22 @@ $translations = array(
 	'Delete' => '删除',
 	'Database' => '数据库',
 	'Routines' => '子程序',
-	'Indexes have been altered.' => '已更改索引。',
+	'Indexes have been altered.' => '已修改索引。',
 	'Indexes' => '索引',
-	'Alter indexes' => '更改索引',
-	'Add next' => '添加下一个',
+	'Alter indexes' => '修改索引',
+	'Add next' => '下一行插入',
 	'Language' => '语言',
 	'Select' => '选择',
-	'New item' => '新建项',
+	'New item' => '新建数据',
 	'Search' => '搜索',
 	'Sort' => '排序',
 	'descending' => '降序',
-	'Limit' => '限定',
-	'No rows.' => '没有行。',
+	'Limit' => '范围',
+	'No rows.' => '无数据。',
 	'Action' => '动作',
 	'edit' => '编辑',
 	'Page' => '页面',
-	'Query executed OK, %d row(s) affected.' => '执行查询OK，%d 行受影响。',
+	'Query executed OK, %d row(s) affected.' => '查询执行完毕，%d 行受影响。',
 	'Error in query' => '查询出错',
 	'Execute' => '执行',
 	'Table' => '表',
@@ -74,7 +71,7 @@ $translations = array(
 	'Comment' => '注释',
 	'Default values' => '默认值',
 	'%d byte(s)' => '%d 字节',
-	'No commands to execute.' => '没有命令执行。',
+	'No commands to execute.' => '没有命令被执行。',
 	'Unable to upload a file.' => '不能上传文件。',
 	'File upload' => '文件上传',
 	'File uploads are disabled.' => '文件上传被禁用。',
@@ -82,28 +79,28 @@ $translations = array(
 	'Call' => '调用',
 	'No extension' => '没有扩展',
 	'None of the supported PHP extensions (%s) are available.' => '没有支持的 PHP 扩展可用（%s）。',
-	'Session support must be enabled.' => '会话必须被启用。',
-	'Session expired, please login again.' => '会话已过期，请重新登录。',
-	'Text length' => '文本长度',
+	'Session support must be enabled.' => 'Session 必须被启用。',
+	'Session expired, please login again.' => 'Session 已过期，请重新登录。',
+	'Text length' => '文本显示限制',
 	'Foreign key has been dropped.' => '已删除外键。',
-	'Foreign key has been altered.' => '已更改外键。',
+	'Foreign key has been altered.' => '已修改外键。',
 	'Foreign key has been created.' => '已创建外键。',
 	'Foreign key' => '外键',
 	'Target table' => '目标表',
-	'Change' => '更改',
+	'Change' => '修改',
 	'Source' => '源',
 	'Target' => '目标',
 	'Add column' => '增加列',
-	'Alter' => '更改',
+	'Alter' => '修改',
 	'Add foreign key' => '添加外键',
 	'ON DELETE' => 'ON DELETE',
 	'ON UPDATE' => 'ON UPDATE',
 	'Index Type' => '索引类型',
 	'Column (length)' => '列（长度）',
-	'View has been dropped.' => '已丢弃视图。',
-	'View has been altered.' => '已更改视图。',
+	'View has been dropped.' => '已删除视图。',
+	'View has been altered.' => '已修改视图。',
 	'View has been created.' => '已创建视图。',
-	'Alter view' => '更改视图',
+	'Alter view' => '修改视图',
 	'Create view' => '创建视图',
 	'Name' => '名称',
 	'Process list' => '进程列表',
@@ -113,35 +110,35 @@ $translations = array(
 	'Database schema' => '数据库概要',
 	'Create procedure' => '创建过程',
 	'Create function' => '创建函数',
-	'Routine has been dropped.' => '已丢弃子程序。',
-	'Routine has been altered.' => '已更改子程序。',
+	'Routine has been dropped.' => '已删除子程序。',
+	'Routine has been altered.' => '已修改子程序。',
 	'Routine has been created.' => '已创建子程序。',
-	'Alter function' => '更改函数',
-	'Alter procedure' => '更改过程',
+	'Alter function' => '修改函数',
+	'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' => '更改触发器',
+	'Alter trigger' => '修改触发器',
 	'Create trigger' => '创建触发器',
 	'Time' => '时间',
 	'Event' => '事件',
-	'%s version: %s through PHP extension %s' => '%s 版本：%s 通过 PHP 扩展 %s',
+	'%s version: %s through PHP extension %s' => '%s 版本：%s， 使用PHP扩展 %s',
 	'%d row(s)' => '%d 行',
 	'Remove' => '移除',
 	'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' => 'Hashed',
 	'Column' => '列',
 	'Routine' => '子程序',
 	'Grant' => '授权',
 	'Revoke' => '废除',
-	'Logged as: %s' => '登录为：%s',
+	'Logged as: %s' => '登录用户：%s',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => '太大的 POST 数据。减少数据或者增加 %s 配置命令。',
 	'Move up' => '上移',
 	'Move down' => '下移',
@@ -154,10 +151,10 @@ $translations = array(
 	'Format' => '格式',
 	'Functions' => '函数',
 	'Aggregation' => '集合',
-	'Event has been dropped.' => '已丢弃事件。',
-	'Event has been altered.' => '已更改事件。',
+	'Event has been dropped.' => '已删除事件。',
+	'Event has been altered.' => '已修改事件。',
 	'Event has been created.' => '已创建事件。',
-	'Alter event' => '更改事件',
+	'Alter event' => '修改事件',
 	'Create event' => '创建事件',
 	'Start' => '开始',
 	'End' => '结束',
@@ -177,6 +174,7 @@ $translations = array(
 	'Data Free' => '数据空闲',
 	'Rows' => '行数',
 	',' => ',',
+	'0123456789' => '0123456789',
 	'Analyze' => '分析',
 	'Optimize' => '优化',
 	'Check' => '检查',
@@ -188,9 +186,9 @@ $translations = array(
 	'original' => '原始',
 	'%d item(s) have been affected.' => '%d 个项目受到影响。',
 	'whole result' => '所有结果',
-	'Tables have been dropped.' => '已丢弃表。',
-	'Clone' => '克隆',
-	'Maximum number of allowed fields exceeded. Please increase %s and %s.' => '超过最多允许的字段数量。请增加 %s 和 %s 。',
+	'Tables have been dropped.' => '已删除表。',
+	'Clone' => '复制',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => '超过最多允许的字段数量。请增加 %s。',
 	'Partition by' => '分区类型',
 	'Partitions' => '分区',
 	'Partition name' => '分区名',
@@ -224,27 +222,25 @@ $translations = array(
 	'File does not exist.' => '文件不存在。',
 	'%d in total' => '共计 %d',
 	'Permanent login' => '保持登录',
-	'Databases have been dropped.' => '已丢弃数据库。',
+	'Databases have been dropped.' => '已删除数据库。',
 	'Search data in tables' => '在表中搜索数据',
-	'schema' => '模式',
 	'Schema' => '模式',
-	'Alter schema' => '更改模式',
+	'Alter schema' => '修改模式',
 	'Create schema' => '创建模式',
-	'Schema has been dropped.' => '已丢弃模式。',
+	'Schema has been dropped.' => '已删除模式。',
 	'Schema has been created.' => '已创建模式。',
-	'Schema has been altered.' => '已更改模式。',
+	'Schema has been altered.' => '已修改模式。',
 	'Sequences' => '序列',
 	'Create sequence' => '创建序列',
-	'Alter sequence' => '更改序列',
-	'Sequence has been dropped.' => '已丢弃序列。',
+	'Alter sequence' => '修改序列',
+	'Sequence has been dropped.' => '已删除序列。',
 	'Sequence has been created.' => '已创建序列。',
-	'Sequence has been altered.' => '已更改序列。',
+	'Sequence has been altered.' => '已修改序列。',
 	'User types' => '用户类型',
 	'Create type' => '创建类型',
-	'Alter type' => '更改类型',
-	'Type has been dropped.' => '已丢弃类型。',
+	'Alter type' => '修改类型',
+	'Type has been dropped.' => '已删除类型。',
 	'Type has been created.' => '已创建类型。',
-	'Double click on a value to modify it.' => '在值上双击类修改它。',
 	'Use edit link to modify this value.' => '使用编辑链接来修改该值。',
 	'last' => '最后',
 	'From server' => '来自服务器',
@@ -258,7 +254,6 @@ $translations = array(
 	'Attachments' => '附件',
 	'%d query(s) executed OK.' => '%d 条查询已成功执行。',
 	'Show only errors' => '仅显示错误',
-	'Last page' => '末页',
 	'Refresh' => '刷新',
 	'Invalid schema.' => '非法模式。',
 	'Please use one of the extensions %s.' => '请使用这些扩展中的一个：%s。',

adminer/plugin.php

@@ -11,13 +11,17 @@ function adminer_object() {
 	$plugins = array(
 		// specify enabled plugins here
 		new AdminerDatabaseHide(array('information_schema')),
+		new AdminerDumpJson,
+		new AdminerDumpBz2,
 		new AdminerDumpZip,
 		new AdminerDumpXml,
+		new AdminerDumpAlter,
 		//~ new AdminerSqlLog("past-" . rtrim(`git describe --tags --abbrev=0`) . ".sql"),
 		//~ new AdminerEditCalendar("<script type='text/javascript' src='../externals/jquery-ui/jquery-1.4.4.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.core.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.widget.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.datepicker.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.mouse.js'></script>\n<script type='text/javascript' src='../externals/jquery-ui/ui/jquery.ui.slider.js'></script>\n<script type='text/javascript' src='../externals/jquery-timepicker/jquery-ui-timepicker-addon.js'></script>\n<link rel='stylesheet' href='../externals/jquery-ui/themes/base/jquery.ui.all.css'>\n<style type='text/css'>\n.ui-timepicker-div .ui-widget-header { margin-bottom: 8px; }\n.ui-timepicker-div dl { text-align: left; }\n.ui-timepicker-div dl dt { height: 25px; }\n.ui-timepicker-div dl dd { margin: -25px 0 10px 65px; }\n.ui-timepicker-div td { font-size: 90%; }\n</style>\n", "../externals/jquery-ui/ui/i18n/jquery.ui.datepicker-%s.js"),
 		//~ new AdminerTinymce("../externals/tinymce/jscripts/tiny_mce/tiny_mce_dev.js"),
 		//~ new AdminerWymeditor(array("../externals/wymeditor/src/jquery/jquery.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.explorer.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.mozilla.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.opera.js", "../externals/wymeditor/src/wymeditor/jquery.wymeditor.safari.js")),
 		new AdminerFileUpload(""),
+		new AdminerJsonColumn,
 		new AdminerSlugify,
 		new AdminerTranslation,
 		new AdminerForeignSystem,

adminer/privileges.inc.php

@@ -1,25 +1,29 @@
 <?php
 page_header(lang('Privileges'));
 
+echo '<p class="links"><a href="' . h(ME) . 'user=">' . lang('Create user') . "</a>";
+
 $result = $connection->query("SELECT User, Host FROM mysql." . (DB == "" ? "user" : "db WHERE " . q(DB) . " LIKE Db") . " ORDER BY Host, User");
 $grant = $result;
 if (!$result) {
 	// list logged user, information_schema.USER_PRIVILEGES lists just the current user too
 	$result = $connection->query("SELECT SUBSTRING_INDEX(CURRENT_USER, '@', 1) AS User, SUBSTRING_INDEX(CURRENT_USER, '@', -1) AS Host");
 }
+
 echo "<form action=''><p>\n";
 hidden_fields_get();
 echo "<input type='hidden' name='db' value='" . h(DB) . "'>\n";
 echo ($grant ? "" : "<input type='hidden' name='grant' value=''>\n");
 echo "<table cellspacing='0'>\n";
 echo "<thead><tr><th>" . lang('Username') . "<th>" . lang('Server') . "<th>&nbsp;</thead>\n";
+
 while ($row = $result->fetch_assoc()) {
 	echo '<tr' . odd() . '><td>' . h($row["User"]) . "<td>" . h($row["Host"]) . '<td><a href="' . h(ME . 'user=' . urlencode($row["User"]) . '&host=' . urlencode($row["Host"])) . '">' . lang('Edit') . "</a>\n";
 }
+
 if (!$grant || DB != "") {
-	echo "<tr" . odd() . "><td><input name='user'><td><input name='host' value='localhost'><td><input type='submit' value='" . lang('Edit') . "'>\n";
+	echo "<tr" . odd() . "><td><input name='user' autocapitalize='off'><td><input name='host' value='localhost' autocapitalize='off'><td><input type='submit' value='" . lang('Edit') . "'>\n";
 }
+
 echo "</table>\n";
 echo "</form>\n";
-
-echo '<p><a href="' . h(ME) . 'user=">' . lang('Create user') . "</a>";

adminer/procedure.inc.php

@@ -1,47 +1,42 @@
 <?php
 $PROCEDURE = $_GET["procedure"];
 $routine = (isset($_GET["function"]) ? "FUNCTION" : "PROCEDURE");
-$routine_languages = routine_languages();
+$row = $_POST;
+$row["fields"] = (array) $row["fields"];
 
-$dropped = false;
-if ($_POST && !$error && !$_POST["add"] && !$_POST["drop_col"] && !$_POST["up"] && !$_POST["down"]) {
-	$set = array();
-	$fields = (array) $_POST["fields"];
-	ksort($fields); // enforce fields order
-	foreach ($fields as $field) {
-		if ($field["field"] != "") {
-			$set[] = (ereg("^($inout)\$", $field["inout"]) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
-		}
-	}
-	$dropped = drop_create(
+if ($_POST && !process_fields($row["fields"]) && !$error) {
+	$temp_name = "$row[name]_adminer_" . uniqid();
+	drop_create(
 		"DROP $routine " . idf_escape($PROCEDURE),
-		"CREATE $routine " . idf_escape(trim($_POST["name"])) . " (" . implode(", ", $set) . ")" . (isset($_GET["function"]) ? " RETURNS" . process_type($_POST["returns"], "CHARACTER SET") : "") . (in_array($_POST["language"], $routine_languages) ? " LANGUAGE $_POST[language]" : "") . rtrim("\n$_POST[definition]", ";") . ";",
+		create_routine($routine, $row),
+		"DROP $routine " . idf_escape($row["name"]),
+		create_routine($routine, array("name" => $temp_name) + $row),
+		"DROP $routine " . idf_escape($temp_name),
 		substr(ME, 0, -1),
 		lang('Routine has been dropped.'),
 		lang('Routine has been altered.'),
 		lang('Routine has been created.'),
-		$PROCEDURE
+		$PROCEDURE,
+		$row["name"]
 	);
 }
 
 page_header(($PROCEDURE != "" ? (isset($_GET["function"]) ? lang('Alter function') : lang('Alter procedure')) . ": " . h($PROCEDURE) : (isset($_GET["function"]) ? lang('Create function') : lang('Create procedure'))), $error);
 
-$collations = get_vals("SHOW CHARACTER SET");
-sort($collations);
-$row = array("fields" => array());
-if ($_POST) {
-	$row = $_POST;
-	$row["fields"] = (array) $row["fields"];
-	process_fields($row["fields"]);
-} elseif ($PROCEDURE != "") {
+if (!$_POST && $PROCEDURE != "") {
 	$row = routine($PROCEDURE, $routine);
 	$row["name"] = $PROCEDURE;
 }
+
+$collations = get_vals("SHOW CHARACTER SET");
+sort($collations);
+$routine_languages = routine_languages();
 ?>
 
 <form action="" method="post" id="form">
-<p><?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" maxlength="64">
+<p><?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" maxlength="64" autocapitalize="off">
 <?php echo ($routine_languages ? lang('Language') . ": " . html_select("language", $routine_languages, $row["language"]) : ""); ?>
+<input type="submit" value="<?php echo lang('Save'); ?>">
 <table cellspacing="0" class="nowrap">
 <?php
 edit_fields($row["fields"], $collations, $routine);
@@ -55,6 +50,5 @@ if (isset($_GET["function"])) {
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php if ($PROCEDURE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
-<?php if ($dropped) { ?><input type="hidden" name="dropped" value="1"><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

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 (kill_process($val)) {
 			$killed++;
 		}
 	}
@@ -13,21 +13,30 @@ page_header(lang('Process list'), $error);
 ?>
 
 <form action="" method="post">
-<table cellspacing="0" onclick="tableClick(event);" class="nowrap checkable">
+<table cellspacing="0" onclick="tableClick(event);" ondblclick="tableClick(event, true);" class="nowrap checkable">
 <?php
 // HTML valid because there is always at least one process
 $i = -1;
 foreach (process_list() as $i => $row) {
+
 	if (!$i) {
-		echo "<thead><tr lang='en'>" . (support("kill") ? "<th>&nbsp;" : "") . "<th>" . implode("<th>", array_keys($row)) . "</thead>\n";
+		echo "<thead><tr lang='en'>" . (support("kill") ? "<th>&nbsp;" : "");
+		foreach ($row as $key => $val) {
+			echo "<th>$key" . doc_link(array(
+				'sql' => "show-processlist.html#processlist_" . strtolower($key),
+				'pgsql' => "monitoring-stats.html#PG-STAT-ACTIVITY-VIEW",
+				'oracle' => "../b14237/dynviews_2088.htm",
+			));
+		}
+		echo "</thead>\n";
 	}
-	echo "<tr" . odd() . ">" . (support("kill") ? "<td>" . checkbox("kill[]", $row["Id"], 0) : "");
+	echo "<tr" . odd() . ">" . (support("kill") ? "<td>" . checkbox("kill[]", $row[$jush == "sql" ? "Id" : "pid"], 0) : "");
 	foreach ($row as $key => $val) {
 		echo "<td>" . (
-			($jush == "sql" && $key == "Info" && ereg("Query|Killed", $row["Command"]) && $val != "") ||
+			($jush == "sql" && $key == "Info" && preg_match("~Query|Killed~", $row["Command"]) && $val != "") ||
 			($jush == "pgsql" && $key == "current_query" && $val != "<IDLE>") ||
 			($jush == "oracle" && $key == "sql_text" && $val != "")
-			? "<code class='jush-$jush'>" . shorten_utf8($val, 100, "</code>") . ' <a href="' . h(ME . ($row["db"] != "" ? "db=" . urlencode($row["db"]) . "&" : "") . "sql=" . urlencode($val)) . '">' . lang('Edit') . '</a>'
+			? "<code class='jush-$jush'>" . shorten_utf8($val, 100, "</code>") . ' <a href="' . h(ME . ($row["db"] != "" ? "db=" . urlencode($row["db"]) . "&" : "") . "sql=" . urlencode($val)) . '">' . lang('Clone') . '</a>'
 			: nbsp($val)
 		);
 	}
@@ -39,7 +48,7 @@ foreach (process_list() as $i => $row) {
 <p>
 <?php
 if (support("kill")) {
-	echo ($i + 1) . "/" . lang('%d in total', $connection->result("SELECT @@max_connections"));
+	echo ($i + 1) . "/" . lang('%d in total', max_connections());
 	echo "<p><input type='submit' value='" . lang('Kill') . "'>\n";
 }
 ?>

adminer/replication.inc.php

@@ -0,0 +1,30 @@
+<?php
+page_header(lang('Replication'));
+
+echo "<h3>" . lang('Master status') . doc_link(array("sql" => "show-master-status.html")) . "</h3>\n";
+$master_replication_status = replication_status("MASTER");
+if (!$master_replication_status) {
+	echo "<p class='message'>" . lang('No rows.') . "\n";
+} else {
+	echo "<table cellspacing='0'>\n";
+	foreach ($master_replication_status[0] as $key => $val) {
+		echo "<tr>";
+		echo "<th>" . h($key);
+		echo "<td>" . nbsp($val);
+	}
+	echo "</table>\n";
+}
+
+$slave_replication_status = replication_status("SLAVE");
+if ($slave_replication_status) {
+	echo "<h3>" . lang('Slave status') . doc_link(array("sql" => "show-slave-status.html")) . "</h3>\n";
+	foreach ($slave_replication_status[0] as $slave) {
+		echo "<table cellspacing='0'>\n";
+		foreach ($slave as $key => $val) {
+			echo "<tr>";
+			echo "<th>" . h($key);
+			echo "<td>" . nbsp($val);
+		}
+		echo "</table>\n";
+	}
+}

adminer/schema.inc.php

@@ -1,10 +1,9 @@
 <?php
-page_header(lang('Database schema'), "", array(), DB . ($_GET["ns"] ? ".$_GET[ns]" : ""));
+page_header(lang('Database schema'), "", array(), h(DB . ($_GET["ns"] ? ".$_GET[ns]" : "")));
 
 $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]);
@@ -16,23 +15,23 @@ $base_left = -1;
 $schema = array(); // table => array("fields" => array(name => field), "pos" => array(top, left), "references" => array(table => array(left => array(source, target))))
 $referenced = array(); // target_table => array(table => array(left => target_column))
 $lefts = array(); // float => bool
-foreach (table_status() as $table_status) {
-	if (!isset($table_status["Engine"])) { // view
+foreach (table_status('', true) as $table => $table_status) {
+	if (is_view($table_status)) {
 		continue;
 	}
 	$pos = 0;
-	$schema[$table_status["Name"]]["fields"] = array();
-	foreach (fields($table_status["Name"]) as $name => $field) {
+	$schema[$table]["fields"] = array();
+	foreach (fields($table) as $name => $field) {
 		$pos += 1.25;
 		$field["pos"] = $pos;
-		$schema[$table_status["Name"]]["fields"][$name] = $field;
+		$schema[$table]["fields"][$name] = $field;
 	}
-	$schema[$table_status["Name"]]["pos"] = ($table_pos[$table_status["Name"]] ? $table_pos[$table_status["Name"]] : array($top, 0));
-	foreach ($adminer->foreignKeys($table_status["Name"]) as $val) {
+	$schema[$table]["pos"] = ($table_pos[$table] ? $table_pos[$table] : array($top, 0));
+	foreach ($adminer->foreignKeys($table) as $val) {
 		if (!$val["db"]) {
 			$left = $base_left;
-			if ($table_pos[$table_status["Name"]][1] || $table_pos[$val["table"]][1]) {
-				$left = min(floatval($table_pos[$table_status["Name"]][1]), floatval($table_pos[$val["table"]][1])) - 1;
+			if ($table_pos[$table][1] || $table_pos[$val["table"]][1]) {
+				$left = min(floatval($table_pos[$table][1]), floatval($table_pos[$val["table"]][1])) - 1;
 			} else {
 				$base_left -= .1;
 			}
@@ -40,12 +39,12 @@ foreach (table_status() as $table_status) {
 				// find free $left
 				$left -= .0001;
 			}
-			$schema[$table_status["Name"]]["references"][$val["table"]][(string) $left] = array($val["source"], $val["target"]);
-			$referenced[$val["table"]][$table_status["Name"]][(string) $left] = $val["target"];
+			$schema[$table]["references"][$val["table"]][(string) $left] = array($val["source"], $val["target"]);
+			$referenced[$val["table"]][$table][(string) $left] = $val["target"];
 			$lefts[(string) $left] = true;
 		}
 	}
-	$top = max($top, $schema[$table_status["Name"]]["pos"][0] + 2.5 + $pos);
+	$top = max($top, $schema[$table]["pos"][0] + 2.5 + $pos);
 }
 
 ?>
@@ -62,10 +61,12 @@ document.onmouseup = function (ev) {
 foreach ($schema as $name => $table) {
 	echo "<div class='table' style='top: " . $table["pos"][0] . "em; left: " . $table["pos"][1] . "em;' onmousedown='schemaMousedown(this, event);'>";
 	echo '<a href="' . h(ME) . 'table=' . urlencode($name) . '"><b>' . h($name) . "</b></a>";
+	
 	foreach ($table["fields"] as $field) {
 		$val = '<span' . type_class($field["type"]) . ' title="' . h($field["full_type"] . ($field["null"] ? " NULL" : '')) . '">' . h($field["field"]) . '</span>';
 		echo "<br>" . ($field["primary"] ? "<i>$val</i>" : $val);
 	}
+	
 	foreach ((array) $table["references"] as $target_name => $refs) {
 		foreach ($refs as $left => $ref) {
 			$left1 = $left - $table_pos[$name][1];
@@ -75,6 +76,7 @@ foreach ($schema as $name => $table) {
 			}
 		}
 	}
+	
 	foreach ((array) $referenced[$name] as $target_name => $refs) {
 		foreach ($refs as $left => $columns) {
 			$left1 = $left - $table_pos[$name][1];
@@ -84,8 +86,10 @@ foreach ($schema as $name => $table) {
 			}
 		}
 	}
+	
 	echo "\n</div>\n";
 }
+
 foreach ($schema as $name => $table) {
 	foreach ((array) $table["references"] as $target_name => $refs) {
 		foreach ($refs as $left => $ref) {
@@ -103,4 +107,4 @@ foreach ($schema as $name => $table) {
 }
 ?>
 </div>
-<p><a href="<?php echo h(ME . "schema=" . urlencode($SCHEMA)); ?>" id="schema-link"><?php echo lang('Permanent link'); ?></a>
+<p class="links"><a href="<?php echo h(ME . "schema=" . urlencode($SCHEMA)); ?>" id="schema-link"><?php echo lang('Permanent link'); ?></a>

adminer/scheme.inc.php

@@ -1,10 +1,12 @@
 <?php
+$row = $_POST;
+
 if ($_POST && !$error) {
 	$link = preg_replace('~ns=[^&]*&~', '', ME) . "ns=";
 	if ($_POST["drop"]) {
 		query_redirect("DROP SCHEMA " . idf_escape($_GET["ns"]), $link, lang('Schema has been dropped.'));
 	} else {
-		$name = trim($_POST["name"]);
+		$name = trim($row["name"]);
 		$link .= urlencode($name);
 		if ($_GET["ns"] == "") {
 			query_redirect("CREATE SCHEMA " . idf_escape($name), $link, lang('Schema has been created.'));
@@ -18,15 +20,14 @@ if ($_POST && !$error) {
 
 page_header($_GET["ns"] != "" ? lang('Alter schema') : lang('Create schema'), $error);
 
-$row = $_POST;
 if (!$row) {
-	$row = array("name" => $_GET["ns"]);
+	$row["name"] = $_GET["ns"];
 }
 ?>
 
 <form action="" method="post">
-<p><input id="name" name="name" value="<?php echo h($row["name"]); ?>">
-<script type='text/javascript'>document.getElementById('name').focus();</script>
+<p><input name="name" id="name" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
+<script type='text/javascript'>focus(document.getElementById('name'));</script>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if ($_GET["ns"] != "") {

adminer/script.inc.php

@@ -3,17 +3,16 @@ 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 $table_status) {
-		$id = js_escape($table_status["Name"]);
-		json_row("Comment-$id", nbsp($table_status["Comment"]));
+	foreach (table_status() as $name => $table_status) {
+		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

@@ -1,11 +1,11 @@
 <?php
 $TABLE = $_GET["select"];
-$table_status = table_status($TABLE);
+$table_status = table_status1($TABLE);
 $indexes = indexes($TABLE);
 $fields = fields($TABLE);
 $foreign_keys = column_foreign_keys($TABLE);
 $oid = "";
-if ($table_status["Oid"] == "t") {
+if ($table_status["Oid"]) {
 	$oid = ($jush == "sqlite" ? "rowid" : "oid");
 	$indexes[] = array("type" => "PRIMARY", "columns" => array($oid));
 }
@@ -17,8 +17,8 @@ $text_length = null;
 foreach ($fields as $key => $field) {
 	$name = $adminer->fieldName($field);
 	if (isset($field["privileges"]["select"]) && $name != "") {
-		$columns[$key] = html_entity_decode(strip_tags($name));
-		if (ereg('text|lob|geometry|point|linestring|polygon', $field["type"])) {
+		$columns[$key] = html_entity_decode(strip_tags($name), ENT_QUOTES);
+		if (is_shortable($field)) {
 			$text_length = $adminer->selectLengthProcess();
 		}
 	}
@@ -30,29 +30,35 @@ $is_group = count($group) < count($select);
 $where = $adminer->selectSearchProcess($fields, $indexes);
 $order = $adminer->selectOrderProcess($fields, $indexes);
 $limit = $adminer->selectLimitProcess();
-$from = ($select ? implode(", ", $select) : "*" . ($oid ? ", $oid" : ""));
-if ($jush == "sql") {
-	foreach ($columns as $key => $val) {
-		$as = convert_field($fields[$key]);
-		if ($as) {
-			$from .= ", $as AS " . idf_escape($key);
-		}
-	}
-}
-$from .= "\nFROM " . table($TABLE);
+$from = ($select ? implode(", ", $select) : "*" . ($oid ? ", $oid" : ""))
+	. convert_fields($columns, $fields, $select)
+	. "\nFROM " . table($TABLE);
 $group_by = ($group && $is_group ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : "");
 
 if ($_GET["val"] && is_ajax()) {
 	header("Content-Type: text/plain; charset=utf-8");
 	foreach ($_GET["val"] as $unique_idf => $row) {
 		$as = convert_field($fields[key($row)]);
-		echo $connection->result("SELECT" . limit(($as ? $as : idf_escape(key($row))) . " FROM " . table($TABLE), " WHERE " . where_check($unique_idf) . ($where ? " AND " . implode(" AND ", $where) : "") . ($order ? " ORDER BY " . implode(", ", $order) : ""), 1));
+		$select = array($as ? $as : idf_escape(key($row)));
+		$where[] = where_check($unique_idf, $fields);
+		$return = $driver->select($TABLE, $select, $where, $select);
+		if ($return) {
+			echo reset($return->fetch_row());
+		}
 	}
 	exit;
 }
 
 if ($_POST && !$error) {
-	$where_check = "(" . implode(") OR (", array_map('where_check', (array) $_POST["check"])) . ")";
+	$where_check = $where;
+	if (!$_POST["all"] && is_array($_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;
 	foreach ($indexes as $index) {
 		if ($index["type"] == "PRIMARY") {
@@ -66,63 +72,62 @@ if ($_POST && !$error) {
 			unset($unselected[$key]);
 		}
 	}
+
 	if ($_POST["export"]) {
 		cookie("adminer_import", "output=" . urlencode($_POST["output"]) . "&format=" . urlencode($_POST["format"]));
 		dump_headers($TABLE);
 		$adminer->dumpTable($TABLE, "");
 		if (!is_array($_POST["check"]) || $unselected === array()) {
-			$where2 = $where;
-			if (is_array($_POST["check"])) {
-				$where2[] = "($where_check)";
-			}
-			$query = "SELECT $from" . ($where2 ? "\nWHERE " . implode(" AND ", $where2) : "") . $group_by;
+			$query = "SELECT $from$where_check$group_by";
 		} else {
 			$union = array();
 			foreach ($_POST["check"] as $val) {
 				// where is not unique so OR can't be used
-				$union[] = "(SELECT" . limit($from, "\nWHERE " . ($where ? implode(" AND ", $where) . " AND " : "") . where_check($val) . $group_by, 1) . ")";
+				$union[] = "(SELECT" . limit($from, "\nWHERE " . ($where ? implode(" AND ", $where) . " AND " : "") . where_check($val, $fields) . $group_by, 1) . ")";
 			}
 			$query = implode(" UNION ALL ", $union);
 		}
 		$adminer->dumpData($TABLE, "table", $query);
 		exit;
 	}
+
 	if (!$adminer->selectEmailProcess($where, $foreign_keys)) {
 		if ($_POST["save"] || $_POST["delete"]) { // edit
 			$result = true;
 			$affected = 0;
-			$query = table($TABLE);
 			$set = array();
 			if (!$_POST["delete"]) {
 				foreach ($columns as $name => $val) { //! should check also for edit or insert privileges
 					$val = process_input($fields[$name]);
-					if ($val !== null) {
-						if ($_POST["clone"]) {
-							$set[idf_escape($name)] = ($val !== false ? $val : idf_escape($name));
-						} elseif ($val !== false) {
-							$set[] = idf_escape($name) . " = $val";
-						}
+					if ($val !== null && ($_POST["clone"] || $val !== false)) {
+						$set[idf_escape($name)] = ($val !== false ? $val : idf_escape($name));
 					}
 				}
-				$query .= ($_POST["clone"] ? " (" . implode(", ", array_keys($set)) . ")\nSELECT " . implode(", ", $set) . "\nFROM " . table($TABLE) : " SET\n" . implode(",\n", $set));
 			}
 			if ($_POST["delete"] || $set) {
-				$command = "UPDATE";
-				if ($_POST["delete"]) {
-					$command = "DELETE";
-					$query = "FROM $query";
-				}
 				if ($_POST["clone"]) {
-					$command = "INSERT";
-					$query = "INTO $query";
+					$query = "INTO " . table($TABLE) . " (" . implode(", ", array_keys($set)) . ")\nSELECT " . implode(", ", $set) . "\nFROM " . table($TABLE);
 				}
-				if ($_POST["all"] || ($unselected === array() && $_POST["check"]) || $is_group) {
-					$result = queries("$command $query" . ($_POST["all"] ? ($where ? "\nWHERE " . implode(" AND ", $where) : "") : "\nWHERE $where_check"));
+				if ($_POST["all"] || ($unselected === array() && is_array($_POST["check"])) || $is_group) {
+					$result = ($_POST["delete"]
+						? $driver->delete($TABLE, $where_check)
+						: ($_POST["clone"]
+							? queries("INSERT $query$where_check")
+							: $driver->update($TABLE, $set, $where_check)
+						)
+					);
 					$affected = $connection->affected_rows;
 				} else {
 					foreach ((array) $_POST["check"] as $val) {
 						// where is not unique so OR can't be used
-						$result = queries($command . limit1($query, "\nWHERE " . where_check($val)));
+						$where2 = "\nWHERE " . ($where ? implode(" AND ", $where) . " AND " : "") . where_check($val, $fields);
+						$result = ($_POST["delete"]
+							? $driver->delete($TABLE, $where2, 1)
+							: ($_POST["clone"]
+								? queries("INSERT" . limit1($query, $where2))
+								: $driver->update($TABLE, $set, $where2)
+							)
+						);
 						if (!$result) {
 							break;
 						}
@@ -137,11 +142,16 @@ if ($_POST && !$error) {
 					$message = lang('Item%s has been inserted.', " $last_id");
 				}
 			}
-			queries_redirect(remove_from_uri("page"), $message, $result);
-			//! display edit page in case of an error
+			queries_redirect(remove_from_uri($_POST["all"] && $_POST["delete"] ? "page" : ""), $message, $result);
+			if (!$_POST["delete"]) {
+				edit_form($TABLE, $fields, (array) $_POST["fields"], !$_POST["clone"]);
+				page_footer();
+				exit;
+			}
+
 		} elseif (!$_POST["import"]) { // modify
 			if (!$_POST["val"]) {
-				$error = lang('Double click on a value to modify it.');
+				$error = lang('Ctrl+click on a value to modify it.');
 			} else {
 				$result = true;
 				$affected = 0;
@@ -149,11 +159,15 @@ if ($_POST && !$error) {
 					$set = array();
 					foreach ($row as $key => $val) {
 						$key = bracket_escape($key, 1); // 1 - back
-						$set[] = idf_escape($key) . " = " . (ereg('char|text', $fields[$key]["type"]) || $val != "" ? $adminer->processInput($fields[$key], $val) : "NULL");
+						$set[idf_escape($key)] = (preg_match('~char|text~', $fields[$key]["type"]) || $val != "" ? $adminer->processInput($fields[$key], $val) : "NULL");
 					}
-					$query = table($TABLE) . " SET " . implode(", ", $set);
-					$where2 = " WHERE " . where_check($unique_idf) . ($where ? " AND " . implode(" AND ", $where) : "");
-					$result = queries("UPDATE" . ($is_group ? " $query$where2" : limit1($query, $where2))); // can change row on a different page without unique key
+					$result = $driver->update(
+						$TABLE,
+						$set,
+						" WHERE " . ($where ? implode(" AND ", $where) . " AND " : "") . where_check($unique_idf, $fields),
+						!($is_group || $unselected === array()),
+						" "
+					);
 					if (!$result) {
 						break;
 					}
@@ -161,17 +175,22 @@ if ($_POST && !$error) {
 				}
 				queries_redirect(remove_from_uri(), lang('%d item(s) have been affected.', $affected), $result);
 			}
-		} elseif (is_string($file = get_file("csv_file", true))) {
-			//! character set
+
+		} elseif (!is_string($file = get_file("csv_file", true))) {
+			$error = upload_error($file);
+		} elseif (!preg_match('~~u', $file)) {
+			$error = lang('File must be in UTF-8 encoding.');
+		} else {
 			cookie("adminer_import", "output=" . urlencode($adminer_import["output"]) . "&format=" . urlencode($_POST["separator"]));
 			$result = true;
 			$cols = array_keys($fields);
 			preg_match_all('~(?>"[^"]*"|[^"\\r\\n]+)+~', $file, $matches);
 			$affected = count($matches[0]);
-			begin();
+			$driver->begin();
 			$separator = ($_POST["separator"] == "csv" ? "," : ($_POST["separator"] == "tsv" ? "\t" : ";"));
+			$rows = array();
 			foreach ($matches[0] as $key => $val) {
-				preg_match_all("~((\"[^\"]*\")+|[^$separator]*)$separator~", $val . $separator, $matches2);
+				preg_match_all("~((?>\"[^\"]*\")+|[^$separator]*)$separator~", $val . $separator, $matches2);
 				if (!$key && !array_diff($matches2[1], $cols)) { //! doesn't work with column names containing ",\n
 					// first row corresponds to column names - use it for table structure
 					$cols = $matches2[1];
@@ -181,36 +200,34 @@ if ($_POST && !$error) {
 					foreach ($matches2[1] as $i => $col) {
 						$set[idf_escape($cols[$i])] = ($col == "" && $fields[$cols[$i]]["null"] ? "NULL" : q(str_replace('""', '"', preg_replace('~^"|"$~', '', $col))));
 					}
-					$result = insert_update($TABLE, $set, $primary);
-					if (!$result) {
-						break;
-					}
+					$rows[] = $set;
 				}
 			}
+			$result = (!$rows || $driver->insertUpdate($TABLE, $rows, $primary));
 			if ($result) {
-				queries("COMMIT");
+				$result = $driver->commit();
 			}
 			queries_redirect(remove_from_uri("page"), lang('%d row(s) have been imported.', $affected), $result);
-			queries("ROLLBACK"); // after queries_redirect() to not overwrite error
-		} else {
-			$error = upload_error($file);
+			$driver->rollback(); // after queries_redirect() to not overwrite error
+
 		}
 	}
 }
 
 $table_name = $adminer->tableName($table_status);
 if (is_ajax()) {
-	// needs to send headers
+	page_headers();
 	ob_start();
+} else {
+	page_header(lang('Select') . ": $table_name", $error);
 }
-page_header(lang('Select') . ": $table_name", $error);
 
 $set = null;
-if (isset($rights["insert"])) {
+if (isset($rights["insert"]) || !support("table")) {
 	$set = "";
 	foreach ((array) $_GET["where"] as $val) {
 		if (count($foreign_keys[$val["col"]]) == 1 && ($val["op"] == "="
-			|| (!$val["op"] && !ereg('[_%]', $val["val"])) // LIKE in Editor
+			|| (!$val["op"] && !preg_match('~[_%]~', $val["val"])) // LIKE in Editor
 		)) {
 			$set .= "&set" . urlencode("[" . bracket_escape($val["col"]) . "]") . "=" . urlencode($val["val"]);
 		}
@@ -218,7 +235,7 @@ if (isset($rights["insert"])) {
 }
 $adminer->selectLinks($table_status, $set);
 
-if (!$columns) {
+if (!$columns && support("table")) {
 	echo "<p class='error'>" . lang('Unable to select the table') . ($fields ? "." : ": " . error()) . "\n";
 } else {
 	echo "<form action='' id='form'>\n";
@@ -234,30 +251,30 @@ if (!$columns) {
 	$adminer->selectLengthPrint($text_length);
 	$adminer->selectActionPrint($indexes);
 	echo "</form>\n";
-	
+
 	$page = $_GET["page"];
 	if ($page == "last") {
-		$found_rows = $connection->result("SELECT COUNT(*) FROM " . table($TABLE) . ($where ? " WHERE " . implode(" AND ", $where) : ""));
+		$found_rows = $connection->result(count_rows($TABLE, $where, $is_group, $group));
 		$page = floor(max(0, $found_rows - 1) / $limit);
 	}
 
-	$query = $adminer->selectQueryBuild($select, $where, $group, $order, $limit, $page);
-	if (!$query) {
-		$query = "SELECT" . limit(
-			(+$limit && $group && $is_group && $jush == "sql" ? "SQL_CALC_FOUND_ROWS " : "") . $from,
-			($where ? "\nWHERE " . implode(" AND ", $where) : "") . $group_by,
-			($limit != "" ? +$limit : null),
-			($page ? $limit * $page : 0),
-			"\n"
-		);
+	$select2 = $select;
+	if (!$select2) {
+		$select2[] = "*";
+		if ($oid) {
+			$select2[] = $oid;
+		}
 	}
-	echo $adminer->selectQuery($query);
-	
-	$result = $connection->query($query);
+	$convert_fields = convert_fields($columns, $fields, $select);
+	if ($convert_fields) {
+		$select2[] = substr($convert_fields, 2);
+	}
+	$result = $driver->select($TABLE, $select2, $where, $group, $order, $limit, $page, true);
+
 	if (!$result) {
 		echo "<p class='error'>" . error() . "\n";
 	} else {
-		if ($jush == "mssql") {
+		if ($jush == "mssql" && $page) {
 			$result->seek($limit * $page);
 		}
 		$email_fields = array();
@@ -269,21 +286,19 @@ if (!$columns) {
 			}
 			$rows[] = $row;
 		}
+
 		// use count($rows) without LIMIT, COUNT(*) without grouping, FOUND_ROWS otherwise (slowest)
-		if ($_GET["page"] != "last") {
-			$found_rows = (+$limit && $group && $is_group
-				? ($jush == "sql" ? $connection->result(" SELECT FOUND_ROWS()") : $connection->result("SELECT COUNT(*) FROM ($query) x")) // space to allow mysql.trace_mode
-				: count($rows)
-			);
+		if ($_GET["page"] != "last" && +$limit && $group && $is_group && $jush == "sql") {
+			$found_rows = $connection->result(" SELECT FOUND_ROWS()"); // space to allow mysql.trace_mode
 		}
-		
+
 		if (!$rows) {
 			echo "<p class='message'>" . lang('No rows.') . "\n";
 		} else {
 			$backward_keys = $adminer->backwardKeys($TABLE, $table_name);
-			
-			echo "<table id='table' cellspacing='0' class='nowrap checkable' onclick='tableClick(event);' onkeydown='return editingKeydown(event);'>\n";
-			echo "<thead><tr>" . (!$group && $select ? "" : "<td><input type='checkbox' id='all-page' onclick='formCheck(this, /check/);'> <a href='" . h($_GET["modify"] ? remove_from_uri("modify") : $_SERVER["REQUEST_URI"] . "&modify=1") . "'>" . lang('edit') . "</a>");
+
+			echo "<table id='table' cellspacing='0' class='nowrap checkable' onclick='tableClick(event);' ondblclick='tableClick(event, true);' onkeydown='return editingKeydown(event);'>\n";
+			echo "<thead><tr>" . (!$group && $select ? "" : "<td><input type='checkbox' id='all-page' onclick='formCheck(this, /check/);' class='jsonly'> <a href='" . h($_GET["modify"] ? remove_from_uri("modify") : $_SERVER["REQUEST_URI"] . "&modify=1") . "'>" . lang('Modify') . "</a>");
 			$names = array();
 			$functions = array();
 			reset($select);
@@ -292,7 +307,7 @@ if (!$columns) {
 				if ($key != $oid) {
 					$val = $_GET["columns"][key($select)];
 					$field = $fields[$select ? ($val ? $val["col"] : current($select)) : $key];
-					$name = ($field ? $adminer->fieldName($field, $rank) : "*");
+					$name = ($field ? $adminer->fieldName($field, $rank) : ($val["fun"] ? "*" : $key));
 					if ($name != "") {
 						$rank++;
 						$names[$key] = $name;
@@ -301,7 +316,7 @@ if (!$columns) {
 						$desc = "&desc%5B0%5D=1";
 						echo '<th onmouseover="columnMouse(this);" onmouseout="columnMouse(this, \' hidden\');">';
 						echo '<a href="' . h($href . ($order[0] == $column || $order[0] == $key || (!$order && $is_group && $group[0] == $column) ? $desc : '')) . '">'; // $order[0] == $key - COUNT(*)
-						echo (!$select || $val ? apply_sql_function($val["fun"], $name) : h(current($select))) . "</a>"; //! columns looking like functions
+						echo apply_sql_function($val["fun"], $name) . "</a>"; //! columns looking like functions
 						echo "<span class='column hidden'>";
 						echo "<a href='" . h($href . $desc) . "' title='" . lang('descending') . "' class='text'> ↓</a>";
 						if (!$val["fun"]) {
@@ -313,6 +328,7 @@ if (!$columns) {
 					next($select);
 				}
 			}
+
 			$lengths = array();
 			if ($_GET["modify"]) {
 				foreach ($rows as $row) {
@@ -321,165 +337,202 @@ if (!$columns) {
 					}
 				}
 			}
+
 			echo ($backward_keys ? "<th>" . lang('Relations') : "") . "</thead>\n";
+
 			if (is_ajax()) {
 				if ($limit % 2 == 1 && $page % 2 == 1) {
 					odd();
 				}
 				ob_end_clean();
 			}
+
 			foreach ($adminer->rowDescriptions($rows, $foreign_keys) as $n => $row) {
 				$unique_array = unique_array($rows[$n], $indexes);
+				if (!$unique_array) {
+					$unique_array = array();
+					foreach ($rows[$n] as $key => $val) {
+						if (!preg_match('~^(COUNT\\((\\*|(DISTINCT )?`(?:[^`]|``)+`)\\)|(AVG|GROUP_CONCAT|MAX|MIN|SUM)\\(`(?:[^`]|``)+`\\))$~', $key)) { //! columns looking like functions
+							$unique_array[$key] = $val;
+						}
+					}
+				}
 				$unique_idf = "";
 				foreach ($unique_array as $key => $val) {
+					if (($jush == "sql" || $jush == "pgsql") && strlen($val) > 64) {
+						$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));
 				}
 				echo "<tr" . odd() . ">" . (!$group && $select ? "" : "<td>" . checkbox("check[]", substr($unique_idf, 1), in_array(substr($unique_idf, 1), (array) $_POST["check"]), "", "this.form['all'].checked = false; formUncheck('all-page');") . ($is_group || information_schema(DB) ? "" : " <a href='" . h(ME . "edit=" . urlencode($TABLE) . $unique_idf) . "'>" . lang('edit') . "</a>"));
+
 				foreach ($row as $key => $val) {
 					if (isset($names[$key])) {
 						$field = $fields[$key];
 						if ($val != "" && (!isset($email_fields[$key]) || $email_fields[$key] != "")) {
 							$email_fields[$key] = (is_mail($val) ? $names[$key] : ""); //! filled e-mails can be contained on other pages
 						}
+
 						$link = "";
-						$val = $adminer->editVal($val, $field);
-						if ($val !== null) {
-							if (ereg('blob|bytea|raw|file', $field["type"]) && $val != "") {
-								$link = h(ME . 'download=' . urlencode($TABLE) . '&field=' . urlencode($key) . $unique_idf);
-							}
-							if ($val === "") { // === - may be int
-								$val = "&nbsp;";
-							} elseif (is_utf8($val)) {
-								if ($text_length != "" && ereg('text|lob|geometry|point|linestring|polygon', $field["type"])) {
-									$val = shorten_utf8($val, 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 {
-									$val = h($val);
-								}
-							}
-							
-							if (!$link) { // link related items
-								foreach ((array) $foreign_keys[$key] as $foreign_key) {
-									if (count($foreign_keys[$key]) == 1 || end($foreign_key["source"]) == $key) {
-										$link = "";
-										foreach ($foreign_key["source"] as $i => $source) {
-											$link .= where_link($i, $foreign_key["target"][$i], $rows[$n][$source]);
-										}
-										$link = h(($foreign_key["db"] != "" ? preg_replace('~([?&]db=)[^&]+~', '\\1' . urlencode($foreign_key["db"]), ME) : ME) . 'select=' . urlencode($foreign_key["table"]) . $link); // InnoDB supports non-UNIQUE keys
-										if (count($foreign_key["source"]) == 1) {
-											break;
-										}
+						if (preg_match('~blob|bytea|raw|file~', $field["type"]) && $val != "") {
+							$link = ME . 'download=' . urlencode($TABLE) . '&field=' . urlencode($key) . $unique_idf;
+						}
+						if (!$link && $val !== null) { // link related items
+							foreach ((array) $foreign_keys[$key] as $foreign_key) {
+								if (count($foreign_keys[$key]) == 1 || end($foreign_key["source"]) == $key) {
+									$link = "";
+									foreach ($foreign_key["source"] as $i => $source) {
+										$link .= where_link($i, $foreign_key["target"][$i], $rows[$n][$source]);
+									}
+									$link = ($foreign_key["db"] != "" ? preg_replace('~([?&]db=)[^&]+~', '\\1' . urlencode($foreign_key["db"]), ME) : ME) . 'select=' . urlencode($foreign_key["table"]) . $link; // InnoDB supports non-UNIQUE keys
+									if ($foreign_key["ns"]) {
+										$link = preg_replace('~([?&]ns=)[^&]+~', '\\1' . urlencode($foreign_key["ns"]), $link);
+									}
+									if (count($foreign_key["source"]) == 1) {
+										break;
 									}
 								}
 							}
-							if ($key == "COUNT(*)") { //! columns looking like functions
-								$link = h(ME . "select=" . urlencode($TABLE));
-								$i = 0;
-								foreach ((array) $_GET["where"] as $v) {
-									if (!array_key_exists($v["col"], $unique_array)) {
-										$link .= h(where_link($i++, $v["col"], $v["val"], $v["op"]));
-									}
-								}
-								foreach ($unique_array as $k => $v) {
-									$link .= h(where_link($i++, $k, $v));
+						}
+						if ($key == "COUNT(*)") { //! columns looking like functions
+							$link = ME . "select=" . urlencode($TABLE);
+							$i = 0;
+							foreach ((array) $_GET["where"] as $v) {
+								if (!array_key_exists($v["col"], $unique_array)) {
+									$link .= where_link($i++, $v["col"], $v["val"], $v["op"]);
 								}
 							}
-						}
-						if (!$link) {
-							if (is_mail($val)) {
-								$link = "mailto:$val";
-							}
-							if ($protocol = is_url($row[$key])) {
-								$link = ($protocol == "http" && $HTTPS
-									? $row[$key] // HTTP links from HTTPS pages don't receive Referer automatically
-									: "$protocol://www.adminer.org/redirect/?url=" . urlencode($row[$key]) // intermediate page to hide Referer, may be changed to rel="noreferrer" in HTML5
-								);
+							foreach ($unique_array as $k => $v) {
+								$link .= where_link($i++, $k, $v);
 							}
 						}
+						
+						$val = select_value($val, $link, $field, $text_length);
 						$id = h("val[$unique_idf][" . bracket_escape($key) . "]");
 						$value = $_POST["val"][$unique_idf][bracket_escape($key)];
-						$h_value = h($value !== null ? $value : $row[$key]);
-						$long = strpos($val, "<i>...</i>");
-						$editable = is_utf8($val) && $rows[$n][$key] == $row[$key] && !$functions[$key];
-						$text = ereg('text|lob', $field["type"]);
-						echo (($_GET["modify"] && $editable) || $value !== null
-							? "<td>" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>")
-							: "<td id='$id' ondblclick=\"" . ($editable ? "selectDblClick(this, event" . ($long ? ", 2" : ($text ? ", 1" : "")) . ")" : "alert('" . h(lang('Use edit link to modify this value.')) . "')") . ";\">" . $adminer->selectVal($val, $link, $field)
-						);
+						$editable = !is_array($row[$key]) && is_utf8($val) && $rows[$n][$key] == $row[$key] && !$functions[$key];
+						$text = preg_match('~text|lob~', $field["type"]);
+						if (($_GET["modify"] && $editable) || $value !== null) {
+							$h_value = h($value !== null ? $value : $row[$key]);
+							echo "<td>" . ($text ? "<textarea name='$id' cols='30' rows='" . (substr_count($row[$key], "\n") + 1) . "'>$h_value</textarea>" : "<input name='$id' value='$h_value' size='$lengths[$key]'>");
+						} else {
+							$long = strpos($val, "<i>...</i>");
+							echo "<td id='$id' onclick=\"selectClick(this, event, " . ($long ? 2 : ($text ? 1 : 0)) . ($editable ? "" : ", '" . h(lang('Use edit link to modify this value.')) . "'") . ");\">$val";
+						}
 					}
 				}
+
 				if ($backward_keys) {
 					echo "<td>";
 				}
 				$adminer->backwardKeysPrint($backward_keys, $rows[$n]);
 				echo "</tr>\n"; // close to allow white-space: pre
 			}
+
 			if (is_ajax()) {
 				exit;
 			}
 			echo "</table>\n";
-			echo (!$group && $select ? "" : "<script type='text/javascript'>tableCheck();</script>\n");
 		}
-		
+
 		if (($rows || $page) && !is_ajax()) {
 			$exact_count = true;
-			if ($_GET["page"] != "last" && +$limit && !$is_group && ($found_rows >= $limit || $page)) {
-				$found_rows = found_rows($table_status, $where);
-				if ($found_rows < max(1e4, 2 * ($page + 1) * $limit)) {
-					// slow with big tables
-					$found_rows = reset(slow_query("SELECT COUNT(*) FROM " . table($TABLE) . ($where ? " WHERE " . implode(" AND ", $where) : "")));
-				} else {
-					$exact_count = false;
+			if ($_GET["page"] != "last") {
+				if (!+$limit) {
+					$found_rows = count($rows);
+				} elseif ($jush != "sql" || !$is_group) {
+					$found_rows = ($is_group ? false : found_rows($table_status, $where));
+					if ($found_rows < max(1e4, 2 * ($page + 1) * $limit)) {
+						// slow with big tables
+						$found_rows = reset(slow_query(count_rows($TABLE, $where, $is_group, $group)));
+					} else {
+						$exact_count = false;
+					}
 				}
 			}
-			echo "<p class='pages'>";
-			if (+$limit && ($found_rows === false || $found_rows > $limit)) {
+
+			if (+$limit && ($found_rows === false || $found_rows > $limit || $page)) {
+				echo "<p class='pages'>";
 				// display first, previous 4, next 4 and last page
 				$max_page = ($found_rows === false
 					? $page + (count($rows) >= $limit ? 2 : 1)
 					: floor(($found_rows - 1) / $limit)
 				);
-				echo '<a href="' . h(remove_from_uri("page")) . "\" onclick=\"pageClick(this.href, +prompt('" . lang('Page') . "', '" . ($page + 1) . "'), event); return false;\">" . lang('Page') . "</a>:";
-				echo pagination(0, $page) . ($page > 5 ? " ..." : "");
-				for ($i = max(1, $page - 4); $i < min($max_page, $page + 5); $i++) {
-					echo pagination($i, $page);
+				if ($jush != "simpledb") {
+					echo '<a href="' . h(remove_from_uri("page")) . "\" onclick=\"pageClick(this.href, +prompt('" . lang('Page') . "', '" . ($page + 1) . "'), event); return false;\">" . lang('Page') . "</a>:";
+					echo pagination(0, $page) . ($page > 5 ? " ..." : "");
+					for ($i = max(1, $page - 4); $i < min($max_page, $page + 5); $i++) {
+						echo pagination($i, $page);
+					}
+					if ($max_page > 0) {
+						echo ($page + 5 < $max_page ? " ..." : "");
+						echo ($exact_count && $found_rows !== false
+							? pagination($max_page, $page)
+							: " <a href='" . h(remove_from_uri("page") . "&page=last") . "' title='~$max_page'>" . lang('last') . "</a>"
+						);
+					}
+					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') . '...\');" class="loadmore">' . lang('Load more data') . '</a>'
+						: ''
+					);
+				} else {
+					echo lang('Page') . ":";
+					echo pagination(0, $page) . ($page > 1 ? " ..." : "");
+					echo ($page ? pagination($page, $page) : "");
+					echo ($max_page > $page ? pagination($page + 1, $page) . ($max_page > $page + 1 ? " ..." : "") : "");
 				}
-				echo ($page + 5 < $max_page ? " ..." : "") . ($exact_count && $found_rows !== false ? pagination($max_page, $page) : ' <a href="' . h(remove_from_uri("page") . "&page=last") . '">' . lang('last') . "</a>");
 			}
-			echo ($found_rows !== false ? " (" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ")" : "");
-			echo (+$limit && ($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>' : '');
-			echo " " . checkbox("all", 1, 0, lang('whole result')) . "\n";
-			
+
+			echo "<p class='count'>\n";
+			echo ($found_rows !== false ? "(" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ") " : "");
+			$display_rows = ($exact_count ? "" : "~ ") . $found_rows;
+			echo checkbox("all", 1, 0, lang('whole result'), "var checked = formChecked(this, /check/); selectCount('selected', this.checked ? '$display_rows' : checked); selectCount('selected2', this.checked || !checked ? '$display_rows' : checked);") . "\n";
+
 			if ($adminer->selectCommandPrint()) {
 				?>
-<fieldset><legend><?php echo lang('Edit'); ?></legend><div>
-<input type="submit" value="<?php echo lang('Save'); ?>"<?php echo ($_GET["modify"] ? '' : ' title="' . lang('Double click on a value to modify it.') . '" class="jsonly"'); ?>>
+<fieldset<?php echo ($_GET["modify"] ? '' : ' class="jsonly"'); ?>><legend><?php echo lang('Modify'); ?></legend><div>
+<input type="submit" value="<?php echo lang('Save'); ?>"<?php echo ($_GET["modify"] ? '' : ' title="' . lang('Ctrl+click on a value to modify it.') . '"'); ?>>
+</div></fieldset>
+<fieldset><legend><?php echo lang('Selected'); ?> <span id="selected"></span></legend><div>
 <input type="submit" name="edit" value="<?php echo lang('Edit'); ?>">
 <input type="submit" name="clone" value="<?php echo lang('Clone'); ?>">
-<input type="submit" name="delete" value="<?php echo lang('Delete'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?> (' + (this.form['all'].checked ? <?php echo $found_rows; ?> : formChecked(this, /check/)) + ')');">
+<input type="submit" name="delete" value="<?php echo lang('Delete'); ?>"<?php echo confirm(); ?>>
 </div></fieldset>
 <?php
 			}
+
 			$format = $adminer->dumpFormat();
+			foreach ((array) $_GET["columns"] as $column) {
+				if ($column["fun"]) {
+					unset($format['sql']);
+					break;
+				}
+			}
 			if ($format) {
-				print_fieldset("export", lang('Export'));
+				print_fieldset("export", lang('Export') . " <span id='selected2'></span>");
 				$output = $adminer->dumpOutput();
 				echo ($output ? html_select("output", $output, $adminer_import["output"]) . " " : "");
 				echo html_select("format", $format, $adminer_import["format"]);
 				echo " <input type='submit' name='export' value='" . lang('Export') . "'>\n";
 				echo "</div></fieldset>\n";
 			}
+
+			echo (!$group && $select ? "" : "<script type='text/javascript'>tableCheck();</script>\n");
 		}
+
 		if ($adminer->selectImportPrint()) {
 			print_fieldset("import", lang('Import'), !$rows);
 			echo "<input type='file' name='csv_file'> ";
 			echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_import["format"], 1); // 1 - select
 			echo " <input type='submit' name='import' value='" . lang('Import') . "'>";
-			echo "<input type='hidden' name='token' value='$token'>\n";
 			echo "</div></fieldset>\n";
 		}
-		
+
 		$adminer->selectEmailPrint(array_filter($email_fields, 'strlen'), $columns);
-		
+
+		echo "<p><input type='hidden' name='token' value='$token'></p>\n";
 		echo "</form>\n";
 	}
 }

adminer/sequence.inc.php

@@ -1,9 +1,10 @@
 <?php
 $SEQUENCE = $_GET["sequence"];
+$row = $_POST;
 
 if ($_POST && !$error) {
 	$link = substr(ME, 0, -1);
-	$name = trim($_POST["name"]);
+	$name = trim($row["name"]);
 	if ($_POST["drop"]) {
 		query_redirect("DROP SEQUENCE " . idf_escape($SEQUENCE), $link, lang('Sequence has been dropped.'));
 	} elseif ($SEQUENCE == "") {
@@ -17,14 +18,13 @@ if ($_POST && !$error) {
 
 page_header($SEQUENCE != "" ? lang('Alter sequence') . ": " . h($SEQUENCE) : lang('Create sequence'), $error);
 
-$row = $_POST;
 if (!$row) {
-	$row = array("name" => $SEQUENCE);
+	$row["name"] = $SEQUENCE;
 }
 ?>
 
 <form action="" method="post">
-<p><input name="name" value="<?php echo h($row["name"]); ?>">
+<p><input name="name" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if ($SEQUENCE != "") {

adminer/sql.inc.php

@@ -14,34 +14,38 @@ if (!$error && $_POST["clear"]) {
 	redirect(remove_from_uri("history"));
 }
 
-page_header(lang('SQL command'), $error);
+page_header((isset($_GET["import"]) ? lang('Import') : lang('SQL command')), $error);
 
 if (!$error && $_POST) {
 	$fp = false;
-	$query = $_POST["query"];
-	if ($_POST["webfile"]) {
-		$fp = @fopen((file_exists("adminer.sql") ? "adminer.sql"
-			: (file_exists("adminer.sql.gz") ? "compress.zlib://adminer.sql.gz"
-			: "compress.bzip2://adminer.sql.bz2"
-		)), "rb");
+	if (!isset($_GET["import"])) {
+		$query = $_POST["query"];
+	} elseif ($_POST["webfile"]) {
+		$fp = @fopen((file_exists("adminer.sql")
+			? "adminer.sql"
+			: "compress.zlib://adminer.sql.gz"
+		), "rb");
 		$query = ($fp ? fread($fp, 1e6) : false);
-	} elseif ($_FILES && $_FILES["sql_file"]["error"] != UPLOAD_ERR_NO_FILE) {
+	} else {
 		$query = get_file("sql_file", true);
 	}
+
 	if (is_string($query)) { // get_file() returns error as number, fread() as false
 		if (function_exists('memory_get_usage')) {
 			@ini_set("memory_limit", max(ini_bytes("memory_limit"), 2 * strlen($query) + memory_get_usage() + 8e6)); // @ - may be disabled, 2 - substr and trim, 8e6 - other variables
 		}
+
 		if ($query != "" && strlen($query) < 1e6) { // don't add big queries
-			$q = $query . (ereg(";[ \t\r\n]*\$", $query) ? "" : ";"); //! doesn't work with DELIMITER |
+			$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();
 			}
 		}
-		$space = "(?:\\s|/\\*.*\\*/|(?:#|-- )[^\n]*\n|--\n)";
+
+		$space = "(?:\\s|/\\*[\s\S]*?\\*/|(?:#|-- )[^\n]*\n?|--\r?\n)";
 		$delimiter = ";";
 		$offset = 0;
 		$empty = true;
@@ -51,14 +55,14 @@ if (!$error && $_POST) {
 		}
 		$commands = 0;
 		$errors = array();
-		$line = 0;
 		$parse = '[\'"' . ($jush == "sql" ? '`#' : ($jush == "sqlite" ? '`[' : ($jush == "mssql" ? '[' : ''))) . ']|/\\*|-- |$' . ($jush == "pgsql" ? '|\\$[^$]*\\$' : '');
-		$total_start = microtime();
+		$total_start = microtime(true);
 		parse_str($_COOKIE["adminer_export"], $adminer_export);
 		$dump_format = $adminer->dumpFormat();
 		unset($dump_format["sql"]);
+
 		while ($query != "") {
-			if (!$offset && preg_match("~^$space*DELIMITER\\s+(\\S+)~i", $query, $match)) {
+			if (!$offset && preg_match("~^$space*+DELIMITER\\s+(\\S+)~i", $query, $match)) {
 				$delimiter = $match[1];
 				$query = substr($query, strlen($match[0]));
 			} else {
@@ -71,8 +75,9 @@ if (!$error && $_POST) {
 						break;
 					}
 					$offset = $pos + strlen($found);
+
 					if ($found && rtrim($found) != $delimiter) { // find matching quote or comment end
-						while (preg_match('(' . ($found == '/*' ? '\\*/' : ($found == '[' ? ']' : (ereg('^-- |^#', $found) ? "\n" : preg_quote($found) . "|\\\\."))) . '|$)s', $query, $match, PREG_OFFSET_CAPTURE, $offset)) { //! respect sql_mode NO_BACKSLASH_ESCAPES
+						while (preg_match('(' . ($found == '/*' ? '\\*/' : ($found == '[' ? ']' : (preg_match('~^-- |^#~', $found) ? "\n" : preg_quote($found) . "|\\\\."))) . '|$)s', $query, $match, PREG_OFFSET_CAPTURE, $offset)) { //! respect sql_mode NO_BACKSLASH_ESCAPES
 							$s = $match[0][0];
 							if (!$s && $fp && !feof($fp)) {
 								$query .= fread($fp, 1e5);
@@ -83,82 +88,106 @@ if (!$error && $_POST) {
 								}
 							}
 						}
+
 					} else { // end of a query
 						$empty = false;
 						$q = substr($query, 0, $pos);
 						$commands++;
-						$print = "<pre id='sql-$commands'><code class='jush-$jush'>" . shorten_utf8(trim($q), 1000) . "</code></pre>\n";
-						if (!$_POST["only_errors"]) {
+						$print = "<pre id='sql-$commands'><code class='jush-$jush'>" . $adminer->sqlCommandQuery($q) . "</code></pre>\n";
+						if ($jush == "sqlite" && preg_match("~^$space*+ATTACH\\b~i", $q, $match)) {
+							// PHP doesn't support setting SQLITE_LIMIT_ATTACHED
 							echo $print;
-							ob_flush();
-							flush(); // can take a long time - show the running query
-						}
-						$start = microtime(); // microtime(true) is available since PHP 5
-						//! don't allow changing of character_set_results, convert encoding of displayed query
-						if ($connection->multi_query($q) && is_object($connection2) && preg_match("~^$space*USE\\b~isU", $q)) {
-							$connection2->query($q);
-						}
-						do {
-							$result = $connection->store_result();
-							$end = microtime();
-							$time = format_time($start, $end) . (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
-							if ($connection->error) {
-								echo ($_POST["only_errors"] ? $print : "");
-								echo "<p class='error'>" . lang('Error in query') . ": " . error() . "\n";
-								$errors[] = " <a href='#sql-$commands'>$commands</a>";
-								if ($_POST["error_stops"]) {
-									break 2;
-								}
-							} elseif (is_object($result)) {
-								$orgtables = select($result, $connection2);
-								if (!$_POST["only_errors"]) {
-									echo "<form action='' method='post'>\n";
-									echo "<p>" . ($result->num_rows ? lang('%d row(s)', $result->num_rows) : "") . $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"]) . " "
-										. html_select("format", $dump_format, $adminer_export["format"])
-										. "<input type='hidden' name='query' value='" . h($q) . "'>"
-										. " <input type='submit' name='export' value='" . lang('Export') . "'><input type='hidden' name='token' value='$token'></span>\n"
-									;
-									if ($connection2 && preg_match("~^($space|\\()*SELECT\\b~isU", $q) && ($explain = explain($connection2, $q))) {
-										$id = "explain-$commands";
-										echo ", <a href='#$id' onclick=\"return !toggle('$id');\">EXPLAIN</a>$export";
-										echo "<div id='$id' class='hidden'>\n";
-										select($explain, $connection2, ($jush == "sql" ? "http://dev.mysql.com/doc/refman/" . substr($connection->server_info, 0, 3) . "/en/explain-output.html#explain_" : ""), $orgtables);
-										echo "</div>\n";
-									} else {
-										echo $export;
-									}
-									echo "</form>\n";
-								}
-							} else {
-								if (preg_match("~^$space*(CREATE|DROP|ALTER)$space+(DATABASE|SCHEMA)\\b~isU", $q)) {
-									restart_session();
-									set_session("dbs", null); // clear cache
-									stop_session();
-								}
-								if (!$_POST["only_errors"]) {
-									echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $connection->affected_rows) . "$time\n";
-								}
+							echo "<p class='error'>" . lang('ATTACH queries are not supported.') . "\n";
+							$errors[] = " <a href='#sql-$commands'>$commands</a>";
+							if ($_POST["error_stops"]) {
+								break;
 							}
-							$start = $end;
-						} while ($connection->next_result());
-						$line += substr_count($q.$found, "\n");
+						} else {
+							if (!$_POST["only_errors"]) {
+								echo $print;
+								ob_flush();
+								flush(); // can take a long time - show the running query
+							}
+							$start = microtime(true);
+							//! don't allow changing of character_set_results, convert encoding of displayed query
+							if ($connection->multi_query($q) && is_object($connection2) && preg_match("~^$space*+USE\\b~i", $q)) {
+								$connection2->query($q);
+							}
+
+							do {
+								$result = $connection->store_result();
+								$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
+								;
+
+								if ($connection->error) {
+									echo ($_POST["only_errors"] ? $print : "");
+									echo "<p class='error'>" . lang('Error in query') . ($connection->errno ? " ($connection->errno)" : "") . ": " . error() . "\n";
+									$errors[] = " <a href='#sql-$commands'>$commands</a>";
+									if ($_POST["error_stops"]) {
+										break 2;
+									}
+
+								} elseif (is_object($result)) {
+									$limit = $_POST["limit"];
+									$orgtables = select($result, $connection2, array(), $limit);
+									if (!$_POST["only_errors"]) {
+										echo "<form action='' method='post'>\n";
+										$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"]) . " "
+											. html_select("format", $dump_format, $adminer_export["format"])
+											. "<input type='hidden' name='query' value='" . h($q) . "'>"
+											. " <input type='submit' name='export' value='" . lang('Export') . "'><input type='hidden' name='token' value='$token'></span>\n"
+										;
+										if ($connection2 && preg_match("~^($space|\\()*+SELECT\\b~i", $q) && ($explain = explain($connection2, $q))) {
+											$id = "explain-$commands";
+											echo ", <a href='#$id' onclick=\"return !toggle('$id');\">EXPLAIN</a>$export";
+											echo "<div id='$id' class='hidden'>\n";
+											select($explain, $connection2, $orgtables);
+											echo "</div>\n";
+										} else {
+											echo $export;
+										}
+										echo "</form>\n";
+									}
+
+								} else {
+									if (preg_match("~^$space*+(CREATE|DROP|ALTER)$space++(DATABASE|SCHEMA)\\b~i", $q)) {
+										restart_session();
+										set_session("dbs", null); // clear cache
+										stop_session();
+									}
+									if (!$_POST["only_errors"]) {
+										echo "<p class='message' title='" . h($connection->info) . "'>" . lang('Query executed OK, %d row(s) affected.', $connection->affected_rows) . "$time\n";
+									}
+								}
+
+								$start = microtime(true);
+							} while ($connection->next_result());
+						}
+
 						$query = substr($query, $offset);
 						$offset = 0;
 					}
+
 				}
 			}
 		}
+
 		if ($empty) {
 			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)) . format_time($total_start, microtime()) . "\n";
+			echo "<p class='message'>" . lang('%d query(s) executed OK.', $commands - count($errors));
+			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";
 		}
 		//! MS SQL - SET SHOWPLAN_ALL OFF
+
 	} else {
 		echo "<p class='error'>" . upload_error($query) . "\n";
 	}
@@ -166,51 +195,56 @@ if (!$error && $_POST) {
 ?>
 
 <form action="" method="post" enctype="multipart/form-data" id="form">
-<p><?php
-$q = $_GET["sql"]; // overwrite $q from if ($_POST) to save memory
-if ($_POST) {
-	$q = $_POST["query"];
-} elseif ($_GET["history"] == "all") {
-	$q = $history;
-} elseif ($_GET["history"] != "") {
-	$q = $history[$_GET["history"]][0];
-}
-textarea("query", $q, 20);
-echo ($_POST ? "" : "<script type='text/javascript'>document.getElementsByTagName('textarea')[0].focus();</script>\n");
-echo "<p>" . (ini_bool("file_uploads")
-	? lang('File upload') . ': <input type="file" name="sql_file"' . ($_FILES && $_FILES["sql_file"]["error"] != 4 ? '' : ' onchange="this.form[\'only_errors\'].checked = true;"') . '> (&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
-	: lang('File uploads are disabled.')
-);
-
-?>
-<p>
-<input type="submit" value="<?php echo lang('Execute'); ?>" title="Ctrl+Enter">
-<input type="hidden" name="token" value="<?php echo $token; ?>">
 <?php
-echo checkbox("error_stops", 1, $_POST["error_stops"], lang('Stop on error')) . "\n";
-echo checkbox("only_errors", 1, $_POST["only_errors"], lang('Show only errors')) . "\n";
-
-print_fieldset("webfile", lang('From server'), $_POST["webfile"], "document.getElementById('form')['only_errors'].checked = true; ");
-$compress = array();
-foreach (array("gz" => "zlib", "bz2" => "bz2") as $key => $val) {
-	if (extension_loaded($val)) {
-		$compress[] = ".$key";
+$execute = "<input type='submit' value='" . lang('Execute') . "' title='Ctrl+Enter'>";
+if (!isset($_GET["import"])) {
+	$q = $_GET["sql"]; // overwrite $q from if ($_POST) to save memory
+	if ($_POST) {
+		$q = $_POST["query"];
+	} elseif ($_GET["history"] == "all") {
+		$q = $history;
+	} elseif ($_GET["history"] != "") {
+		$q = $history[$_GET["history"]][0];
 	}
+	echo "<p>";
+	textarea("query", $q, 20);
+	echo ($_POST ? "" : "<script type='text/javascript'>document.getElementsByTagName('textarea')[0].focus();</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")
+		? "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 "</div></fieldset>\n";
+	echo "<fieldset><legend>" . lang('From server') . "</legend><div>";
+	echo lang('Webserver file %s', "<code>adminer.sql" . (extension_loaded("zlib") ? "[.gz]" : "") . "</code>");
+	echo ' <input type="submit" name="webfile" value="' . lang('Run file') . '">';
+	echo "</div></fieldset>\n";
+	echo "<p>";
 }
-echo lang('Webserver file %s', "<code>adminer.sql" . ($compress ? "[" . implode("|", $compress) . "]" : "") . "</code>");
-echo ' <input type="submit" name="webfile" value="' . lang('Run file') . '">';
-echo "</div></fieldset>\n";
 
-if ($history) {
+echo checkbox("error_stops", 1, ($_POST ? $_POST["error_stops"] : isset($_GET["import"])), lang('Stop on error')) . "\n";
+echo checkbox("only_errors", 1, ($_POST ? $_POST["only_errors"] : isset($_GET["import"])), lang('Show only errors')) . "\n";
+echo "<input type='hidden' name='token' value='$token'>\n";
+
+if (!isset($_GET["import"]) && $history) {
 	print_fieldset("history", lang('History'), $_GET["history"] != "");
-	foreach ($history as $key => $val) {
-		list($q, $time) = $val;
-		echo '<a href="' . h(ME . "sql=&history=$key") . '">' . lang('Edit') . "</a> <span class='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
+	for ($val = end($history); $val; $val = prev($history)) { // not array_reverse() to save memory
+		$key = key($history);
+		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";
 	echo "</div></fieldset>\n";
 }
 ?>
-
 </form>

adminer/sqlite.php

@@ -0,0 +1,8 @@
+<?php
+function adminer_object() {
+	include_once "../plugins/plugin.php";
+	include_once "../plugins/login-sqlite.php";
+	return new AdminerPlugin(array(new AdminerLoginSqlite));
+}
+
+include "./index.php";

adminer/static/default.css

@@ -1,17 +1,19 @@
 /** @author Ondrej Valka, http://valka.info */
 body { color: #000; background: #fff; font: 90%/1.25 Verdana, Arial, Helvetica, sans-serif; margin: 0; }
-a { color: blue; }
+a { color: blue; text-decoration: none; }
 a:visited { color: navy; }
-a:hover { color: red; }
-a.text { text-decoration: none; }
+a:link:hover, a:visited:hover { color: red; text-decoration: underline; }
+a.text:hover { text-decoration: none; }
+a.jush-help:hover { color: inherit; }
 h1 { font-size: 150%; margin: 0; padding: .8em 1em; border-bottom: 1px solid #999; font-weight: normal; color: #777; background: #eee; }
 h2 { font-size: 150%; margin: 0 0 20px -18px; padding: .8em 1em; border-bottom: 1px solid #000; color: #000; font-weight: normal; background: #ddf; }
 h3 { font-weight: normal; font-size: 130%; margin: 1em 0 0; }
 form { margin: 0; }
+td table { width: 100%; margin: 0; }
 table { margin: 1em 20px 0 0; border: 0; border-top: 1px solid #999; border-left: 1px solid #999; font-size: 90%; }
 td, th { border: 0; border-right: 1px solid #999; border-bottom: 1px solid #999; padding: .2em .3em; }
 th { background: #eee; text-align: left; }
-thead th { text-align: center; }
+thead th { text-align: center; padding: .2em .5em; }
 thead td, thead th { background: #ddf; }
 fieldset { display: inline; vertical-align: top; padding: .5em .8em; margin: .8em .5em 0 0; border: 1px solid #999; }
 p { margin: .8em 20px 0 0; }
@@ -20,10 +22,16 @@ td img { max-width: 200px; max-height: 200px; }
 code { background: #eee; }
 tbody tr:hover td, tbody tr:hover th { background: #eee; }
 pre { margin: 1em 0 0; }
+pre, textarea { font: 100%/1.25 monospace; }
 input[type=image] { vertical-align: middle; }
+input.default { box-shadow: 1px 1px 1px #777; }
+input.required { box-shadow: 1px 1px 1px red; }
+input.maxlength { box-shadow: 1px 1px 1px red; }
+input.wayoff { left: -1000px; position: absolute; }
+.block { display: block; }
 .version { color: #777; font-size: 67%; }
 .js .hidden, .nojs .jsonly { display: none; }
-.js .column { position: absolute; background: #ddf; padding: .3em 1ex .3em 0; margin-top: -.3em; }
+.js .column { position: absolute; background: #ddf; padding: .27em 1ex .3em 0; margin-top: -.27em; }
 .nowrap td, .nowrap th, td.nowrap { white-space: pre; }
 .wrap td { white-space: normal; }
 .error { color: red; background: #fee; }
@@ -35,23 +43,30 @@ input[type=image] { vertical-align: middle; }
 .enum { color: #007F7F; }
 .binary { color: red; }
 .odd td { background: #F5F5F5; }
-.js .checked td, .js .checked th { background: #ddf; }
+.js .checkable .checked td, .js .checkable .checked th { background: #ddf; }
 .time { color: silver; font-size: 70%; }
 .function { text-align: right; }
 .number { text-align: right; }
 .datetime { text-align: right; }
 .type { width: 15ex; width: auto\9; }
 .options select { width: 20ex; width: auto\9; }
+.view { font-style: italic; }
 .active { font-weight: bold; }
 .sqlarea { width: 98%; }
-.icon { width: 18px; height: 18px; }
+.icon { width: 18px; height: 18px; background-color: navy; }
+.icon:hover { background-color: red; }
+.size { width: 6ex; }
+.help { cursor: help; }
+.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; }
+#menu p, #tables { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
+#tables li{ list-style: none; }
 #dbs { overflow: hidden; }
 #logins, #tables { white-space: nowrap; overflow: auto; }
-#logins a, #tables a { background: #fff; }
-#logout { background: none; border: none; color: blue; font: inherit; padding: 0; text-decoration: underline; cursor: pointer; }
-#logout:hover { color: red; }
+#logins a, #tables a, #tables span { background: #fff; }
 #content { margin: 2em 0 0 21em; padding: 10px 20px 20px 0; }
 #lang { position: absolute; top: 0; left: 0; line-height: 1.8em; padding: .3em 1em; }
 #breadcrumb { white-space: nowrap; position: absolute; top: 0; left: 21em; background: #eee; height: 2em; line-height: 1.8em; padding: 0 1em; margin: 0 0 0 -18px; }
@@ -60,13 +75,28 @@ input[type=image] { vertical-align: middle; }
 #schema { margin-left: 60px; position: relative; -moz-user-select: none; -webkit-user-select: none; }
 #schema .table { border: 1px solid silver; padding: 0 2px; cursor: move; position: absolute; }
 #schema .references { position: absolute; }
+#help { position: absolute; border: 1px solid #999; background: #eee; padding: 5px; font-family: monospace; z-index: 1; }
 
 .rtl h2 { margin: 0 -18px 20px 0; }
 .rtl p, .rtl table, .rtl .error, .rtl .message { margin: 1em 0 0 20px; }
+.rtl .logout { left: 0; right: auto; }
 .rtl #content { margin: 2em 21em 0 0; padding: 10px 0 20px 20px; }
 .rtl #breadcrumb { left: auto; right: 21em; margin: 0 -18px 0 0; }
+.rtl .pages { left: auto; right: 21em; }
+.rtl input.wayoff { left: auto; right: -1000px; }
 .rtl #lang, .rtl #menu { left: auto; right: 0; }
 
+@media all and (max-device-width: 880px) {
+	.pages { left: auto; }
+	#menu { position: static; width: auto; }
+	#content { margin-left: 10px; }
+	#lang { position: static; border-top: 1px solid #999; }
+	#breadcrumb { left: auto; }
+	.rtl .pages { right: auto; }
+	.rtl #content { margin-right: 10px; }
+	.rtl #breadcrumb { right: auto; }
+}
+
 @media print {
 	#lang, #menu { display: none; }
 	#content { margin-left: 1em; }

adminer/static/editing.js

@@ -1,40 +1,37 @@
 // Adminer specific functions
 
-var jushRoot = '../externals/jush/'; // global variable to allow simple customization
-
 /** Load syntax highlighting
 * @param string first three characters of database system version
 */
 function bodyLoad(version) {
-	if (jushRoot) {
-		// copy of jush.style to load JS and CSS at once
-		var link = document.createElement('link');
-		link.rel = 'stylesheet';
-		link.type = 'text/css';
-		link.href = jushRoot + 'jush.css';
-		document.getElementsByTagName('head')[0].appendChild(link);
-		
-		var script = document.createElement('script');
-		script.src = jushRoot + 'jush.js';
-		script.onload = function () {
-			if (window.jush) { // IE runs in case of an error too
-				jush.create_links = ' target="_blank" rel="noreferrer"';
-				jush.urls.sql_sqlset = jush.urls.sql[0] = jush.urls.sqlset[0] = jush.urls.sqlstatus[0] = 'http://dev.mysql.com/doc/refman/' + version + '/en/$key';
-				var pgsql = 'http://www.postgresql.org/docs/' + version + '/static/';
-				jush.urls.pgsql_pgsqlset = jush.urls.pgsql[0] = pgsql + '$key';
-				jush.urls.pgsqlset[0] = pgsql + 'runtime-config-$key.html#GUC-$1';
-				if (window.jushLinks) {
-					jush.custom_links = jushLinks;
+	if (window.jush) {
+		jush.create_links = ' target="_blank" rel="noreferrer"';
+		if (version) {
+			for (var key in jush.urls) {
+				var obj = jush.urls;
+				if (typeof obj[key] != 'string') {
+					obj = obj[key];
+					key = 0;
 				}
-				jush.highlight_tag('code', 0);
+				obj[key] = obj[key]
+					.replace(/\/doc\/mysql/, '/doc/refman/' + version) // MySQL
+					.replace(/\/docs\/current/, '/docs/' + version) // PostgreSQL
+				;
 			}
-		};
-		script.onreadystatechange = function () {
-			if (/^(loaded|complete)$/.test(script.readyState)) {
-				script.onload();
+		}
+		if (window.jushLinks) {
+			jush.custom_links = jushLinks;
+		}
+		jush.highlight_tag('code', 0);
+		var tags = document.getElementsByTagName('textarea');
+		for (var i = 0; i < tags.length; i++) {
+			if (/(^|\s)jush-/.test(tags[i].className)) {
+				var pre = jush.textarea(tags[i]);
+				if (pre) {
+					setupSubmitHighlightInput(pre);
+				}
 			}
-		};
-		document.body.appendChild(script);
+		}
 	}
 }
 
@@ -63,48 +60,35 @@ function typePassword(el, disable) {
 	}
 }
 
-function loginDriver(driver) {
-	var trs = parentTag(driver, 'table').rows;
-	for (var i=1; i < trs.length - 1; i++) {
-		trs[i].className = (/sqlite/.test(driver.value) ? 'hidden' : '');
+
+
+var dbCtrl;
+var dbPrevious = {};
+
+/** Check if database should be opened to a new window
+* @param MouseEvent
+* @param HTMLSelectElement
+*/
+function dbMouseDown(event, el) {
+	dbCtrl = isCtrl(event);
+	if (dbPrevious[el.name] == undefined) {
+		dbPrevious[el.name] = el.value;
 	}
 }
 
-
-
-/** Handle Tab and Esc in textarea
-* @param HTMLTextAreaElement
-* @param KeyboardEvent
-* @return boolean
+/** Load database after selecting it
+* @param HTMLSelectElement
 */
-function textareaKeydown(target, event) {
-	if (!event.shiftKey && !event.altKey && !event.ctrlKey && !event.metaKey) {
-		if (event.keyCode == 9) { // 9 - Tab
-			// inspired by http://pallieter.org/Projects/insertTab/
-			if (target.setSelectionRange) {
-				var start = target.selectionStart;
-				var scrolled = target.scrollTop;
-				target.value = target.value.substr(0, start) + '\t' + target.value.substr(target.selectionEnd);
-				target.setSelectionRange(start + 1, start + 1);
-				target.scrollTop = scrolled;
-				return false; //! still loses focus in Opera, can be solved by handling onblur
-			} else if (target.createTextRange) {
-				document.selection.createRange().text = '\t';
-				return false;
-			}
-		}
-		if (event.keyCode == 27) { // 27 - Esc
-			var els = target.form.elements;
-			for (var i=1; i < els.length; i++) {
-				if (els[i-1] == target) {
-					els[i].focus();
-					break;
-				}
-			}
-			return false;
-		}
+function dbChange(el) {
+	if (dbCtrl) {
+		el.form.target = '_blank';
+	}
+	el.form.submit();
+	el.form.target = '';
+	if (dbCtrl && dbPrevious[el.name] != undefined) {
+		el.value = dbPrevious[el.name];
+		dbPrevious[el.name] = undefined;
 	}
-	return true;
 }
 
 
@@ -148,7 +132,7 @@ function selectFieldChange(form) {
 			}
 			if (col && /^order/.test(select.name)) {
 				if (!(col in indexColumns)) {
-					 ok = false;
+					ok = false;
 				}
 				break;
 			}
@@ -227,21 +211,17 @@ function editingNameChange(field) {
 /** Add table row for next field
 * @param HTMLInputElement
 * @param boolean
-* @param boolean
 * @return boolean
 */
-function editingAddRow(button, allowed, focus) {
-	if (allowed && rowCount >= allowed) {
-		return false;
-	}
+function editingAddRow(button, focus) {
 	var match = /(\d+)(\.\d+)?/.exec(button.name);
 	var x = match[0] + (match[2] ? added.substr(match[2].length) : added) + '1';
 	var row = parentTag(button, 'tr');
-	var row2 = row.cloneNode(true);
+	var row2 = cloneNode(row);
 	var tags = row.getElementsByTagName('select');
 	var tags2 = row2.getElementsByTagName('select');
 	for (var i=0; i < tags.length; i++) {
-		tags2[i].name = tags[i].name.replace(/([0-9.]+)/, x);
+		tags2[i].name = tags[i].name.replace(/[0-9.]+/, x);
 		tags2[i].selectedIndex = tags[i].selectedIndex;
 	}
 	tags = row.getElementsByTagName('input');
@@ -263,11 +243,15 @@ function editingAddRow(button, allowed, focus) {
 	tags[0].onchange = function () {
 		editingNameChange(tags[0]);
 	};
+	tags[0].onkeyup = function () {
+	};
 	row.parentNode.insertBefore(row2, row.nextSibling);
 	if (focus) {
 		input.onchange = function () {
 			editingNameChange(input);
 		};
+		input.onkeyup = function () {
+		};
 		input.focus();
 	}
 	added += '0';
@@ -277,15 +261,32 @@ function editingAddRow(button, allowed, focus) {
 
 /** Remove table row for field
 * @param HTMLInputElement
+* @param string
 * @return boolean
 */
-function editingRemoveRow(button) {
-	var field = formField(button.form, button.name.replace(/drop_col(.+)/, 'fields$1[field]'));
+function editingRemoveRow(button, name) {
+	var field = formField(button.form, button.name.replace(/[^\[]+(.+)/, name));
 	field.parentNode.removeChild(field);
 	parentTag(button, 'tr').style.display = 'none';
 	return true;
 }
 
+/** Move table row for field
+* @param HTMLInputElement
+* @param boolean direction to move row, true for up or false for down
+* @return boolean
+*/
+function editingMoveRow(button, dir){
+	var row = parentTag(button, 'tr');
+	if (!('nextElementSibling' in row)) {
+		return false;
+	}
+	row.parentNode.insertBefore(row, dir
+		? row.previousElementSibling
+		: row.nextElementSibling ? row.nextElementSibling.nextElementSibling : row.parentNode.firstChild);
+	return true;
+}
+
 var lastType = '';
 
 /** Clear length and hide collation or unsigned
@@ -296,25 +297,39 @@ function editingTypeChange(type) {
 	var text = selectValue(type);
 	for (var i=0; i < type.form.elements.length; i++) {
 		var el = type.form.elements[i];
-		if (el.name == name + '[length]' && !(
-			(/(char|binary)$/.test(lastType) && /(char|binary)$/.test(text))
-			|| (/(enum|set)$/.test(lastType) && /(enum|set)$/.test(text))
-		)) {
-			el.value = '';
+		if (el.name == name + '[length]') {
+			if (!(
+				(/(char|binary)$/.test(lastType) && /(char|binary)$/.test(text))
+				|| (/(enum|set)$/.test(lastType) && /(enum|set)$/.test(text))
+			)) {
+				el.value = '';
+			}
+			el.onchange.apply(el);
 		}
 		if (lastType == 'timestamp' && el.name == name + '[has_default]' && /timestamp/i.test(formField(type.form, name + '[default]').value)) {
 			el.checked = false;
 		}
 		if (el.name == name + '[collation]') {
-			el.className = (/(char|text|enum|set)$/.test(text) ? '' : 'hidden');
+			alterClass(el, 'hidden', !/(char|text|enum|set)$/.test(text));
 		}
 		if (el.name == name + '[unsigned]') {
-			el.className = (/(int|float|double|decimal)$/.test(text) ? '' : 'hidden');
+			alterClass(el, 'hidden', !/((^|[^o])int|float|double|decimal)$/.test(text));
+		}
+		if (el.name == name + '[on_update]') {
+			alterClass(el, 'hidden', !/timestamp|datetime/.test(text)); // MySQL supports datetime since 5.6.5
 		}
 		if (el.name == name + '[on_delete]') {
-			el.className = (/`/.test(text) ? '' : 'hidden');
+			alterClass(el, 'hidden', !/`/.test(text));
 		}
 	}
+	helpClose();
+}
+
+/** Mark length as required
+* @param HTMLInputElement
+*/
+function editingLengthChange(el) {
+	alterClass(el, 'required', !el.value.length && /var(char|binary)$/.test(selectValue(el.parentNode.previousSibling.firstChild)));
 }
 
 /** Edit enum or set
@@ -325,7 +340,7 @@ function editingLengthFocus(field) {
 	if (/(enum|set)$/.test(selectValue(td.previousSibling.firstChild))) {
 		var edit = document.getElementById('enum-edit');
 		var val = field.value;
-		edit.value = (/^'.+','.+'$/.test(val) ? val.substr(1, val.length - 2).replace(/','/g, "\n").replace(/''/g, "'") : val);
+		edit.value = (/^'.+'$/.test(val) ? val.substr(1, val.length - 2).replace(/','/g, "\n").replace(/''/g, "'") : val); //! doesn't handle 'a'',''b' correctly
 		td.appendChild(edit);
 		field.style.display = 'none';
 		edit.style.display = 'inline';
@@ -339,7 +354,7 @@ function editingLengthFocus(field) {
 function editingLengthBlur(edit) {
 	var field = edit.parentNode.firstChild;
 	var val = edit.value;
-	field.value = (/\n/.test(val) ? "'" + val.replace(/\n+$/, '').replace(/'/g, "''").replace(/\n/g, "','") + "'" : val);
+	field.value = (/^'[^\n]+'$/.test(val) ? val : "'" + val.replace(/\n+$/, '').replace(/'/g, "''").replace(/\n/g, "','") + "'");
 	field.style.display = 'inline';
 	edit.style.display = 'none';
 }
@@ -351,7 +366,16 @@ function editingLengthBlur(edit) {
 function columnShow(checked, column) {
 	var trs = document.getElementById('edit-fields').getElementsByTagName('tr');
 	for (var i=0; i < trs.length; i++) {
-		trs[i].getElementsByTagName('td')[column].className = (checked ? '' : 'hidden');
+		alterClass(trs[i].getElementsByTagName('td')[column], 'hidden', !checked);
+	}
+}
+
+/** Hide column with default values in narrow window
+*/
+function editingHideDefaults() {
+	if (innerWidth < document.documentElement.scrollWidth) {
+		document.getElementById('form')['defaults'].checked = false;
+		columnShow(false, 5);
 	}
 }
 
@@ -360,15 +384,16 @@ function columnShow(checked, column) {
 */
 function partitionByChange(el) {
 	var partitionTable = /RANGE|LIST/.test(selectValue(el));
-	el.form['partitions'].className = (partitionTable || !el.selectedIndex ? 'hidden' : '');
-	document.getElementById('partition-table').className = (partitionTable ? '' : 'hidden');
+	alterClass(el.form['partitions'], 'hidden', partitionTable || !el.selectedIndex);
+	alterClass(document.getElementById('partition-table'), 'hidden', !partitionTable);
+	helpClose();
 }
 
 /** Add next partition row
 * @param HTMLInputElement
 */
 function partitionNameChange(el) {
-	var row = parentTag(el, 'tr').cloneNode(true);
+	var row = cloneNode(parentTag(el, 'tr'));
 	row.firstChild.firstChild.value = '';
 	parentTag(el, 'table').appendChild(row);
 	el.onchange = function () {};
@@ -381,7 +406,7 @@ function partitionNameChange(el) {
 */
 function foreignAddRow(field) {
 	field.onchange = function () { };
-	var row = parentTag(field, 'tr').cloneNode(true);
+	var row = cloneNode(parentTag(field, 'tr'));
 	var selects = row.getElementsByTagName('select');
 	for (var i=0; i < selects.length; i++) {
 		selects[i].name = selects[i].name.replace(/\]/, '1$&');
@@ -397,7 +422,7 @@ function foreignAddRow(field) {
 */
 function indexesAddRow(field) {
 	field.onchange = function () { };
-	var row = parentTag(field, 'tr').cloneNode(true);
+	var row = cloneNode(parentTag(field, 'tr'));
 	var selects = row.getElementsByTagName('select');
 	for (var i=0; i < selects.length; i++) {
 		selects[i].name = selects[i].name.replace(/indexes\[\d+/, '$&1');
@@ -416,12 +441,16 @@ function indexesAddRow(field) {
 * @param string name prefix
 */
 function indexesChangeColumn(field, prefix) {
-	var columns = parentTag(field, 'td').getElementsByTagName('select');
 	var names = [];
-	for (var i=0; i < columns.length; i++) {
-		var value = selectValue(columns[i]);
-		if (value) {
-			names.push(value);
+	for (var tag in { 'select': 1, 'input': 1 }) {
+		var columns = parentTag(field, 'td').getElementsByTagName(tag);
+		for (var i=0; i < columns.length; i++) {
+			if (/\[columns\]/.test(columns[i].name)) {
+				var value = selectValue(columns[i]);
+				if (value) {
+					names.push(value);
+				}
+			}
 		}
 	}
 	field.form[field.name.replace(/\].*/, '][name]')].value = prefix + names.join('_');
@@ -437,22 +466,47 @@ function indexesAddColumn(field, prefix) {
 	};
 	var select = field.form[field.name.replace(/\].*/, '][type]')];
 	if (!select.selectedIndex) {
-		select.selectedIndex = 3;
+		while (selectValue(select) != "INDEX" && select.selectedIndex < select.options.length) {
+			select.selectedIndex++;
+		}
 		select.onchange();
 	}
-	var column = field.parentNode.cloneNode(true);
-	select = column.getElementsByTagName('select')[0];
-	select.name = select.name.replace(/\]\[\d+/, '$&1');
-	select.selectedIndex = 0;
-	var input = column.getElementsByTagName('input')[0];
-	input.name = input.name.replace(/\]\[\d+/, '$&1');
-	input.value = '';
+	var column = cloneNode(field.parentNode);
+	var selects = column.getElementsByTagName('select');
+	for (var i = 0; i < selects.length; i++) {
+		select = selects[i];
+		select.name = select.name.replace(/\]\[\d+/, '$&1');
+		select.selectedIndex = 0;
+	}
+	var inputs = column.getElementsByTagName('input');
+	for (var i = 0; i < inputs.length; i++) {
+		var input = inputs[i];
+		input.name = input.name.replace(/\]\[\d+/, '$&1');
+		if (input.type != 'checkbox') {
+			input.value = '';
+		}
+	}
 	parentTag(field, 'td').appendChild(column);
 	field.onchange();
 }
 
 
 
+/** 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
@@ -529,3 +583,50 @@ function schemaMouseup(ev, db) {
 		cookie('adminer_schema-' + db + '=' + s, 30); //! special chars in db
 	}
 }
+
+
+
+var helpOpen, helpIgnore; // when mouse outs <option> then it mouse overs border of <select> - ignore it
+
+/** Display help
+* @param HTMLElement
+* @param MouseEvent
+* @param string
+* @param bool display on left side (otherwise on top)
+*/
+function helpMouseover(el, event, text, side) {
+	var target = getTarget(event);
+	if (!text) {
+		helpClose();
+	} else if (window.jush && (!helpIgnore || el != target)) {
+		helpOpen = 1;
+		var help = document.getElementById('help');
+		help.innerHTML = text;
+		jush.highlight_tag([ help ]);
+		alterClass(help, 'hidden');
+		var rect = target.getBoundingClientRect();
+		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';
+	}
+}
+
+/** Close help after timeout
+* @param HTMLElement
+* @param MouseEvent
+*/
+function helpMouseout(el, event) {
+	helpOpen = 0;
+	helpIgnore = (el != getTarget(event));
+	setTimeout(function () {
+		if (!helpOpen) {
+			helpClose();
+		}
+	}, 200);
+}
+
+/** Close help
+*/
+function helpClose() {
+	alterClass(document.getElementById('help'), 'hidden', true);
+}

adminer/static/functions.js

@@ -1,4 +1,15 @@
 
+/** Add or remove CSS class
+* @param HTMLElement
+* @param string
+* @param [bool]
+*/
+function alterClass(el, className, enable) {
+	if (el) {
+		el.className = el.className.replace(RegExp('(^|\\s)' + className + '(\\s|$)'), '$2') + (enable ? ' ' + className : '');
+	}
+}
+
 /** Toggle visibility
 * @param string
 * @return boolean
@@ -21,31 +32,60 @@ function cookie(assign, days) {
 }
 
 /** Verify current Adminer version
+* @param string
 */
-function verifyVersion() {
+function verifyVersion(current) {
 	cookie('adminer_version=0', 1);
-	var script = document.createElement('script');
-	script.src = location.protocol + '//www.adminer.org/version.php';
-	document.body.appendChild(script);
+	var iframe = document.createElement('iframe');
+	iframe.src = 'https://www.adminer.org/version/?current=' + current;
+	iframe.frameBorder = 0;
+	iframe.marginHeight = 0;
+	iframe.scrolling = 'no';
+	iframe.style.width = '7ex';
+	iframe.style.height = '1.25em';
+	if (window.postMessage && window.addEventListener) {
+		iframe.style.display = 'none';
+		addEventListener('message', function (event) {
+			if (event.origin == 'https://www.adminer.org') {
+				var match = /version=(.+)/.exec(event.data);
+				if (match) {
+					cookie('adminer_version=' + match[1], 1);
+				}
+			}
+		}, false);
+	}
+	document.getElementById('version').appendChild(iframe);
 }
 
 /** Get value of select
-* @param HTMLSelectElement
+* @param HTMLElement <select> or <input>
 * @return string
 */
 function selectValue(select) {
+	if (!select.selectedIndex) {
+		return select.value;
+	}
 	var selected = select.options[select.selectedIndex];
 	return ((selected.attributes.value || {}).specified ? selected.value : selected.text);
 }
 
-/** Get parent node with specified tag name.
+/** Verify if element has a specified tag name
  * @param HTMLElement
- * @param string
+ * @param string regular expression
+ * @return bool
+ */
+function isTag(el, tag) {
+	var re = new RegExp('^(' + tag + ')$', 'i');
+	return re.test(el.tagName);
+}
+
+/** Get parent node with specified tag name
+ * @param HTMLElement
+ * @param string regular expression
  * @return HTMLElement
  */
 function parentTag(el, tag) {
-	var re = new RegExp('^' + tag + '$', 'i');
-	while (!re.test(el.tagName)) {
+	while (el && !isTag(el, tag)) {
 		el = el.parentNode;
 	}
 	return el;
@@ -56,7 +96,25 @@ function parentTag(el, tag) {
 */
 function trCheck(el) {
 	var tr = parentTag(el, 'tr');
-	tr.className = tr.className.replace(/(^|\s)checked(\s|$)/, '$2') + (el.checked ? ' checked' : '');
+	alterClass(tr, 'checked', el.checked);
+	if (el.form && el.form['all'] && el.form['all'].onclick) { // Opera treats form.all as document.all
+		el.form['all'].onclick();
+	}
+}
+
+/** Fill number of selected items
+* @param string
+* @param string
+*/
+function selectCount(id, count) {
+	setHtml(id, (count === '' ? '' : '(' + (count + '').replace(/\B(?=(\d{3})+$)/g, ' ') + ')'));
+	var inputs = document.getElementById(id).parentNode.parentNode.getElementsByTagName('input');
+	for (var i = 0; i < inputs.length; i++) {
+		var input = inputs[i];
+		if (input.type == 'submit') {
+			input.disabled = (count == '0');
+		}
+	}
 }
 
 /** Check all elements matching given name
@@ -114,12 +172,13 @@ function formChecked(el, name) {
 
 /** Select clicked row
 * @param MouseEvent
+* @param [boolean] force click
 */
-function tableClick(event) {
-	var click = (!window.getSelection || getSelection().isCollapsed);
-	var el = event.target || event.srcElement;
-	while (!/^tr$/i.test(el.tagName)) {
-		if (/^(table|a|input|textarea)$/i.test(el.tagName)) {
+function tableClick(event, click) {
+	click = (click || !window.getSelection || getSelection().isCollapsed);
+	var el = getTarget(event);
+	while (!isTag(el, 'tr')) {
+		if (isTag(el, 'table|a|input|textarea')) {
 			if (el.type != 'checkbox') {
 				return;
 			}
@@ -127,10 +186,13 @@ function tableClick(event) {
 			click = false;
 		}
 		el = el.parentNode;
+		if (!el) { // Ctrl+click on text fields hides the element
+			return;
+		}
 	}
 	el = el.firstChild.firstChild;
 	if (click) {
-		el.click && el.click();
+		el.checked = !el.checked;
 		el.onclick && el.onclick();
 	}
 	trCheck(el);
@@ -177,7 +239,7 @@ function checkboxClick(event, el) {
 function setHtml(id, html) {
 	var el = document.getElementById(id);
 	if (el) {
-		if (html == undefined) {
+		if (html == null) {
 			el.parentNode.innerHTML = '&nbsp;';
 		} else {
 			el.innerHTML = html;
@@ -216,8 +278,8 @@ function pageClick(href, page, event) {
 * @param MouseEvent
 */
 function menuOver(el, event) {
-	var a = event.target;
-	if (/^a$/i.test(a.tagName) && a.offsetLeft + a.offsetWidth > a.parentNode.offsetWidth) {
+	var a = getTarget(event);
+	if (isTag(a, 'a|span') && a.offsetLeft + a.offsetWidth > a.parentNode.offsetWidth - 15) { // 15 - ellipsis
 		el.style.overflow = 'visible';
 	}
 }
@@ -239,21 +301,45 @@ function selectAddRow(field) {
 		selectFieldChange(field.form);
 	};
 	field.onchange();
-	var row = field.parentNode.cloneNode(true);
+	var row = cloneNode(field.parentNode);
 	var selects = row.getElementsByTagName('select');
 	for (var i=0; i < selects.length; i++) {
 		selects[i].name = selects[i].name.replace(/[a-z]\[\d+/, '$&1');
 		selects[i].selectedIndex = 0;
 	}
 	var inputs = row.getElementsByTagName('input');
-	if (inputs.length) {
-		inputs[0].name = inputs[0].name.replace(/[a-z]\[\d+/, '$&1');
-		inputs[0].value = '';
-		inputs[0].className = '';
+	for (var i=0; i < inputs.length; i++) {
+		inputs[i].name = inputs[i].name.replace(/[a-z]\[\d+/, '$&1');
+		inputs[i].className = '';
+		if (inputs[i].type == 'checkbox') {
+			inputs[i].checked = false;
+		} else {
+			inputs[i].value = '';
+		}
 	}
 	field.parentNode.parentNode.appendChild(row);
 }
 
+/** Prevent onsearch handler on Enter
+* @param HTMLInputElement
+* @param KeyboardEvent
+*/
+function selectSearchKeydown(el, event) {
+	if (event.keyCode == 13 || event.keyCode == 10) {
+		el.onsearch = function () {
+		};
+	}
+}
+
+/** Clear column name after resetting search
+* @param HTMLInputElement
+*/
+function selectSearchSearch(el) {
+	if (!el.value) {
+		el.parentNode.firstChild.selectedIndex = 0;
+	}
+}
+
 
 
 /** Toggles column context menu
@@ -280,7 +366,7 @@ function selectSearch(name) {
 	var divs = el.getElementsByTagName('div');
 	for (var i=0; i < divs.length; i++) {
 		var div = divs[i];
-		if (/select/i.test(div.firstChild.tagName) && selectValue(div.firstChild) == name) {
+		if (isTag(div.firstChild, 'select') && selectValue(div.firstChild) == name) {
 			break;
 		}
 	}
@@ -292,6 +378,23 @@ function selectSearch(name) {
 }
 
 
+/** Check if Ctrl key (Command key on Mac) was pressed
+* @param KeyboardEvent|MouseEvent
+* @return boolean
+*/
+function isCtrl(event) {
+	return (event.ctrlKey || event.metaKey) && !event.altKey; // shiftKey allowed
+}
+
+/** Return event target
+* @param Event
+* @return HTMLElement
+*/
+function getTarget(event) {
+	return event.target || event.srcElement;
+}
+
+
 
 /** Send form by Ctrl+Enter on <select> and <textarea>
 * @param KeyboardEvent
@@ -299,14 +402,18 @@ function selectSearch(name) {
 * @return boolean
 */
 function bodyKeydown(event, button) {
-	var target = event.target || event.srcElement;
-	if (event.ctrlKey && (event.keyCode == 13 || event.keyCode == 10) && !event.altKey && !event.metaKey && /select|textarea|input/i.test(target.tagName)) { // 13|10 - Enter, shiftKey allowed
+	var target = getTarget(event);
+	if (target.jushTextarea) {
+		target = target.jushTextarea;
+	}
+	if (isCtrl(event) && (event.keyCode == 13 || event.keyCode == 10) && isTag(target, 'select|textarea|input')) { // 13|10 - Enter
 		target.blur();
 		if (button) {
 			target.form[button].click();
 		} else {
 			target.form.submit();
 		}
+		target.focus();
 		return false;
 	}
 	return true;
@@ -316,11 +423,11 @@ function bodyKeydown(event, button) {
 * @param MouseEvent
 */
 function bodyClick(event) {
-	var target = event.target || event.srcElement;
-	if ((event.ctrlKey || event.shiftKey) && target.type == 'submit' && /input/i.test(target.tagName)) {
+	var target = getTarget(event);
+	if ((isCtrl(event) || event.shiftKey) && target.type == 'submit' && isTag(target, 'input')) {
 		target.form.target = '_blank';
 		setTimeout(function () {
-			// if (event.ctrlKey) { focus(); } doesn't work
+			// if (isCtrl(event)) { focus(); } doesn't work
 			target.form.target = '';
 		}, 0);
 	}
@@ -333,11 +440,11 @@ function bodyClick(event) {
 * @return boolean
 */
 function editingKeydown(event) {
-	if ((event.keyCode == 40 || event.keyCode == 38) && event.ctrlKey && !event.altKey && !event.metaKey) { // 40 - Down, 38 - Up, shiftKey allowed
-		var target = event.target || event.srcElement;
+	if ((event.keyCode == 40 || event.keyCode == 38) && isCtrl(event)) { // 40 - Down, 38 - Up
+		var target = getTarget(event);
 		var sibling = (event.keyCode == 40 ? 'nextSibling' : 'previousSibling');
 		var el = target.parentNode.parentNode[sibling];
-		if (el && (/^tr$/i.test(el.tagName) || (el = el[sibling])) && /^tr$/i.test(el.tagName) && (el = el.childNodes[nodePosition(target.parentNode)]) && (el = el.childNodes[nodePosition(target)])) {
+		if (el && (isTag(el, 'tr') || (el = el[sibling])) && isTag(el, 'tr') && (el = el.childNodes[nodePosition(target.parentNode)]) && (el = el.childNodes[nodePosition(target)])) {
 			el.focus();
 		}
 		return false;
@@ -355,13 +462,44 @@ function editingKeydown(event) {
 function functionChange(select) {
 	var input = select.form[select.name.replace(/^function/, 'fields')];
 	if (selectValue(select)) {
-		if (input.origMaxLength === undefined) {
-			input.origMaxLength = input.maxLength;
+		if (input.origType === undefined) {
+			input.origType = input.type;
+			input.origMaxLength = input.getAttribute('data-maxlength');
+		}
+		input.removeAttribute('data-maxlength');
+		input.type = 'text';
+	} else if (input.origType) {
+		input.type = input.origType;
+		if (input.origMaxLength >= 0) {
+			input.setAttribute('data-maxlength', input.origMaxLength);
 		}
-		input.removeAttribute('maxlength');
-	} else if (input.origMaxLength >= 0) {
-		input.maxLength = input.origMaxLength;
 	}
+	oninput({target: input});
+	helpClose();
+}
+
+/** Call this.onchange() if value changes
+* @this HTMLInputElement
+*/
+function keyupChange() {
+	if (this.value != this.getAttribute('value')) {
+		this.onchange();
+		this.setAttribute('value', this.value);
+	}
+}
+
+/** Add new field in schema-less edit
+* @param HTMLInputElement
+*/
+function fieldChange(field) {
+	var row = cloneNode(parentTag(field, 'tr'));
+	var inputs = row.getElementsByTagName('input');
+	for (var i = 0; i < inputs.length; i++) {
+		inputs[i].value = '';
+	}
+	// keep value in <select> (function)
+	parentTag(field, 'table').appendChild(row);
+	field.onchange = function () { };
 }
 
 
@@ -370,11 +508,19 @@ function functionChange(select) {
 * @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');
@@ -382,7 +528,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);
@@ -396,26 +547,64 @@ 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]);
 		}
 	});
 }
 
+/** Save form contents through AJAX
+* @param HTMLFormElement
+* @param string
+* @param [HTMLInputElement]
+* @return boolean
+*/
+function ajaxForm(form, message, button) {
+	var data = [];
+	var els = form.elements;
+	for (var i = 0; i < els.length; i++) {
+		var el = els[i];
+		if (el.name && !el.disabled) {
+			if (/^file$/i.test(el.type) && el.value) {
+				return false;
+			}
+			if (!/^(checkbox|radio|submit|file)$/i.test(el.type) || el.checked || el == button) {
+				data.push(encodeURIComponent(el.name) + '=' + encodeURIComponent(isTag(el, 'select') ? selectValue(el) : el.value));
+			}
+		}
+	}
+	data = data.join('&');
+	
+	var url = form.action;
+	if (!/post/i.test(form.method)) {
+		url = url.replace(/\?.*/, '') + '?' + data;
+		data = '';
+	}
+	return ajax(url, function (request) {
+		setHtml('ajaxstatus', request.responseText);
+		if (window.jush) {
+			jush.highlight_tag(document.getElementById('ajaxstatus').getElementsByTagName('code'), 0);
+		}
+	}, data, message);
+}
+
 
 
 /** Display edit field
 * @param HTMLElement
 * @param MouseEvent
 * @param number display textarea instead of input, 2 - load long text
+* @param string warning to display
 */
-function selectDblClick(td, event, text) {
-	if (/input|textarea/i.test(td.firstChild.tagName)) {
+function selectClick(td, event, text, warning) {
+	var target = getTarget(event);
+	if (!isCtrl(event) || isTag(td.firstChild, 'input|textarea') || isTag(target, 'a')) {
 		return;
 	}
+	if (warning) {
+		return alert(warning);
+	}
 	var original = td.innerHTML;
 	text = text || /\n/.test(original);
 	var input = document.createElement(text ? 'textarea' : 'input');
@@ -423,7 +612,8 @@ function selectDblClick(td, event, text) {
 		if (!event) {
 			event = window.event;
 		}
-		if (event.keyCode == 27 && !(event.ctrlKey || event.shiftKey || event.altKey || event.metaKey)) { // 27 - Esc
+		if (event.keyCode == 27 && !event.shiftKey && !event.altKey && !isCtrl(event)) { // 27 - Esc
+			inputBlur.apply(input);
 			td.innerHTML = original;
 		}
 	};
@@ -450,10 +640,11 @@ function selectDblClick(td, event, text) {
 	}
 	td.innerHTML = '';
 	td.appendChild(input);
+	setupSubmitHighlight(td);
 	input.focus();
 	if (text == 2) { // long text
 		return ajax(location.href + '&' + encodeURIComponent(td.id) + '=', function (request) {
-			if (request.status) {
+			if (request.responseText) {
 				input.value = request.responseText;
 				input.name = td.id;
 			}
@@ -474,8 +665,8 @@ function selectDblClick(td, event, text) {
 
 /** Load and display next page in select
 * @param HTMLLinkElement
-* @param string
 * @param number
+* @param string
 * @return boolean
 */
 function selectLoadMore(a, limit, loading) {
@@ -485,12 +676,10 @@ function selectLoadMore(a, limit, loading) {
 	if (href) {
 		a.removeAttribute('href');
 		return ajax(href, function (request) {
-			document.getElementById('table').innerHTML += request.responseText;
-			var rows = 0;
-			request.responseText.replace(/(^|\n)<tr/g, function () {
-				rows++;
-			});
-			if (rows < limit) {
+			var tbody = document.createElement('tbody');
+			tbody.innerHTML = request.responseText;
+			document.getElementById('table').appendChild(tbody);
+			if (tbody.children.length < limit) {
 				a.parentNode.removeChild(a);
 			} else {
 				a.href = href.replace(/\d+$/, function (page) {
@@ -514,3 +703,104 @@ function eventStop(event) {
 		event.cancelBubble = true;
 	}
 }
+
+
+
+/** Setup highlighting of default submit button on form field focus
+* @param HTMLElement
+*/
+function setupSubmitHighlight(parent) {
+	for (var key in { input: 1, select: 1, textarea: 1 }) {
+		var inputs = parent.getElementsByTagName(key);
+		for (var i = 0; i < inputs.length; i++) {
+			setupSubmitHighlightInput(inputs[i])
+		}
+	}
+}
+
+/** Setup submit highlighting for single element
+* @param HTMLElement
+*/
+function setupSubmitHighlightInput(input) {
+	if (!/submit|image|file/.test(input.type)) {
+		addEvent(input, 'focus', inputFocus);
+		addEvent(input, 'blur', inputBlur);
+	}
+}
+
+/** Highlight default submit button
+* @this HTMLInputElement
+*/
+function inputFocus() {
+	var submit = findDefaultSubmit(this);
+	if (submit) {
+		alterClass(submit, 'default', true);
+	}
+}
+
+/** Unhighlight default submit button
+* @this HTMLInputElement
+*/
+function inputBlur() {
+	var submit = findDefaultSubmit(this);
+	if (submit) {
+		alterClass(submit, 'default');
+	}
+}
+
+/** Find submit button used by Enter
+* @param HTMLElement
+* @return HTMLInputElement
+*/
+function findDefaultSubmit(el) {
+	if (el.jushTextarea) {
+		el = el.jushTextarea;
+	}
+	var inputs = el.form.getElementsByTagName('input');
+	for (var i = 0; i < inputs.length; i++) {
+		var input = inputs[i];
+		if (input.type == 'submit' && !input.style.zIndex) {
+			return input;
+		}
+	}
+}
+
+
+
+/** Add event listener
+* @param HTMLElement
+* @param string without 'on'
+* @param function
+*/
+function addEvent(el, action, handler) {
+	if (el.addEventListener) {
+		el.addEventListener(action, handler, false);
+	} else {
+		el.attachEvent('on' + action, handler);
+	}
+}
+
+/** Defer focusing element
+* @param HTMLElement
+*/
+function focus(el) {
+	setTimeout(function () { // this has to be an anonymous function because Firefox passes some arguments to setTimeout callback
+		el.focus();
+	}, 0);
+}
+
+/** Clone node and setup submit highlighting
+* @param HTMLElement
+* @return HTMLElement
+*/
+function cloneNode(el) {
+	var el2 = el.cloneNode(true);
+	setupSubmitHighlight(el2);
+	return el2;
+}
+
+oninput = function (event) {
+	var target = event.target;
+	var maxLength = target.getAttribute('data-maxlength');
+	alterClass(target, 'maxlength', target.value && maxLength != null && target.value.length > maxLength); // maxLength could be 0
+};

adminer/table.inc.php

@@ -4,9 +4,10 @@ $fields = fields($TABLE);
 if (!$fields) {
 	$error = error();
 }
-$table_status = ($fields ? table_status($TABLE) : array());
+$table_status = table_status1($TABLE, true);
+
+page_header(($fields && is_view($table_status) ? $table_status['Engine'] == 'materialized view' ? lang('Materialized view') : lang('View') : lang('Table')) . ": " . h($TABLE), $error);
 
-page_header(($fields && is_view($table_status) ? lang('View') : lang('Table')) . ": " . h($TABLE), $error);
 $adminer->selectLinks($table_status);
 $comment = $table_status["Comment"];
 if ($comment != "") {
@@ -14,70 +15,52 @@ if ($comment != "") {
 }
 
 if ($fields) {
-	echo "<table cellspacing='0'>\n";
-	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 (support("comment") ? "<td>" . nbsp($field["comment"]) : "");
-		echo "\n";
-	}
-	echo "</table>\n";
-	
-	if (!is_view($table_status)) {
-		echo "<h3>" . lang('Indexes') . "</h3>\n";
+	$adminer->tableStructurePrint($fields);
+}
+
+if (!is_view($table_status)) {
+	if (support("indexes")) {
+		echo "<h3 id='indexes'>" . lang('Indexes') . "</h3>\n";
 		$indexes = indexes($TABLE);
 		if ($indexes) {
+			$adminer->tableIndexesPrint($indexes);
+		}
+		echo '<p class="links"><a href="' . h(ME) . 'indexes=' . urlencode($TABLE) . '">' . lang('Alter indexes') . "</a>\n";
+	}
+	
+	if (fk_support($table_status)) {
+		echo "<h3 id='foreign-keys'>" . lang('Foreign keys') . "</h3>\n";
+		$foreign_keys = foreign_keys($TABLE);
+		if ($foreign_keys) {
 			echo "<table cellspacing='0'>\n";
-			foreach ($indexes as $name => $index) {
-				ksort($index["columns"]); // enforce correct columns order
-				$print = array();
-				foreach ($index["columns"] as $key => $val) {
-					$print[] = "<i>" . h($val) . "</i>" . ($index["lengths"][$key] ? "(" . $index["lengths"][$key] . ")" : "");
-				}
-				echo "<tr title='" . h($name) . "'><th>$index[type]<td>" . implode(", ", $print) . "\n";
+			echo "<thead><tr><th>" . lang('Source') . "<td>" . lang('Target') . "<td>" . lang('ON DELETE') . "<td>" . lang('ON UPDATE') . "<td>&nbsp;</thead>\n";
+			foreach ($foreign_keys as $name => $foreign_key) {
+				echo "<tr title='" . h($name) . "'>";
+				echo "<th><i>" . implode("</i>, <i>", array_map('h', $foreign_key["source"])) . "</i>";
+				echo "<td><a href='" . h($foreign_key["db"] != "" ? preg_replace('~db=[^&]*~', "db=" . urlencode($foreign_key["db"]), ME) : ($foreign_key["ns"] != "" ? preg_replace('~ns=[^&]*~', "ns=" . urlencode($foreign_key["ns"]), ME) : ME)) . "table=" . urlencode($foreign_key["table"]) . "'>"
+					. ($foreign_key["db"] != "" ? "<b>" . h($foreign_key["db"]) . "</b>." : "") . ($foreign_key["ns"] != "" ? "<b>" . h($foreign_key["ns"]) . "</b>." : "") . h($foreign_key["table"])
+					. "</a>"
+				;
+				echo "(<i>" . implode("</i>, <i>", array_map('h', $foreign_key["target"])) . "</i>)";
+				echo "<td>" . nbsp($foreign_key["on_delete"]) . "\n";
+				echo "<td>" . nbsp($foreign_key["on_update"]) . "\n";
+				echo '<td><a href="' . h(ME . 'foreign=' . urlencode($TABLE) . '&name=' . urlencode($name)) . '">' . lang('Alter') . '</a>';
 			}
 			echo "</table>\n";
 		}
-		echo '<p><a href="' . h(ME) . 'indexes=' . urlencode($TABLE) . '">' . lang('Alter indexes') . "</a>\n";
-		
-		if (fk_support($table_status)) {
-			echo "<h3>" . lang('Foreign keys') . "</h3>\n";
-			$foreign_keys = foreign_keys($TABLE);
-			if ($foreign_keys) {
-				echo "<table cellspacing='0'>\n";
-				echo "<thead><tr><th>" . lang('Source') . "<td>" . lang('Target') . "<td>" . lang('ON DELETE') . "<td>" . lang('ON UPDATE') . ($jush != "sqlite" ? "<td>&nbsp;" : "") . "</thead>\n";
-				foreach ($foreign_keys as $name => $foreign_key) {
-					echo "<tr title='" . h($name) . "'>";
-					echo "<th><i>" . implode("</i>, <i>", array_map('h', $foreign_key["source"])) . "</i>";
-					echo "<td><a href='" . h($foreign_key["db"] != "" ? preg_replace('~db=[^&]*~', "db=" . urlencode($foreign_key["db"]), ME) : ($foreign_key["ns"] != "" ? preg_replace('~ns=[^&]*~', "ns=" . urlencode($foreign_key["ns"]), ME) : ME)) . "table=" . urlencode($foreign_key["table"]) . "'>"
-						. ($foreign_key["db"] != "" ? "<b>" . h($foreign_key["db"]) . "</b>." : "") . ($foreign_key["ns"] != "" ? "<b>" . h($foreign_key["ns"]) . "</b>." : "") . h($foreign_key["table"])
-						. "</a>"
-					;
-					echo "(<i>" . implode("</i>, <i>", array_map('h', $foreign_key["target"])) . "</i>)";
-					echo "<td>" . nbsp($foreign_key["on_delete"]) . "\n";
-					echo "<td>" . nbsp($foreign_key["on_update"]) . "\n";
-					echo ($jush == "sqlite" ? "" : '<td><a href="' . h(ME . 'foreign=' . urlencode($TABLE) . '&name=' . urlencode($name)) . '">' . lang('Alter') . '</a>');
-				}
-				echo "</table>\n";
-			}
-			if ($jush != "sqlite") {
-				echo '<p><a href="' . h(ME) . 'foreign=' . urlencode($TABLE) . '">' . lang('Add foreign key') . "</a>\n";
-			}
-		}
-		
-		if (support("trigger")) {
-			echo "<h3>" . lang('Triggers') . "</h3>\n";
-			$triggers = triggers($TABLE);
-			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 "</table>\n";
-			}
-			echo '<p><a href="' . h(ME) . 'trigger=' . urlencode($TABLE) . '">' . lang('Add trigger') . "</a>\n";
-		}
+		echo '<p class="links"><a href="' . h(ME) . 'foreign=' . urlencode($TABLE) . '">' . lang('Add foreign key') . "</a>\n";
 	}
 }
+
+if (support(is_view($table_status) ? "view_trigger" : "trigger")) {
+	echo "<h3 id='triggers'>" . lang('Triggers') . "</h3>\n";
+	$triggers = triggers($TABLE);
+	if ($triggers) {
+		echo "<table cellspacing='0'>\n";
+		foreach ($triggers as $key => $val) {
+			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";
+	}
+	echo '<p class="links"><a href="' . h(ME) . 'trigger=' . urlencode($TABLE) . '">' . lang('Add trigger') . "</a>\n";
+}

adminer/trigger.inc.php

@@ -1,42 +1,49 @@
 <?php
 $TABLE = $_GET["trigger"];
+$name = $_GET["name"];
 $trigger_options = trigger_options();
-$trigger_event = array("INSERT", "UPDATE", "DELETE");
+$row = (array) trigger($name) + array("Trigger" => $TABLE . "_bi");
 
-$dropped = false;
-if ($_POST && !$error && in_array($_POST["Timing"], $trigger_options["Timing"]) && in_array($_POST["Event"], $trigger_event) && in_array($_POST["Type"], $trigger_options["Type"])) {
-	$timing_event = " $_POST[Timing] $_POST[Event]";
-	$on = " ON " . table($TABLE);
-	$dropped = drop_create(
-		"DROP TRIGGER " . idf_escape($_GET["name"]) . ($jush == "pgsql" ? $on : ""),
-		"CREATE TRIGGER " . idf_escape($_POST["Trigger"]) . ($jush == "mssql" ? $on . $timing_event : $timing_event . $on) . rtrim(" $_POST[Type]\n$_POST[Statement]", ";") . ";",
-		ME . "table=" . urlencode($TABLE),
-		lang('Trigger has been dropped.'),
-		lang('Trigger has been altered.'),
-		lang('Trigger has been created.'),
-		$_GET["name"]
-	);
+if ($_POST) {
+	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 : "");
+		$location = ME . "table=" . urlencode($TABLE);
+		if ($_POST["drop"]) {
+			query_redirect($drop, $location, lang('Trigger has been dropped.'));
+		} else {
+			if ($name != "") {
+				queries($drop);
+			}
+			queries_redirect(
+				$location,
+				($name != "" ? lang('Trigger has been altered.') : lang('Trigger has been created.')),
+				queries(create_trigger($on, $_POST))
+			);
+			if ($name != "") {
+				queries(create_trigger($on, $row + array("Type" => reset($trigger_options["Type"]))));
+			}
+		}
+	}
+	$row = $_POST;
 }
 
-page_header(($_GET["name"] != "" ? lang('Alter trigger') . ": " . h($_GET["name"]) : lang('Create trigger')), $error, array("table" => $TABLE));
-
-$row = $_POST;
-if (!$row) {
-	$row = trigger($_GET["name"]) + array("Trigger" => $TABLE . "_bi");
-}
+page_header(($name != "" ? lang('Alter trigger') . ": " . h($name) : lang('Create trigger')), $error, array("table" => $TABLE));
 ?>
 
 <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">
+<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'); ?>">
-<?php if ($_GET["name"] != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
-<?php if ($dropped) { ?><input type="hidden" name="dropped" value="1"><?php } ?>
+<?php if ($name != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/type.inc.php

@@ -1,20 +1,20 @@
 <?php
 $TYPE = $_GET["type"];
+$row = $_POST;
 
 if ($_POST && !$error) {
 	$link = substr(ME, 0, -1);
 	if ($_POST["drop"]) {
 		query_redirect("DROP TYPE " . idf_escape($TYPE), $link, lang('Type has been dropped.'));
 	} else {
-		query_redirect("CREATE TYPE " . idf_escape(trim($_POST["name"])) . " $_POST[as]", $link, lang('Type has been created.'));
+		query_redirect("CREATE TYPE " . idf_escape(trim($row["name"])) . " $row[as]", $link, lang('Type has been created.'));
 	}
 }
 
 page_header($TYPE != "" ? lang('Alter type') . ": " . h($TYPE) : lang('Create type'), $error);
 
-$row = $_POST;
 if (!$row) {
-	$row = array("as" => "AS ");
+	$row["as"] = "AS ";
 }
 ?>
 
@@ -24,7 +24,7 @@ if (!$row) {
 if ($TYPE != "") {
 	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
 } else {
-	echo "<input name='name' value='" . h($row['name']) . "'>\n";
+	echo "<input name='name' value='" . h($row['name']) . "' autocapitalize='off'>\n";
 	textarea("as", $row["as"]);
 	echo "<p><input type='submit' value='" . lang('Save') . "'>\n";
 }

adminer/user.inc.php

@@ -26,6 +26,7 @@ if ($_POST) {
 }
 $grants = array();
 $old_pass = "";
+
 if (isset($_GET["host"]) && ($result = $connection->query("SHOW GRANTS FOR " . q($USER) . "@" . q($_GET["host"])))) { //! use information_schema for MySQL 5 - column names in column privileges are not escaped
 	while ($row = $result->fetch_row()) {
 		if (preg_match('~GRANT (.*) ON (.*) TO ~', $row[0], $match) && preg_match_all('~ *([^(,]*[^ ,(])( *\\([^)]+\\))?~', $match[1], $matches, PREG_SET_ORDER)) { //! escape the part between ON and TO
@@ -33,7 +34,7 @@ if (isset($_GET["host"]) && ($result = $connection->query("SHOW GRANTS FOR " . q
 				if ($val[1] != "USAGE") {
 					$grants["$match[2]$val[2]"][$val[1]] = true;
 				}
-				if (ereg(' WITH GRANT OPTION', $row[0])) { //! don't check inside strings and identifiers
+				if (preg_match('~ WITH GRANT OPTION~', $row[0])) { //! don't check inside strings and identifiers
 					$grants["$match[2]$val[2]"]["GRANT OPTION"] = true;
 				}
 			}
@@ -46,18 +47,27 @@ if (isset($_GET["host"]) && ($result = $connection->query("SHOW GRANTS FOR " . q
 
 if ($_POST && !$error) {
 	$old_user = (isset($_GET["host"]) ? q($USER) . "@" . q($_GET["host"]) : "''");
-	$new_user = q($_POST["user"]) . "@" . q($_POST["host"]); // if $_GET["host"] is not set then $new_user is always different
-	$pass = q($_POST["pass"]);
 	if ($_POST["drop"]) {
 		query_redirect("DROP USER $old_user", ME . "privileges=", lang('User has been dropped.'));
 	} else {
-		$created = false;
-		if ($old_user != $new_user) {
-			$created = queries(($connection->server_info < 5 ? "GRANT USAGE ON *.* TO" : "CREATE USER") . " $new_user IDENTIFIED BY" . ($_POST["hashed"] ? " PASSWORD" : "") . " $pass");
-			$error = !$created;
-		} elseif ($_POST["pass"] != $old_pass || !$_POST["hashed"]) {
-			queries("SET PASSWORD FOR $new_user = " . ($_POST["hashed"] ? $pass : "PASSWORD($pass)"));
+		$new_user = q($_POST["user"]) . "@" . q($_POST["host"]); // if $_GET["host"] is not set then $new_user is always different
+		$pass = $_POST["pass"];
+		if ($pass != '' && !$_POST["hashed"]) {
+			// compute hash in a separate query so that plain text password is not saved to history
+			$pass = $connection->result("SELECT PASSWORD(" . q($pass) . ")");
+			$error = !$pass;
 		}
+
+		$created = false;
+		if (!$error) {
+			if ($old_user != $new_user) {
+				$created = queries(($connection->server_info < 5 ? "GRANT USAGE ON *.* TO" : "CREATE USER") . " $new_user IDENTIFIED BY PASSWORD " . q($pass));
+				$error = !$created;
+			} elseif ($pass != $old_pass) {
+				queries("SET PASSWORD FOR $new_user = " . q($pass));
+			}
+		}
+
 		if (!$error) {
 			$revoke = array();
 			foreach ($new_grants as $object => $grant) {
@@ -83,6 +93,7 @@ if ($_POST && !$error) {
 				}
 			}
 		}
+
 		if (!$error && isset($_GET["host"])) {
 			if ($old_user != $new_user) {
 				queries("DROP USER $old_user");
@@ -94,7 +105,9 @@ if ($_POST && !$error) {
 				}
 			}
 		}
+
 		queries_redirect(ME . "privileges=", (isset($_GET["host"]) ? lang('User has been altered.') : lang('User has been created.')), !$error);
+
 		if ($created) {
 			// delete new user in case of an error
 			$connection->query("DROP USER $new_user");
@@ -113,15 +126,15 @@ if ($_POST) {
 	if ($old_pass != "") {
 		$row["hashed"] = true;
 	}
-	$grants[(DB != "" && !isset($_GET["host"]) ? idf_escape(addcslashes(DB, "%_")) : "") . ".*"] = array();
+	$grants[(DB == "" || $grants ? "" : idf_escape(addcslashes(DB, "%_\\"))) . ".*"] = array();
 }
 
 ?>
 <form action="" method="post">
 <table cellspacing="0">
-<tr><th><?php echo lang('Server'); ?><td><input name="host" maxlength="60" value="<?php echo h($row["host"]); ?>">
-<tr><th><?php echo lang('Username'); ?><td><input name="user" maxlength="16" value="<?php echo h($row["user"]); ?>">
-<tr><th><?php echo lang('Password'); ?><td><input id="pass" name="pass" value="<?php echo h($row["pass"]); ?>">
+<tr><th><?php echo lang('Server'); ?><td><input name="host" maxlength="60" value="<?php echo h($row["host"]); ?>" autocapitalize="off">
+<tr><th><?php echo lang('Username'); ?><td><input name="user" maxlength="16" value="<?php echo h($row["user"]); ?>" autocapitalize="off">
+<tr><th><?php echo lang('Password'); ?><td><input name="pass" id="pass" value="<?php echo h($row["pass"]); ?>">
 <?php if (!$row["hashed"]) { ?><script type="text/javascript">typePassword(document.getElementById('pass'));</script><?php } ?>
 <?php echo checkbox("hashed", 1, $row["hashed"], lang('Hashed'), "typePassword(this.form['pass'], this.checked);"); ?>
 </table>
@@ -129,13 +142,14 @@ if ($_POST) {
 <?php
 //! MAX_* limits, REQUIRE
 echo "<table cellspacing='0'>\n";
-echo "<thead><tr><th colspan='2'><a href='http://dev.mysql.com/doc/refman/" . substr($connection->server_info, 0, 3) . "/en/grant.html#priv_level' target='_blank' rel='noreferrer'>" . lang('Privileges') . "</a>";
+echo "<thead><tr><th colspan='2'>" . lang('Privileges') . doc_link(array('sql' => "grant.html#priv_level"));
 $i = 0;
 foreach ($grants as $object => $grant) {
-	echo '<th>' . ($object != "*.*" ? "<input name='objects[$i]' value='" . h($object) . "' size='10'>" : "<input type='hidden' name='objects[$i]' value='*.*' size='10'>*.*"); //! separate db, table, columns, PROCEDURE|FUNCTION, routine
+	echo '<th>' . ($object != "*.*" ? "<input name='objects[$i]' value='" . h($object) . "' size='10' autocapitalize='off'>" : "<input type='hidden' name='objects[$i]' value='*.*' size='10'>*.*"); //! separate db, table, columns, PROCEDURE|FUNCTION, routine
 	$i++;
 }
 echo "</thead>\n";
+
 foreach (array(
 	"" => "",
 	"Server Admin" => lang('Server'),
@@ -155,12 +169,13 @@ foreach (array(
 			} elseif (isset($_GET["grant"])) {
 				echo "<td><select name=$name><option><option value='1'" . ($value ? " selected" : "") . ">" . lang('Grant') . "<option value='0'" . ($value == "0" ? " selected" : "") . ">" . lang('Revoke') . "</select>";
 			} else {
-				echo "<td align='center'><input type='checkbox' name=$name value='1'" . ($value ? " checked" : "") . ($privilege == "All privileges" ? " id='grants-$i-all'" : ($privilege == "Grant option" ? "" : " onclick=\"if (this.checked) formUncheck('grants-$i-all');\"")) . ">"; //! uncheck all except grant if all is checked
+				echo "<td align='center'><label class='block'><input type='checkbox' name=$name value='1'" . ($value ? " checked" : "") . ($privilege == "All privileges" ? " id='grants-$i-all'" : ($privilege == "Grant option" ? "" : " onclick=\"if (this.checked) formUncheck('grants-$i-all');\"")) . "></label>"; //! uncheck all except grant if all is checked
 			}
 			$i++;
 		}
 	}
 }
+
 echo "</table>\n";
 ?>
 <p>