Release 4.9.1

Thanks to FrancoisCapon (https://github.com/vrana/adminer/pull/429)

.editorconfig

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

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+patreon: jakubvrana
+custom: ["https://sourceforge.net/p/adminer/donate/"]

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,67 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL"
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ master ]
+  schedule:
+    - cron: '20 16 * * 0'
+
+jobs:
+  analyze:
+    name: Analyze
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    # Initializes the CodeQL tools for scanning.
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v1
+      with:
+        languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
+    # If this step fails, then you should remove it and run the build manually (see below)
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v1
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+
+    #- run: |
+    #   make bootstrap
+    #   make release
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v1

.gitignore

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

.gitmodules

@@ -1,9 +1,6 @@
-[submodule "jush"]
-	path = externals/jush
-	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 "designs/hydra"]
+	path = designs/hydra
+	url = https://github.com/Niyko/Hydra-Dark-Theme-for-Adminer
+[submodule "designs/pepa-linha-dark"]
+	path = designs/pepa-linha-dark
+	url = https://github.com/pepa-linha/Adminer-Design-Dark/

.travis.yml

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

Makefile

@@ -0,0 +1,39 @@
+ROOT_DIRECTORY = $(shell dirname "$(realpath $(lastword $(MAKEFILE_LIST)))")
+PHP := $(shell which php)
+PORT := 8000
+
+
+.DEFAULT_GOAL := default
+
+
+.PHONY: default
+default: compile
+
+.PHONY: compile
+compile:
+	$(PHP) $(ROOT_DIRECTORY)/compile.php
+
+.PHONY: server
+server:
+	php \
+	  --server 127.0.0.1:$(PORT) \
+	  --docroot $(ROOT_DIRECTORY)
+
+.PHONY: initialize
+initialize:
+	git \
+	  -C $(ROOT_DIRECTORY) \
+	  submodule \
+	  update \
+	  --init \
+	  --recursive
+
+.PHONY: clean
+clean:
+	rm \
+	  --recursive \
+	  --force \
+	  $(ROOT_DIRECTORY)/adminer.php
+
+.PHONY: clean.all
+clean.all: clean

SECURITY.md

@@ -0,0 +1,11 @@
+# Security Policy
+
+## Supported Versions
+
+I support only the last published version and the last development version (last commit).
+
+## Reporting a Vulnerability
+
+To report a vulnerability, create a private bug at https://sourceforge.net/p/adminer/bugs-and-features/new/?private=1.
+
+I handle security issues with top priority. If you don't hear from me in a week then please ping the bug. Once I accept the bug, the fix should be available and new version released within days. I will mark the bug as public after releasing a new version or declining the bug.

adminer/call.inc.php

@@ -1,8 +1,8 @@
 <?php
-$PROCEDURE = $_GET["call"];
+$PROCEDURE = ($_GET["name"] ? $_GET["name"] : $_GET["call"]);
 page_header(lang('Call') . ": " . h($PROCEDURE), $error);
 
-$routine = routine($PROCEDURE, (isset($_GET["callf"]) ? "FUNCTION" : "PROCEDURE"));
+$routine = routine($_GET["call"], (isset($_GET["callf"]) ? "FUNCTION" : "PROCEDURE"));
 $in = array();
 $out = array();
 foreach ($routine["fields"] as $i => $field) {
@@ -30,9 +30,12 @@ if (!$error && $_POST) {
 	}
 	
 	$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";
+	$start = microtime(true);
+	$result = $connection->multi_query($query);
+	$affected = $connection->affected_rows; // getting warnigns overwrites this
+	echo $adminer->selectQuery($query, $start, !$result);
 	
-	if (!$connection->multi_query($query)) {
+	if (!$result) {
 		echo "<p class='error'>" . error() . "\n";
 	} else {
 		$connection2 = connect();
@@ -45,7 +48,9 @@ if (!$error && $_POST) {
 			if (is_object($result)) {
 				select($result, $connection2);
 			} else {
-				echo "<p class='message'>" . lang('Routine has been called, %d row(s) affected.', $connection->affected_rows) . "\n";
+				echo "<p class='message'>" . lang('Routine has been called, %d row(s) affected.', $affected)
+					. " <span class='time'>" . @date("H:i:s") . "</span>\n" // @ - time zone may be not set
+				;
 			}
 		} while ($connection->next_result());
 		
@@ -59,7 +64,7 @@ if (!$error && $_POST) {
 <form action="" method="post">
 <?php
 if ($in) {
-	echo "<table cellspacing='0'>\n";
+	echo "<table cellspacing='0' class='layout'>\n";
 	foreach ($in as $key) {
 		$field = $routine["fields"][$key];
 		$name = $field["field"];

adminer/create.inc.php

@@ -27,6 +27,10 @@ if ($row["auto_increment_col"]) {
 	$row["fields"][$row["auto_increment_col"]]["auto_increment"] = true;
 }
 
+if ($_POST) {
+	set_adminer_settings(array("comments" => $_POST["comments"], "defaults" => $_POST["defaults"]));
+}
+
 if ($_POST && !process_fields($row["fields"]) && !$error) {
 	if ($_POST["drop"]) {
 		queries_redirect(substr(ME, 0, -1), lang('Table has been dropped.'), drop_tables(array($TABLE)));
@@ -50,7 +54,7 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 				}
 				$process_field = process_field($field, $type_field);
 				$all_fields[] = array($field["orig"], $process_field, $after);
-				if ($process_field != process_field($orig_field, $orig_field)) {
+				if (!$orig_field || $process_field != process_field($orig_field, $orig_field)) {
 					$fields[] = array($field["orig"], $process_field, $after);
 					if ($field["orig"] != "" || $after) {
 						$use_all_fields = true;
@@ -120,7 +124,7 @@ page_header(($TABLE != "" ? lang('Alter table') : lang('Create table')), $error,
 if (!$_POST) {
 	$row = array(
 		"Engine" => $_COOKIE["adminer_engine"],
-		"fields" => array(array("field" => "", "type" => (isset($types["int"]) ? "int" : (isset($types["integer"]) ? "integer" : "")))),
+		"fields" => array(array("field" => "", "type" => (isset($types["int"]) ? "int" : (isset($types["integer"]) ? "integer" : "")), "on_update" => "")),
 		"partition_names" => array(""),
 	);
 
@@ -162,49 +166,48 @@ foreach ($engines as $engine) {
 <form action="" method="post" id="form">
 <p>
 <?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 lang('Table name'); ?>: <input name="name" data-maxlength="64" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
+<?php if ($TABLE == "" && !$_POST) { echo script("focus(qs('#form')['name']);"); } ?>
+<?php echo ($engines ? "<select name='Engine'>" . optionlist(array("" => "(" . lang('engine') . ")") + $engines, $row["Engine"]) . "</select>" . on_help("getTarget(event).value", 1) . script("qsl('select').onchange = helpClose;") : ""); ?>
  <?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")) { ?>
+<div class="scrollable">
 <table cellspacing="0" id="edit-fields" class="nowrap">
 <?php
-$comments = ($_POST ? $_POST["comments"] : $row["Comment"] != "");
-if (!$_POST && !$comments) {
-	foreach ($row["fields"] as $field) {
-		if ($field["comment"] != "") {
-			$comments = true;
-			break;
-		}
-	}
-}
-edit_fields($row["fields"], $collations, "TABLE", $foreign_keys, $comments);
+edit_fields($row["fields"], $collations, "TABLE", $foreign_keys);
 ?>
 </table>
+<?php echo script("editFields();"); ?>
+</div>
 <p>
 <?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"') . '>'
+<?php echo checkbox("defaults", 1, ($_POST ? $_POST["defaults"] : adminer_setting("defaults")), lang('Default values'), "columnShow(this.checked, 5)", "jsonly"); ?>
+<?php
+$comments = ($_POST ? $_POST["comments"] : adminer_setting("comments"));
+echo (support("comment")
+	? checkbox("comments", 1, $comments, lang('Comment'), "editingCommentsClick(this, true);", "jsonly")
+		. ' ' . (preg_match('~\n~', $row["Comment"])
+			? "<textarea name='Comment' rows='2' cols='20'" . ($comments ? "" : " class='hidden'") . ">" . h($row["Comment"]) . "</textarea>"
+			: '<input name="Comment" value="' . h($row["Comment"]) . '" data-maxlength="' . (min_version(5.5) ? 2048 : 60) . '"' . ($comments ? "" : " class='hidden'") . '>'
+		)
 	: '')
-; ?>
+;
+?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php } ?>
 
-<?php if ($TABLE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if ($TABLE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $TABLE)); ?><?php } ?>
 <?php
 if (support("partitioning")) {
 	$partition_table = preg_match('~RANGE|LIST~', $row["partition_by"]);
 	print_fieldset("partition", lang('Partition by'), $row["partition_by"]);
 	?>
 <p>
-<?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>"; ?>
+<?php echo "<select name='partition_by'>" . optionlist(array("" => "") + $partition_by, $row["partition_by"]) . "</select>" . on_help("getTarget(event).value.replace(/./, 'PARTITION BY \$&')", 1) . script("qsl('select').onchange = partitionByChange;"); ?>
 (<input name="partition" value="<?php echo h($row["partition"]); ?>">)
 <?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'"); ?>>
@@ -212,7 +215,8 @@ if (support("partitioning")) {
 <?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);"' : '') . ' autocapitalize="off">';
+	echo '<td><input name="partition_names[]" value="' . h($val) . '" autocapitalize="off">';
+	echo ($key == count($row["partition_names"]) - 1 ? script("qsl('input').oninput = partitionNameChange;") : '');
 	echo '<td><input name="partition_values[]" value="' . h($row["partition_values"][$key]) . '">';
 }
 ?>

adminer/database.inc.php

@@ -47,7 +47,7 @@ if ($_POST) {
 } elseif ($jush == "sql") {
 	// propose database name with limited privileges
 	foreach (get_vals("SHOW GRANTS") as $grant) {
-		if (preg_match('~ ON (`(([^\\\\`]|``|\\\\.)*)%`\\.\\*)?~', $grant, $match) && $match[1]) {
+		if (preg_match('~ ON (`(([^\\\\`]|``|\\\\.)*)%`\.\*)?~', $grant, $match) && $match[1]) {
 			$name = stripcslashes(idf_unescape("`$match[2]`"));
 			break;
 		}
@@ -60,17 +60,18 @@ if ($_POST) {
 <?php
 echo ($_POST["add_x"] || strpos($name, "\n")
 	? '<textarea id="name" name="name" rows="10" cols="40">' . h($name) . '</textarea><br>'
-	: '<input name="name" id="name" value="' . h($name) . '" maxlength="64" autocapitalize="off">'
+	: '<input name="name" id="name" value="' . h($name) . '" data-maxlength="64" autocapitalize="off">'
 ) . "\n" . ($collations ? html_select("collation", array("" => "(" . lang('collation') . ")") + $collations, $row["collation"]) . doc_link(array(
 	'sql' => "charset-charsets.html",
+	'mariadb' => "supported-character-sets-and-collations/",
 	'mssql' => "ms187963.aspx",
 )) : "");
+echo script("focus(qs('#name'));");
 ?>
-<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";
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . confirm(lang('Drop %s?', DB)) . "\n";
 } elseif (!$_POST["add_x"] && $_GET["db"] == "") {
 	echo "<input type='image' class='icon' name='add' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>\n";
 }

adminer/db.inc.php

@@ -4,7 +4,7 @@ $tables_views = array_merge((array) $_POST["tables"], (array) $_POST["views"]);
 if ($tables_views && !$error && !$_POST["search"]) {
 	$result = true;
 	$message = "";
-	if ($jush == "sql" && count($_POST["tables"]) > 1 && ($_POST["drop"] || $_POST["truncate"] || $_POST["copy"])) {
+	if ($jush == "sql" && $_POST["tables"] && 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
 	}
 
@@ -56,31 +56,36 @@ if ($adminer->homepage()) {
 			echo "<form action='' method='post'>\n";
 			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 "<input type='search' name='query' value='" . h($_POST["query"]) . "'>";
+				echo script("qsl('input').onkeydown = partialArg(bodyKeydown, 'search');", "");
+				echo " <input type='submit' name='search' value='" . lang('Search') . "'>\n";
 				echo "</div></fieldset>\n";
 				if ($_POST["search"] && $_POST["query"] != "") {
+					$_GET["where"][0]["op"] = $driver->convertOperator("LIKE %%");
 					search_tables();
 				}
 			}
-			$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 "<div class='scrollable'>\n";
+			echo "<table cellspacing='0' class='nowrap checkable'>\n";
+			echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
+			echo '<thead><tr class="wrap">';
+			echo '<td><input id="check-all" type="checkbox" class="jsonly">' . script("qs('#check-all').onclick = partial(formCheck, /^(tables|views)\[/);", "");
 			echo '<th>' . lang('Table');
 			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 '<td>' . lang('Collation') . doc_link(array('sql' => 'charset-charsets.html', 'mariadb' => 'supported-character-sets-and-collations/'));
+			echo '<td>' . lang('Data Length') . doc_link(array('sql' => 'show-table-status.html', 'pgsql' => 'functions-admin.html#FUNCTIONS-ADMIN-DBOBJECT', 'oracle' => 'REFRN20286'));
+			echo '<td>' . lang('Index Length') . doc_link(array('sql' => 'show-table-status.html', 'pgsql' => 'functions-admin.html#FUNCTIONS-ADMIN-DBOBJECT'));
+			echo '<td>' . lang('Data Free') . doc_link(array('sql' => 'show-table-status.html'));
+			echo '<td>' . lang('Auto Increment') . doc_link(array('sql' => 'example-auto-increment.html', 'mariadb' => 'auto_increment/'));
+			echo '<td>' . lang('Rows') . doc_link(array('sql' => 'show-table-status.html', 'pgsql' => 'catalog-pg-class.html#CATALOG-PG-CLASS', 'oracle' => 'REFRN20286'));
+			echo (support("comment") ? '<td>' . lang('Comment') . doc_link(array('sql' => 'show-table-status.html', 'pgsql' => 'functions-info.html#FUNCTIONS-INFO-COMMENT-TABLE')) : '');
 			echo "</thead>\n";
 
 			$tables = 0;
 			foreach ($tables_list as $name => $type) {
-				$view = ($type !== null && !preg_match('~table~i', $type));
+				$view = ($type !== null && !preg_match('~table|sequence~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 '<tr' . odd() . '><td>' . checkbox(($view ? "views[]" : "tables[]"), $name, in_array($name, $tables_views, true), "", "", "", $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') . '">' . (preg_match('~materialized~i', $type) ? lang('Materialized view') : lang('View')) . '</a>';
@@ -99,48 +104,52 @@ if ($adminer->homepage()) {
 						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;");
+						) : "<td id='$key-" . h($name) . "'>");
 					}
 					$tables++;
 				}
-				echo (support("comment") ? "<td id='Comment-" . h($name) . "'>&nbsp;" : "");
+				echo (support("comment") ? "<td id='Comment-" . h($name) . "'>" : "");
 			}
 
-			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()));
+			echo "<tr><td><th>" . lang('%d in total', count($tables_list));
+			echo "<td>" . h($jush == "sql" ? $connection->result("SELECT @@default_storage_engine") : "");
+			echo "<td>" . h(db_collation(DB, collations()));
 			foreach (array("Data_length", "Index_length", "Data_free") as $key) {
-				echo "<td align='right' id='sum-$key'>&nbsp;";
+				echo "<td align='right' id='sum-$key'>";
 			}
 
 			echo "</table>\n";
+			echo "</div>\n";
 			if (!information_schema(DB)) {
-				$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 "<div class='footer'><div>\n";
+				$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'") . "> "
+				: ($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";
+				. "<input type='submit' name='truncate' value='" . lang('Truncate') . "'> " . on_help($jush == "sqlite" ? "'DELETE'" : "'TRUNCATE" . ($jush == "pgsql" ? "'" : " TABLE'")) . confirm()
+				. "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . on_help("'DROP TABLE'") . confirm() . "\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) . '" autocapitalize="off">');
 					echo " <input type='submit' name='move' value='" . lang('Move') . "'>";
-					echo (support("copy") ? " <input type='submit' name='copy' value='" . lang('Copy') . "'>" : "");
+					echo (support("copy") ? " <input type='submit' name='copy' value='" . lang('Copy') . "'> " . checkbox("overwrite", 1, $_POST["overwrite"], lang('overwrite')) : "");
 					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='all' value=''>"; // used by trCheck()
+				echo script("qsl('input').onclick = function () { selectCount('selected', formChecked(this, /^(tables|views)\[/));" . (support("table") ? " selectCount('selected2', formChecked(this, /^tables\[/) || $tables);" : "") . " }");
 				echo "<input type='hidden' name='token' value='$token'>\n";
 				echo "</div></fieldset>\n";
+				echo "</div></div>\n";
 			}
 			echo "</form>\n";
-			echo "<script type='text/javascript'>tableCheck();</script>\n";
+			echo script("tableCheck();");
 		}
 
 		echo '<p class="links"><a href="' . h(ME) . 'create=">' . lang('Create table') . "</a>\n";
@@ -151,14 +160,15 @@ if ($adminer->homepage()) {
 			$routines = routines();
 			if ($routines) {
 				echo "<table cellspacing='0'>\n";
-				echo '<thead><tr><th>' . lang('Name') . '<td>' . lang('Type') . '<td>' . lang('Return type') . "<td>&nbsp;</thead>\n";
+				echo '<thead><tr><th>' . lang('Name') . '<td>' . lang('Type') . '<td>' . lang('Return type') . "<td></thead>\n";
 				odd('');
 				foreach ($routines as $row) {
+					$name = ($row["SPECIFIC_NAME"] == $row["ROUTINE_NAME"] ? "" : "&name=" . urlencode($row["ROUTINE_NAME"])); // not computed on the pages to be able to print the header first
 					echo '<tr' . odd() . '>';
-					echo '<th><a href="' . h(ME) . ($row["ROUTINE_TYPE"] != "PROCEDURE" ? 'callf=' : 'call=') . urlencode($row["ROUTINE_NAME"]) . '">' . h($row["ROUTINE_NAME"]) . '</a>';
+					echo '<th><a href="' . h(ME . ($row["ROUTINE_TYPE"] != "PROCEDURE" ? 'callf=' : 'call=') . urlencode($row["SPECIFIC_NAME"]) . $name) . '">' . h($row["ROUTINE_NAME"]) . '</a>';
 					echo '<td>' . h($row["ROUTINE_TYPE"]);
 					echo '<td>' . h($row["DTD_IDENTIFIER"]);
-					echo '<td><a href="' . h(ME) . ($row["ROUTINE_TYPE"] != "PROCEDURE" ? 'function=' : 'procedure=') . urlencode($row["ROUTINE_NAME"]) . '">' . lang('Alter') . "</a>";
+					echo '<td><a href="' . h(ME . ($row["ROUTINE_TYPE"] != "PROCEDURE" ? 'function=' : 'procedure=') . urlencode($row["SPECIFIC_NAME"]) . $name) . '">' . lang('Alter') . "</a>";
 				}
 				echo "</table>\n";
 			}
@@ -221,7 +231,7 @@ if ($adminer->homepage()) {
 		}
 
 		if ($tables_list) {
-			echo "<script type='text/javascript'>ajaxSetHtml('" . js_escape(ME) . "script=db');</script>\n";
+			echo script("ajaxSetHtml('" . js_escape(ME) . "script=db');");
 		}
 	}
 }

adminer/designs.php

@@ -0,0 +1,14 @@
+<?php
+function adminer_object() {
+	include_once "../plugins/plugin.php";
+	include_once "../plugins/designs.php";
+	$designs = array();
+	foreach (glob("../designs/*", GLOB_ONLYDIR) as $filename) {
+		$designs["$filename/adminer.css"] = basename($filename);
+	}
+	return new AdminerPlugin(array(
+		new AdminerDesigns($designs),
+	));
+}
+
+include "./index.php";

adminer/download.inc.php

@@ -6,5 +6,5 @@ header("Content-Disposition: attachment; filename=" . friendly_url("$TABLE-" . i
 $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];
+echo $driver->value($row[0], $fields[$_GET["field"]]);
 exit; // don't output footer

adminer/drivers/elastic.inc.php

@@ -1,375 +0,0 @@
-<?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/mongo.inc.php

@@ -1,31 +1,27 @@
 <?php
-$drivers["mongo"] = "MongoDB (beta)";
+$drivers["mongo"] = "MongoDB (alpha)";
 
 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;
+			var $extension = "Mongo", $server_info = MongoClient::VERSION, $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;
-				}
+			function connect($uri, $options) {
 				try {
-					$this->_link = @new MongoClient("mongodb://$server", $options);
-					return true;
-				} catch (Exception $ex) {
-					$this->error = $ex->getMessage();
-					return false;
+					$this->_link = new MongoClient($uri, $options);
+					if ($options["password"] != "") {
+						$options["password"] = "";
+						try {
+							new MongoClient($uri, $options);
+							$this->error = lang('Database does not support password.');
+						} catch (Exception $e) {
+							// this is what we want
+						}
+					}
+				} catch (Exception $e) {
+					$this->error = $e->getMessage();
 				}
 			}
 			
@@ -46,7 +42,6 @@ if (isset($_GET["mongo"])) {
 			function quote($string) {
 				return $string;
 			}
-
 		}
 
 		class Min_Result {
@@ -60,10 +55,10 @@ if (isset($_GET["mongo"])) {
 							$this->_charset[$key] = 63;
 						}
 						$row[$key] =
-							(is_a($val, 'MongoId') ? 'ObjectId("' . strval($val) . '")' :
+							(is_a($val, 'MongoId') ? "ObjectId(\"$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_a($val, 'MongoRegex') ? "$val" :
 							(is_object($val) ? get_class($val) : // MongoMinKey, MongoMaxKey
 							$val
 						)))));
@@ -109,97 +104,488 @@ if (isset($_GET["mongo"])) {
 			}
 
 		}
-	}
 
 
 
-	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);
+		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 != "" ? +$limit : 0)
+					->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;
+				}
 			}
-			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();
+
+		function get_databases($flush) {
+			global $connection;
+			$return = array();
+			$dbs = $connection->_link->listDBs();
+			foreach ($dbs['databases'] as $db) {
+				$return[] = $db['name'];
+			}
+			return $return;
+		}
+
+		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 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 found_rows($table_status, $where) {
+			global $connection;
+			//! don't call count_rows()
+			return $connection->_db->selectCollection($_GET["select"])->count($where);
+		}
+
+		$operators = array("=");
+
+	} elseif (class_exists('MongoDB\Driver\Manager')) {
+		class Min_DB {
+			var $extension = "MongoDB", $server_info = MONGODB_VERSION, $affected_rows, $error, $last_id;
+			/** @var MongoDB\Driver\Manager */
+			var $_link;
+			var $_db, $_db_name;
+
+			function connect($uri, $options) {
+				$class = 'MongoDB\Driver\Manager';
+				$this->_link = new $class($uri, $options);
+				$this->executeCommand('admin', array('ping' => 1));
+			}
+			
+			function executeCommand($db, $command) {
+				$class = 'MongoDB\Driver\Command';
+				try {
+					return $this->_link->executeCommand($db, new $class($command));
+				} catch (Exception $e) {
+					$this->error = $e->getMessage();
+					return array();
+				}
+			}
+			
+			function executeBulkWrite($namespace, $bulk, $counter) {
+				try {
+					$results = $this->_link->executeBulkWrite($namespace, $bulk);
+					$this->affected_rows = $results->$counter();
+					return true;
+				} catch (Exception $e) {
+					$this->error = $e->getMessage();
+					return false;
+				}
+			}
+
+			function query($query) {
 				return false;
 			}
+
+			function select_db($database) {
+				$this->_db_name = $database;
+				return true;
+			}
+
+			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, 'MongoDB\BSON\Binary')) {
+							$this->_charset[$key] = 63;
+						}
+						$row[$key] =
+							(is_a($val, 'MongoDB\BSON\ObjectID') ? 'MongoDB\BSON\ObjectID("' . "$val\")" :
+							(is_a($val, 'MongoDB\BSON\UTCDatetime') ? $val->toDateTime()->format('Y-m-d H:i:s') :
+							(is_a($val, 'MongoDB\BSON\Binary') ? $val->getData() : //! allow downloading
+							(is_a($val, 'MongoDB\BSON\Regex') ? "$val" :
+							(is_object($val) || is_array($val) ? json_encode($val, 256) : // 256 = JSON_UNESCAPED_UNICODE
+							$val // MongoMinKey, MongoMaxKey
+						)))));
+					}
+					$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],
+				);
+			}
 
-	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];
-	}
+		class Min_Driver extends Min_SQL {
+			public $primary = "_id";
 
-	function get_databases($flush) {
-		global $connection;
-		$return = array();
-		$dbs = $connection->_link->listDBs();
-		foreach ($dbs['databases'] as $db) {
-			$return[] = $db['name'];
+			function select($table, $select, $where, $group, $order = array(), $limit = 1, $page = 0, $print = false) {
+				global $connection;
+				$select = ($select == array("*")
+					? array()
+					: array_fill_keys($select, 1)
+				);
+				if (count($select) && !isset($select['_id'])) {
+					$select['_id'] = 0;
+				}
+				$where = where_to_query($where);
+				$sort = array();
+				foreach ($order as $val) {
+					$val = preg_replace('~ DESC$~', '', $val, 1, $count);
+					$sort[$val] = ($count ? -1 : 1);
+				}
+				if (isset($_GET['limit']) && is_numeric($_GET['limit']) && $_GET['limit'] > 0) {
+					$limit = $_GET['limit'];
+				}
+				$limit = min(200, max(1, (int) $limit));
+				$skip = $page * $limit;
+				$class = 'MongoDB\Driver\Query';
+				try {
+					return new Min_Result($connection->_link->executeQuery("$connection->_db_name.$table", new $class($where, array('projection' => $select, 'limit' => $limit, 'skip' => $skip, 'sort' => $sort))));
+				} catch (Exception $e) {
+					$connection->error = $e->getMessage();
+					return false;
+				}
+			}
+
+			function update($table, $set, $queryWhere, $limit = 0, $separator = "\n") {
+				global $connection;
+				$db = $connection->_db_name;
+				$where = sql_query_where_parser($queryWhere);
+				$class = 'MongoDB\Driver\BulkWrite';
+				$bulk = new $class(array());
+				if (isset($set['_id'])) {
+					unset($set['_id']);
+				}
+				$removeFields = array();
+				foreach ($set as $key => $value) {
+					if ($value == 'NULL') {
+						$removeFields[$key] = 1;
+						unset($set[$key]);
+					}
+				}
+				$update = array('$set' => $set);
+				if (count($removeFields)) {
+					$update['$unset'] = $removeFields;
+				}
+				$bulk->update($where, $update, array('upsert' => false));
+				return $connection->executeBulkWrite("$db.$table", $bulk, 'getModifiedCount');
+			}
+
+			function delete($table, $queryWhere, $limit = 0) {
+				global $connection;
+				$db = $connection->_db_name;
+				$where = sql_query_where_parser($queryWhere);
+				$class = 'MongoDB\Driver\BulkWrite';
+				$bulk = new $class(array());
+				$bulk->delete($where, array('limit' => $limit));
+				return $connection->executeBulkWrite("$db.$table", $bulk, 'getDeletedCount');
+			}
+
+			function insert($table, $set) {
+				global $connection;
+				$db = $connection->_db_name;
+				$class = 'MongoDB\Driver\BulkWrite';
+				$bulk = new $class(array());
+				if ($set['_id'] == '') {
+					unset($set['_id']);
+				}
+				$bulk->insert($set);
+				return $connection->executeBulkWrite("$db.$table", $bulk, 'getInsertedCount');
+			}
 		}
-		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));
+		function get_databases($flush) {
+			global $connection;
+			$return = array();
+			foreach ($connection->executeCommand('admin', array('listDatabases' => 1)) as $dbs) {
+				foreach ($dbs->databases as $db) {
+					$return[] = $db->name;
+				}
+			}
+			return $return;
 		}
-		return $return;
+
+		function count_tables($databases) {
+			$return = array();
+			return $return;
+		}
+
+		function tables_list() {
+			global $connection;
+			$collections = array();
+			foreach ($connection->executeCommand($connection->_db_name, array('listCollections' => 1)) as $result) {
+				$collections[$result->name] = 'table';
+			}
+			return $collections;
+		}
+
+		function drop_databases($databases) {
+			return false;
+		}
+
+		function indexes($table, $connection2 = null) {
+			global $connection;
+			$return = array();
+			foreach ($connection->executeCommand($connection->_db_name, array('listIndexes' => $table)) as $index) {
+				$descs = array();
+				$columns = array();
+				foreach (get_object_vars($index->key) as $column => $type) {
+					$descs[] = ($type == -1 ? '1' : null);
+					$columns[] = $column;
+				}
+				$return[$index->name] = array(
+					"type" => ($index->name == "_id_" ? "PRIMARY" : (isset($index->unique) ? "UNIQUE" : "INDEX")),
+					"columns" => $columns,
+					"lengths" => array(),
+					"descs" => $descs,
+				);
+			}
+			return $return;
+		}
+
+		function fields($table) {
+			global $driver;
+			$fields = fields_from_edit();
+			if (!$fields) {
+				$result = $driver->select($table, array("*"), null, null, array(), 10);
+				if ($result) {
+					while ($row = $result->fetch_assoc()) {
+						foreach ($row as $key => $val) {
+							$row[$key] = null;
+							$fields[$key] = array(
+								"field" => $key,
+								"type" => "string",
+								"null" => ($key != $driver->primary),
+								"auto_increment" => ($key == $driver->primary),
+								"privileges" => array(
+									"insert" => 1,
+									"select" => 1,
+									"update" => 1,
+									"where" => 1,
+									"order" => 1,
+								),
+							);
+						}
+					}
+				}
+			}
+			return $fields;
+		}
+
+		function found_rows($table_status, $where) {
+			global $connection;
+			$where = where_to_query($where);
+			$toArray = $connection->executeCommand($connection->_db_name, array('count' => $table_status['Name'], 'query' => $where))->toArray();
+			return $toArray[0]->n;
+		}
+
+		function sql_query_where_parser($queryWhere) {
+			$queryWhere = preg_replace('~^\sWHERE \(?\(?(.+?)\)?\)?$~', '\1', $queryWhere);
+			$wheres = explode(' AND ', $queryWhere);
+			$wheresOr = explode(') OR (', $queryWhere);
+			$where = array();
+			foreach ($wheres as $whereStr) {
+				$where[] = trim($whereStr);
+			}
+			if (count($wheresOr) == 1) {
+				$wheresOr = array();
+			} elseif (count($wheresOr) > 1) {
+				$where = array();
+			}
+			return where_to_query($where, $wheresOr);
+		}
+
+		function where_to_query($whereAnd = array(), $whereOr = array()) {
+			global $adminer;
+			$data = array();
+			foreach (array('and' => $whereAnd, 'or' => $whereOr) as $type => $where) {
+				if (is_array($where)) {
+					foreach ($where as $expression) {
+						list($col, $op, $val) = explode(" ", $expression, 3);
+						if ($col == "_id" && preg_match('~^(MongoDB\\\\BSON\\\\ObjectID)\("(.+)"\)$~', $val, $match)) {
+							list(, $class, $val) = $match;
+							$val = new $class($val);
+						}
+						if (!in_array($op, $adminer->operators)) {
+							continue;
+						}
+						if (preg_match('~^\(f\)(.+)~', $op, $match)) {
+							$val = (float) $val;
+							$op = $match[1];
+						} elseif (preg_match('~^\(date\)(.+)~', $op, $match)) {
+							$dateTime = new DateTime($val);
+							$class = 'MongoDB\BSON\UTCDatetime';
+							$val = new $class($dateTime->getTimestamp() * 1000);
+							$op = $match[1];
+						}
+						switch ($op) {
+							case '=':
+								$op = '$eq';
+								break;
+							case '!=':
+								$op = '$ne';
+								break;
+							case '>':
+								$op = '$gt';
+								break;
+							case '<':
+								$op = '$lt';
+								break;
+							case '>=':
+								$op = '$gte';
+								break;
+							case '<=':
+								$op = '$lte';
+								break;
+							case 'regex':
+								$op = '$regex';
+								break;
+							default:
+								continue 2;
+						}
+						if ($type == 'and') {
+							$data['$and'][] = array($col => array($op => $val));
+						} elseif ($type == 'or') {
+							$data['$or'][] = array($col => array($op => $val));
+						}
+					}
+				}
+			}
+			return $data;
+		}
+
+		$operators = array(
+			"=",
+			"!=",
+			">",
+			"<",
+			">=",
+			"<=",
+			"regex",
+			"(f)=",
+			"(f)!=",
+			"(f)>",
+			"(f)<",
+			"(f)>=",
+			"(f)<=",
+			"(date)=",
+			"(date)!=",
+			"(date)>",
+			"(date)<",
+			"(date)>=",
+			"(date)<=",
+		);
+	
 	}
 
-	function tables_list() {
-		global $connection;
-		return array_fill_keys($connection->_db->getCollectionNames(true), 'table');
+	function table($idf) {
+		return $idf;
+	}
+
+	function idf_escape($idf) {
+		return $idf;
 	}
 
 	function table_status($name = "", $fast = false) {
@@ -213,43 +599,90 @@ if (isset($_GET["mongo"])) {
 		return $return;
 	}
 
-	function information_schema() {
+	function create_database($db, $collation) {
+		return true;
 	}
 
-	function is_view($table_status) {
-	}
-
-	function drop_databases($databases) {
+	function last_id() {
 		global $connection;
-		foreach ($databases as $db) {
-			$response = $connection->_link->selectDB($db)->drop();
-			if (!$response['ok']) {
+		return $connection->last_id;
+	}
+
+	function error() {
+		global $connection;
+		return h($connection->error);
+	}
+
+	function collations() {
+		return array();
+	}
+
+	function logged_user() {
+		global $adminer;
+		$credentials = $adminer->credentials();
+		return $credentials[1];
+	}
+
+	function connect() {
+		global $adminer;
+		$connection = new Min_DB;
+		list($server, $username, $password) = $adminer->credentials();
+		$options = array();
+		if ($username . $password != "") {
+			$options["username"] = $username;
+			$options["password"] = $password;
+		}
+		$db = $adminer->database();
+		if ($db != "") {
+			$options["db"] = $db;
+		}
+		if (($auth_source = getenv("MONGO_AUTH_SOURCE"))) {
+			$options["authSource"] = $auth_source;
+		}
+		$connection->connect("mongodb://$server", $options);
+		if ($connection->error) {
+			return $connection->error;
+		}
+		return $connection;
+	}
+
+	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 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 support($feature) {
+		return preg_match("~database|indexes|descidx~", $feature);
 	}
 
-	function fields($table) {
-		return fields_from_edit();
+	function db_collation($db, $collations) {
+	}
+
+	function information_schema() {
+	}
+
+	function is_view($table_status) {
 	}
 
 	function convert_field($field) {
@@ -270,12 +703,6 @@ if (isset($_GET["mongo"])) {
 		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 == "") {
@@ -306,52 +733,15 @@ if (isset($_GET["mongo"])) {
 		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 driver_config() {
+		global $operators;
+		return array(
+			'possible_drivers' => array("mongo", "mongodb"),
+			'jush' => "mongo",
+			'operators' => $operators,
+			'functions' => array(),
+			'grouping' => array(),
+			'edit_functions' => array(array("json")),
+		);
 	}
-	
-	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

@@ -5,10 +5,9 @@
 * @author Jakub Vrana
 */
 
-$drivers["mssql"] = "MS SQL";
+$drivers["mssql"] = "MS SQL (beta)";
 
 if (isset($_GET["mssql"])) {
-	$possible_drivers = array("SQLSRV", "MSSQL", "PDO_DBLIB");
 	define("DRIVER", "mssql");
 	if (extension_loaded("sqlsrv")) {
 		class Min_DB {
@@ -24,7 +23,13 @@ if (isset($_GET["mssql"])) {
 			}
 
 			function connect($server, $username, $password) {
-				$this->_link = @sqlsrv_connect($server, array("UID" => $username, "PWD" => $password, "CharacterSet" => "UTF-8"));
+				global $adminer;
+				$db = $adminer->database();
+				$connection_info = array("UID" => $username, "PWD" => $password, "CharacterSet" => "UTF-8");
+				if ($db != "") {
+					$connection_info["Database"] = $db;
+				}
+				$this->_link = @sqlsrv_connect(preg_replace('~:~', ',', $server), $connection_info);
 				if ($this->_link) {
 					$info = sqlsrv_server_info($this->_link);
 					$this->server_info = $info['SQLServerVersion'];
@@ -147,8 +152,10 @@ if (isset($_GET["mssql"])) {
 				$this->_link = @mssql_connect($server, $username, $password);
 				if ($this->_link) {
 					$result = $this->query("SELECT SERVERPROPERTY('ProductLevel'), SERVERPROPERTY('Edition')");
-					$row = $result->fetch_row();
-					$this->server_info = $this->result("sp_server_info 2", 2) . " [$row[0]] $row[1]";
+					if ($result) {
+						$row = $result->fetch_row();
+						$this->server_info = $this->result("sp_server_info 2", 2) . " [$row[0]] $row[1]";
+					}
 				} else {
 					$this->error = mssql_get_last_message();
 				}
@@ -239,7 +246,7 @@ if (isset($_GET["mssql"])) {
 			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);
+				$this->dsn("dblib:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\d)~', ';port=\1', $server)), $username, $password);
 				return true;
 			}
 
@@ -308,13 +315,13 @@ if (isset($_GET["mssql"])) {
 		return ($limit !== null ? " TOP (" . ($limit + $offset) . ")" : "") . " $query$where"; // seek later
 	}
 
-	function limit1($query, $where) {
-		return limit($query, $where, 1);
+	function limit1($table, $query, $where, $separator = "\n") {
+		return limit($query, $where, 1, 0, $separator);
 	}
 
 	function db_collation($db, $collations) {
 		global $connection;
-		return $connection->result("SELECT collation_name FROM sys.databases WHERE name =  " . q($db));
+		return $connection->result("SELECT collation_name FROM sys.databases WHERE name = " . q($db));
 	}
 
 	function engines() {
@@ -342,7 +349,7 @@ if (isset($_GET["mssql"])) {
 
 	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) : "ORDER BY name")) as $row) {
+		foreach (get_rows("SELECT ao.name AS Name, ao.type_desc AS Engine, (SELECT value FROM fn_listextendedproperty(default, 'SCHEMA', schema_name(schema_id), 'TABLE', ao.name, null, null)) AS Comment FROM sys.all_objects AS ao 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;
 			}
@@ -360,8 +367,9 @@ if (isset($_GET["mssql"])) {
 	}
 
 	function fields($table) {
+		$comments = get_key_vals("SELECT objname, cast(value as varchar(max)) FROM fn_listextendedproperty('MS_DESCRIPTION', 'schema', " . q(get_schema()) . ", 'table', " . q($table) . ", 'column', NULL)");
 		$return = array();
-		foreach (get_rows("SELECT c.*, t.name type, d.definition [default]
+		foreach (get_rows("SELECT c.max_length, c.precision, c.scale, c.name, c.is_nullable, c.is_identity, c.collation_name, t.name type, CAST(d.definition as text) [default]
 FROM sys.all_columns c
 JOIN sys.all_objects o ON c.object_id = o.object_id
 JOIN sys.types t ON c.user_type_id = t.user_type_id
@@ -379,8 +387,9 @@ WHERE o.schema_id = SCHEMA_ID(" . q(get_schema()) . ") AND o.type IN ('S', 'U',
 				"null" => $row["is_nullable"],
 				"auto_increment" => $row["is_identity"],
 				"collation" => $row["collation_name"],
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
 				"primary" => $row["is_identity"], //! or indexes.is_primary_key
+				"comment" => $comments[$row["name"]],
 			);
 		}
 		return $return;
@@ -406,7 +415,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 
 	function view($name) {
 		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))));
+		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() {
@@ -423,7 +432,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 
 	function error() {
 		global $connection;
-		return nl_br(h(preg_replace('~^(\\[[^]]*])+~m', '', $connection->error)));
+		return nl_br(h(preg_replace('~^(\[[^]]*])+~m', '', $connection->error)));
 	}
 
 	function create_database($db, $collation) {
@@ -448,13 +457,16 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		$alter = array();
+		$comments = array();
 		foreach ($fields as $field) {
 			$column = idf_escape($field[0]);
 			$val = $field[1];
 			if (!$val) {
 				$alter["DROP"][] = " COLUMN $column";
 			} else {
-				$val[1] = preg_replace("~( COLLATE )'(\\w+)'~", "\\1\\2", $val[1]);
+				$val[1] = preg_replace("~( COLLATE )'(\\w+)'~", '\1\2', $val[1]);
+				$comments[$field[0]] = $val[5];
+				unset($val[5]);
 				if ($field[0] == "") {
 					$alter["ADD"][] = "\n  " . implode("", $val) . ($table == "" ? substr($foreign[$val[0]], 16 + strlen($val[0])) : ""); // 16 - strlen("  FOREIGN KEY ()")
 				} else {
@@ -480,6 +492,11 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 				return false;
 			}
 		}
+		foreach ($comments as $key => $val) {
+			$comment = substr($val, 9); // 9 - strlen(" COMMENT ")
+			queries("EXEC sp_dropextendedproperty @name = N'MS_Description', @level0type = N'Schema', @level0name = " . q(get_schema()) . ", @level1type = N'Table', @level1name = " . q($name) . ", @level2type = N'Column', @level2name = " . q($key));
+			queries("EXEC sp_addextendedproperty @name = N'MS_Description', @value = " . $comment . ", @level0type = N'Schema', @level0name = " . q(get_schema()) . ", @level1type = N'Table', @level1name = " . q($name) . ", @level2type = N'Column', @level2name = " . q($key));
+		}
 		return true;
 	}
 
@@ -524,6 +541,7 @@ WHERE OBJECT_NAME(i.object_id) = " . q($table)
 		$return = array();
 		foreach (get_rows("EXEC sp_fkeys @fktable_name = " . q($table)) as $row) {
 			$foreign_key = &$return[$row["FK_NAME"]];
+			$foreign_key["db"] = $row["PKTABLE_QUALIFIER"];
 			$foreign_key["table"] = $row["PKTABLE_NAME"];
 			$foreign_key["source"][] = $row["FKCOLUMN_NAME"];
 			$foreign_key["target"][] = $row["PKCOLUMN_NAME"];
@@ -561,7 +579,7 @@ WHERE s.xtype = 'TR' AND s.name = " . q($name)
 		); // triggers are not schema-scoped
 		$return = reset($rows);
 		if ($return) {
-			$return["Statement"] = preg_replace('~^.+\\s+AS\\s+~isU', '', $return["text"]); //! identifiers, comments
+			$return["Statement"] = preg_replace('~^.+\s+AS\s+~isU', '', $return["text"]); //! identifiers, comments
 		}
 		return $return;
 	}
@@ -624,31 +642,38 @@ WHERE sys1.xtype = 'TR' AND sys2.name = " . q($table)
 	}
 
 	function support($feature) {
-		return preg_match('~^(columns|database|drop_col|indexes|scheme|sql|table|trigger|view|view_trigger)$~', $feature); //! routine|
+		return preg_match('~^(comment|columns|database|drop_col|indexes|descidx|scheme|sql|table|trigger|view|view_trigger)$~', $feature); //! routine|
 	}
 
-	$jush = "mssql";
-	$types = array();
-	$structured_types = array();
-	foreach (array( //! use sys.types
-		lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "int" => 10, "bigint" => 20, "bit" => 1, "decimal" => 0, "real" => 12, "float" => 53, "smallmoney" => 10, "money" => 20),
-		lang('Date and time') => array("date" => 10, "smalldatetime" => 19, "datetime" => 19, "datetime2" => 19, "time" => 8, "datetimeoffset" => 10),
-		lang('Strings') => array("char" => 8000, "varchar" => 8000, "text" => 2147483647, "nchar" => 4000, "nvarchar" => 4000, "ntext" => 1073741823),
-		lang('Binary') => array("binary" => 8000, "varbinary" => 8000, "image" => 2147483647),
-	) as $key => $val) {
-		$types += $val;
-		$structured_types[$key] = array_keys($val);
+	function driver_config() {
+		$types = array();
+		$structured_types = array();
+		foreach (array( //! use sys.types
+			lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "int" => 10, "bigint" => 20, "bit" => 1, "decimal" => 0, "real" => 12, "float" => 53, "smallmoney" => 10, "money" => 20),
+			lang('Date and time') => array("date" => 10, "smalldatetime" => 19, "datetime" => 19, "datetime2" => 19, "time" => 8, "datetimeoffset" => 10),
+			lang('Strings') => array("char" => 8000, "varchar" => 8000, "text" => 2147483647, "nchar" => 4000, "nvarchar" => 4000, "ntext" => 1073741823),
+			lang('Binary') => array("binary" => 8000, "varbinary" => 8000, "image" => 2147483647),
+		) as $key => $val) {
+			$types += $val;
+			$structured_types[$key] = array_keys($val);
+		}
+		return array(
+			'possible_drivers' => array("SQLSRV", "MSSQL", "PDO_DBLIB"),
+			'jush' => "mssql",
+			'types' => $types,
+			'structured_types' => $structured_types,
+			'unsigned' => array(),
+			'operators' => array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"),
+			'functions' => array("len", "lower", "round", "upper"),
+			'grouping' => array("avg", "count", "count distinct", "max", "min", "sum"),
+			'edit_functions' => array(
+				array(
+					"date|time" => "getdate",
+				), array(
+					"int|decimal|real|float|money|datetime" => "+/-",
+					"char|text" => "+",
+				)
+			),
+		);
 	}
-	$unsigned = array();
-	$operators = array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL");
-	$functions = array("len", "lower", "round", "upper");
-	$grouping = array("avg", "count", "count distinct", "max", "min", "sum");
-	$edit_functions = array(
-		array(
-			"date|time" => "getdate",
-		), array(
-			"int|decimal|real|float|money|datetime" => "+/-",
-			"char|text" => "+",
-		)
-	);
 }

adminer/drivers/mysql.inc.php

@@ -2,7 +2,6 @@
 $drivers = array("server" => "MySQL") + $drivers;
 
 if (!defined("DRIVER")) {
-	$possible_drivers = array("MySQLi", "MySQL", "PDO_MySQL");
 	define("DRIVER", "server"); // server - backwards compatibility
 	// MySQLi supports everything, MySQL doesn't support multiple result sets, PDO_MySQL doesn't support orgtable
 	if (extension_loaded("mysqli")) {
@@ -14,16 +13,23 @@ if (!defined("DRIVER")) {
 			}
 
 			function connect($server = "", $username = "", $password = "", $database = null, $port = null, $socket = null) {
+				global $adminer;
 				mysqli_report(MYSQLI_REPORT_OFF); // stays between requests, not required since PHP 5.3.4
 				list($host, $port) = explode(":", $server, 2); // part after : is used for port or socket
+				$ssl = $adminer->connectSsl();
+				if ($ssl) {
+					$this->ssl_set($ssl['key'], $ssl['cert'], $ssl['ca'], '', '');
+				}
 				$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")),
 					$database,
 					(is_numeric($port) ? $port : ini_get("mysqli.default_port")),
-					(!is_numeric($port) ? $port : $socket)
+					(!is_numeric($port) ? $port : $socket),
+					($ssl ? 64 : 0) // 64 - MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT (not available before PHP 5.6.16)
 				);
+				$this->options(MYSQLI_OPT_LOCAL_INFILE, false);
 				return $return;
 			}
 
@@ -50,7 +56,7 @@ if (!defined("DRIVER")) {
 			}
 		}
 
-	} elseif (extension_loaded("mysql") && !(ini_get("sql.safe_mode") && extension_loaded("pdo_mysql"))) {
+	} elseif (extension_loaded("mysql") && !((ini_bool("sql.safe_mode") || ini_bool("mysql.allow_local_infile")) && extension_loaded("pdo_mysql"))) {
 		class Min_DB {
 			var
 				$extension = "MySQL", ///< @var string extension name
@@ -68,6 +74,10 @@ if (!defined("DRIVER")) {
 			* @return bool
 			*/
 			function connect($server, $username, $password) {
+				if (ini_bool("mysql.allow_local_infile")) {
+					$this->error = lang('Disable %s or enable %s or %s extensions.', "'mysql.allow_local_infile'", "MySQLi", "PDO_MySQL");
+					return false;
+				}
 				$this->_link = @mysql_connect(
 					($server != "" ? $server : ini_get("mysql.default_host")),
 					("$server$username" != "" ? $username : ini_get("mysql.default_user")),
@@ -223,7 +233,26 @@ if (!defined("DRIVER")) {
 			var $extension = "PDO_MySQL";
 
 			function connect($server, $username, $password) {
-				$this->dsn("mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\\d)~', ';port=\\1', $server)), $username, $password);
+				global $adminer;
+				$options = array(PDO::MYSQL_ATTR_LOCAL_INFILE => false);
+				$ssl = $adminer->connectSsl();
+				if ($ssl) {
+					if (!empty($ssl['key'])) {
+						$options[PDO::MYSQL_ATTR_SSL_KEY] = $ssl['key'];
+					}
+					if (!empty($ssl['cert'])) {
+						$options[PDO::MYSQL_ATTR_SSL_CERT] = $ssl['cert'];
+					}
+					if (!empty($ssl['ca'])) {
+						$options[PDO::MYSQL_ATTR_SSL_CA] = $ssl['ca'];
+					}
+				}
+				$this->dsn(
+					"mysql:charset=utf8;host=" . str_replace(":", ";unix_socket=", preg_replace('~:(\d)~', ';port=\1', $server)),
+					$username,
+					$password,
+					$options
+				);
 				return true;
 			}
 
@@ -237,7 +266,7 @@ if (!defined("DRIVER")) {
 			}
 
 			function query($query, $unbuffered = false) {
-				$this->setAttribute(1000, !$unbuffered); // 1000 - PDO::MYSQL_ATTR_USE_BUFFERED_QUERY
+				$this->pdo->setAttribute(PDO::MYSQL_ATTR_USE_BUFFERED_QUERY, !$unbuffered);
 				return parent::query($query, $unbuffered);
 			}
 		}
@@ -276,6 +305,42 @@ if (!defined("DRIVER")) {
 			}
 			return queries($prefix . implode(",\n", $values) . $suffix);
 		}
+		
+		function slowQuery($query, $timeout) {
+			if (min_version('5.7.8', '10.1.2')) {
+				if (preg_match('~MariaDB~', $this->_conn->server_info)) {
+					return "SET STATEMENT max_statement_time=$timeout FOR $query";
+				} elseif (preg_match('~^(SELECT\b)(.+)~is', $query, $match)) {
+					return "$match[1] /*+ MAX_EXECUTION_TIME(" . ($timeout * 1000) . ") */ $match[2]";
+				}
+			}
+		}
+
+		function convertSearch($idf, $val, $field) {
+			return (preg_match('~char|text|enum|set~', $field["type"]) && !preg_match("~^utf8~", $field["collation"]) && preg_match('~[\x80-\xFF]~', $val['val'])
+				? "CONVERT($idf USING " . charset($this->_conn) . ")"
+				: $idf
+			);
+		}
+		
+		function warnings() {
+			$result = $this->_conn->query("SHOW WARNINGS");
+			if ($result && $result->num_rows) {
+				ob_start();
+				select($result); // select() usually needs to print a big table progressively
+				return ob_get_clean();
+			}
+		}
+
+		function tableHelp($name) {
+			$maria = preg_match('~MariaDB~', $this->_conn->server_info);
+			if (information_schema(DB)) {
+				return strtolower(($maria ? "information-schema-$name-table/" : str_replace("_", "-", $name) . "-table.html"));
+			}
+			if (DB == "mysql") {
+				return ($maria ? "mysql$name-table/" : "system-database.html"); //! more precise link
+			}
+		}
 
 	}
 
@@ -307,7 +372,7 @@ if (!defined("DRIVER")) {
 		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) {
+			if (min_version('5.7.8', 10.2, $connection)) {
 				$structured_types[lang('Strings')][] = "json";
 				$types["json"] = 4294967295;
 			}
@@ -325,12 +390,11 @@ if (!defined("DRIVER")) {
 	* @return array
 	*/
 	function get_databases($flush) {
-		global $connection;
 		// SHOW DATABASES can take a very long time so it is cached
 		$return = get_session("dbs");
 		if ($return === null) {
-			$query = ($connection->server_info >= 5
-				? "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA"
+			$query = (min_version(5)
+				? "SELECT SCHEMA_NAME FROM information_schema.SCHEMATA ORDER BY SCHEMA_NAME"
 				: "SHOW DATABASES"
 			); // SHOW DATABASES can be disabled by skip_show_database
 			$return = ($flush ? slow_query($query) : get_vals($query));
@@ -354,12 +418,14 @@ if (!defined("DRIVER")) {
 	}
 
 	/** Formulate SQL modification query with limit 1
+	* @param string
 	* @param string everything after UPDATE or DELETE
 	* @param string
+	* @param string
 	* @return string
 	*/
-	function limit1($query, $where) {
-		return limit($query, $where, 1);
+	function limit1($table, $query, $where, $separator = "\n") {
+		return limit($query, $where, 1, 0, $separator);
 	}
 
 	/** Get database collation
@@ -405,8 +471,7 @@ if (!defined("DRIVER")) {
 	* @return array array($name => $type)
 	*/
 	function tables_list() {
-		global $connection;
-		return get_key_vals($connection->server_info >= 5
+		return get_key_vals(min_version(5)
 			? "SELECT TABLE_NAME, TABLE_TYPE FROM information_schema.TABLES WHERE TABLE_SCHEMA = DATABASE() ORDER BY TABLE_NAME"
 			: "SHOW TABLES"
 		);
@@ -430,15 +495,14 @@ if (!defined("DRIVER")) {
 	* @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 = "", $fast = false) {
-		global $connection;
 		$return = array();
-		foreach (get_rows($fast && $connection->server_info >= 5
+		foreach (get_rows($fast && min_version(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"]);
+				$row["Comment"] = preg_replace('~(?:(.+); )?InnoDB free: .*~', '\1', $row["Comment"]);
 			}
 			if (!isset($row["Engine"])) {
 				$row["Comment"] = "";
@@ -464,9 +528,8 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function fk_support($table_status) {
-		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);
+			|| (preg_match('~NDB~i', $table_status["Engine"]) && min_version(5.6));
 	}
 
 	/** Get information about fields
@@ -476,21 +539,23 @@ if (!defined("DRIVER")) {
 	function fields($table) {
 		$return = array();
 		foreach (get_rows("SHOW FULL COLUMNS FROM " . table($table)) as $row) {
-			preg_match('~^([^( ]+)(?:\\((.+)\\))?( unsigned)?( zerofill)?$~', $row["Type"], $match);
+			preg_match('~^([^( ]+)(?:\((.+)\))?( unsigned)?( zerofill)?$~', $row["Type"], $match);
 			$return[$row["Field"]] = array(
 				"field" => $row["Field"],
 				"full_type" => $row["Type"],
 				"type" => $match[1],
 				"length" => $match[2],
 				"unsigned" => ltrim($match[3] . $match[4]),
-				"default" => ($row["Default"] != "" || preg_match("~char|set~", $match[1]) ? $row["Default"] : null),
+				"default" => ($row["Default"] != "" || preg_match("~char|set~", $match[1]) ? (preg_match('~text~', $match[1]) ? stripslashes(preg_replace("~^'(.*)'\$~", '\1', $row["Default"])) : $row["Default"]) : null),
 				"null" => ($row["Null"] == "YES"),
 				"auto_increment" => ($row["Extra"] == "auto_increment"),
 				"on_update" => (preg_match('~^on update (.+)~i', $row["Extra"], $match) ? $match[1] : ""), //! available since MySQL 5.1.23
 				"collation" => $row["Collation"],
-				"privileges" => array_flip(preg_split('~, *~', $row["Privileges"])),
+				"privileges" => array_flip(preg_split('~, *~', $row["Privileges"])) + ["where" => 1, "order" => 1],
 				"comment" => $row["Comment"],
 				"primary" => ($row["Key"] == "PRI"),
+				// https://mariadb.com/kb/en/library/show-columns/, https://github.com/vrana/adminer/pull/359#pullrequestreview-276677186
+				"generated" => preg_match('~^(VIRTUAL|PERSISTENT|STORED)~', $row["Extra"]),
 			);
 		}
 		return $return;
@@ -519,7 +584,7 @@ if (!defined("DRIVER")) {
 	*/
 	function foreign_keys($table) {
 		global $connection, $on_actions;
-		static $pattern = '`(?:[^`]|``)+`';
+		static $pattern = '(?:`(?:[^`]|``)+`|"(?:[^"]|"")+")';
 		$return = array();
 		$create_table = $connection->result("SHOW CREATE TABLE " . table($table), 1);
 		if ($create_table) {
@@ -546,7 +611,7 @@ if (!defined("DRIVER")) {
 	*/
 	function view($name) {
 		global $connection;
-		return array("select" => preg_replace('~^(?:[^`]|`[^`]*`)*\\s+AS\\s+~isU', '', $connection->result("SHOW CREATE VIEW " . table($name), 1)));
+		return array("select" => preg_replace('~^(?:[^`]|`[^`]*`)*\s+AS\s+~isU', '', $connection->result("SHOW CREATE VIEW " . table($name), 1)));
 	}
 
 	/** Get sorted grouped list of collations
@@ -573,9 +638,8 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function information_schema($db) {
-		global $connection;
-		return ($connection->server_info >= 5 && $db == "information_schema")
-			|| ($connection->server_info >= 5.5 && $db == "performance_schema");
+		return (min_version(5) && $db == "information_schema")
+			|| (min_version(5.5) && $db == "performance_schema");
 	}
 
 	/** Get escaped error message
@@ -614,17 +678,17 @@ if (!defined("DRIVER")) {
 	function rename_database($name, $collation) {
 		$return = false;
 		if (create_database($name, $collation)) {
-			//! move triggers
-			$rename = array();
+			$tables = array();
+			$views = array();
 			foreach (tables_list() as $table => $type) {
-				$rename[] = table($table) . " TO " . idf_escape($name) . "." . table($table);
+				if ($type == 'VIEW') {
+					$views[] = $table;
+				} else {
+					$tables[] = $table;
+				}
 			}
-			$return = (!$rename || queries("RENAME TABLE " . implode(", ", $rename)));
-			if ($return) {
-				queries("DROP DATABASE " . idf_escape(DB));
-			}
-			restart_session();
-			set_session("dbs", null);
+			$return = (!$tables && !$views) || move_tables($tables, $views, $name);
+			drop_databases($return ? array(DB) : array());
 		}
 		return $return;
 	}
@@ -733,12 +797,27 @@ if (!defined("DRIVER")) {
 	* @return bool
 	*/
 	function move_tables($tables, $views, $target) {
+		global $connection;
 		$rename = array();
-		foreach (array_merge($tables, $views) as $table) { // views will report SQL error
+		foreach ($tables as $table) {
 			$rename[] = table($table) . " TO " . idf_escape($target) . "." . table($table);
 		}
-		return queries("RENAME TABLE " . implode(", ", $rename));
+		if (!$rename || queries("RENAME TABLE " . implode(", ", $rename))) {
+			$definitions = array();
+			foreach ($views as $table) {
+				$definitions[table($table)] = view($table);
+			}
+			$connection->select_db($target);
+			$db = idf_escape(DB);
+			foreach ($definitions as $name => $view) {
+				if (!queries("CREATE VIEW $name AS " . str_replace(" $db.", " ", $view["select"])) || !queries("DROP VIEW $db.$name")) {
+					return false;
+				}
+			}
+			return true;
+		}
 		//! move triggers
+		return false;
 	}
 
 	/** Copy tables to other schema
@@ -751,19 +830,24 @@ 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("\nDROP TABLE IF EXISTS $name")
+			if (($_POST["overwrite"] && !queries("\nDROP TABLE IF EXISTS $name"))
 				|| !queries("CREATE TABLE $name LIKE " . table($table))
 				|| !queries("INSERT INTO $name SELECT * FROM " . table($table))
 			) {
 				return false;
 			}
+			foreach (get_rows("SHOW TRIGGERS LIKE " . q(addcslashes($table, "%_\\"))) as $row) {
+				$trigger = $row["Trigger"];
+				if (!queries("CREATE TRIGGER " . ($target == DB ? idf_escape("copy_$trigger") : idf_escape($target) . "." . idf_escape($trigger)) . " $row[Timing] $row[Event] ON $name FOR EACH ROW\n$row[Statement];")) {
+					return false;
+				}
+			}
 		}
 		foreach ($views as $table) {
 			$name = ($target == DB ? table("copy_$table") : idf_escape($target) . "." . table($table));
 			$view = view($table);
-			if (!queries("DROP VIEW IF EXISTS $name")
-				|| !queries("CREATE VIEW $name AS $view[select]") //! USE to avoid db.table
-			) {
+			if (($_POST["overwrite"] && !queries("DROP VIEW IF EXISTS $name"))
+				|| !queries("CREATE VIEW $name AS $view[select]")) { //! USE to avoid db.table
 				return false;
 			}
 		}
@@ -813,19 +897,19 @@ 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");
+		$space = "(?:\\s|/\\*[\s\S]*?\\*/|(?:#|-- )[^\n]*\n?|--\r?\n)";
 		$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";
+		$pattern = "$space*(" . ($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);
 		$fields = array();
 		preg_match_all("~$pattern\\s*,?~is", $match[1], $matches, PREG_SET_ORDER);
 		foreach ($matches as $param) {
-			$name = str_replace("``", "`", $param[2]) . $param[3];
 			$fields[] = array(
-				"field" => $name,
+				"field" => str_replace("``", "`", $param[2]) . $param[3],
 				"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]"))),
+				"unsigned" => strtolower(preg_replace('~\s+~', ' ', trim("$param[8] $param[7]"))),
 				"null" => 1,
 				"full_type" => $param[4],
 				"inout" => strtoupper($param[1]),
@@ -844,10 +928,10 @@ if (!defined("DRIVER")) {
 	}
 
 	/** Get list of routines
-	* @return array ("ROUTINE_TYPE" => , "ROUTINE_NAME" => , "DTD_IDENTIFIER" => )
+	* @return array ("SPECIFIC_NAME" => , "ROUTINE_NAME" => , "ROUTINE_TYPE" => , "DTD_IDENTIFIER" => )
 	*/
 	function routines() {
-		return get_rows("SELECT ROUTINE_NAME, ROUTINE_TYPE, DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = " . q(DB));
+		return get_rows("SELECT ROUTINE_NAME AS SPECIFIC_NAME, ROUTINE_NAME, ROUTINE_TYPE, DTD_IDENTIFIER FROM information_schema.ROUTINES WHERE ROUTINE_SCHEMA = " . q(DB));
 	}
 
 	/** Get list of available routine languages
@@ -857,6 +941,15 @@ if (!defined("DRIVER")) {
 		return array(); // "SQL" not required
 	}
 
+	/** Get routine signature
+	* @param string
+	* @param array result of routine()
+	* @return string
+	*/
+	function routine_id($name, $row) {
+		return idf_escape($name);
+	}
+
 	/** Get last auto increment ID
 	* @return string
 	*/
@@ -871,7 +964,7 @@ if (!defined("DRIVER")) {
 	* @return Min_Result
 	*/
 	function explain($connection, $query) {
-		return $connection->query("EXPLAIN " . ($connection->server_info >= 5.1 ? "PARTITIONS " : "") . $query);
+		return $connection->query("EXPLAIN " . (min_version(5.1) && !min_version(5.7) ? "PARTITIONS " : "") . $query);
 	}
 
 	/** Get approximate number of rows
@@ -906,22 +999,24 @@ if (!defined("DRIVER")) {
 
 	/** Set current schema
 	* @param string
+	* @param Min_DB
 	* @return bool
 	*/
-	function set_schema($schema) {
+	function set_schema($schema, $connection2 = null) {
 		return true;
 	}
 
 	/** Get SQL command to create table
 	* @param string
 	* @param bool
+	* @param string
 	* @return string
 	*/
-	function create_sql($table, $auto_increment) {
+	function create_sql($table, $auto_increment, $style) {
 		global $connection;
 		$return = $connection->result("SHOW CREATE TABLE " . table($table), 1);
 		if (!$auto_increment) {
-			$return = preg_replace('~ AUTO_INCREMENT=\\d+~', '', $return); //! skip comments
+			$return = preg_replace('~ AUTO_INCREMENT=\d+~', '', $return); //! skip comments
 		}
 		return $return;
 	}
@@ -944,14 +1039,12 @@ if (!defined("DRIVER")) {
 
 	/** Get SQL commands to create triggers
 	* @param string
-	* @param string
 	* @return string
 	*/
-	function trigger_sql($table, $style) {
+	function trigger_sql($table) {
 		$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 .= "\nCREATE TRIGGER " . idf_escape($row["Trigger"]) . " $row[Timing] $row[Event] ON " . table($row["Table"]) . " FOR EACH ROW\n$row[Statement];;\n";
 		}
 		return $return;
 	}
@@ -977,14 +1070,6 @@ if (!defined("DRIVER")) {
 		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
@@ -997,7 +1082,7 @@ if (!defined("DRIVER")) {
 			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"]) . ")";
+			return (min_version(8) ? "ST_" : "") . "AsWKT(" . idf_escape($field["field"]) . ")";
 		}
 	}
 
@@ -1014,61 +1099,81 @@ if (!defined("DRIVER")) {
 			$return = "CONV($return, 2, 10) + 0";
 		}
 		if (preg_match("~geometry|point|linestring|polygon~", $field["type"])) {
-			$return = "GeomFromText($return)";
+			$prefix = (min_version(8) ? "ST_" : "");
+			$return = $prefix . "GeomFromText($return, $prefix" . "SRID($field[field]))";
 		}
 		return $return;
 	}
 
 	/** Check whether a feature is supported
-	* @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"
+	* @param string "comment", "copy", "database", "descidx", "drop_col", "dump", "event", "indexes", "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 !preg_match("~scheme|sequence|type|view_trigger|materializedview" . ($connection->server_info < 5.1 ? "|event|partitioning" . ($connection->server_info < 5 ? "|routine|trigger|view" : "") : "") . "~", $feature);
+		return !preg_match("~scheme|sequence|type|view_trigger|materializedview" . (min_version(8) ? "" : "|descidx" . (min_version(5.1) ? "" : "|event|partitioning" . (min_version(5) ? "" : "|routine|trigger|view"))) . "~", $feature);
 	}
 
+	/** Kill a process
+	* @param int
+	* @return bool
+	*/
 	function kill_process($val) {
 		return queries("KILL " . number($val));
 	}
 
+	/** Return query to get connection ID
+	* @return string
+	*/
 	function connection_id(){
 		return "SELECT CONNECTION_ID()";
 	}
 
+	/** Get maximum number of connections
+	* @return int
+	*/
 	function max_connections() {
 		global $connection;
 		return $connection->result("SELECT @@max_connections");
 	}
 
-	$jush = "sql"; ///< @var string JUSH identifier
-	$types = array(); ///< @var array ($type => $maximum_unsigned_length, ...)
-	$structured_types = array(); ///< @var array ($description => array($type, ...), ...)
-	foreach (array(
-		lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "mediumint" => 8, "int" => 10, "bigint" => 20, "decimal" => 66, "float" => 12, "double" => 21),
-		lang('Date and time') => array("date" => 10, "datetime" => 19, "timestamp" => 19, "time" => 10, "year" => 4),
-		lang('Strings') => array("char" => 255, "varchar" => 65535, "tinytext" => 255, "text" => 65535, "mediumtext" => 16777215, "longtext" => 4294967295),
-		lang('Lists') => array("enum" => 65535, "set" => 64),
-		lang('Binary') => array("bit" => 20, "binary" => 255, "varbinary" => 65535, "tinyblob" => 255, "blob" => 65535, "mediumblob" => 16777215, "longblob" => 4294967295),
-		lang('Geometry') => array("geometry" => 0, "point" => 0, "linestring" => 0, "polygon" => 0, "multipoint" => 0, "multilinestring" => 0, "multipolygon" => 0, "geometrycollection" => 0),
-	) as $key => $val) {
-		$types += $val;
-		$structured_types[$key] = array_keys($val);
+	/** Get driver config
+	* @return array array('possible_drivers' => , 'jush' => , 'types' => , 'structured_types' => , 'unsigned' => , 'operators' => , 'functions' => , 'grouping' => , 'edit_functions' => )
+	*/
+	function driver_config() {
+		$types = array(); ///< @var array ($type => $maximum_unsigned_length, ...)
+		$structured_types = array(); ///< @var array ($description => array($type, ...), ...)
+		foreach (array(
+			lang('Numbers') => array("tinyint" => 3, "smallint" => 5, "mediumint" => 8, "int" => 10, "bigint" => 20, "decimal" => 66, "float" => 12, "double" => 21),
+			lang('Date and time') => array("date" => 10, "datetime" => 19, "timestamp" => 19, "time" => 10, "year" => 4),
+			lang('Strings') => array("char" => 255, "varchar" => 65535, "tinytext" => 255, "text" => 65535, "mediumtext" => 16777215, "longtext" => 4294967295),
+			lang('Lists') => array("enum" => 65535, "set" => 64),
+			lang('Binary') => array("bit" => 20, "binary" => 255, "varbinary" => 65535, "tinyblob" => 255, "blob" => 65535, "mediumblob" => 16777215, "longblob" => 4294967295),
+			lang('Geometry') => array("geometry" => 0, "point" => 0, "linestring" => 0, "polygon" => 0, "multipoint" => 0, "multilinestring" => 0, "multipolygon" => 0, "geometrycollection" => 0),
+		) as $key => $val) {
+			$types += $val;
+			$structured_types[$key] = array_keys($val);
+		}
+		return array(
+			'possible_drivers' => array("MySQLi", "MySQL", "PDO_MySQL"),
+			'jush' => "sql", ///< @var string JUSH identifier
+			'types' => $types,
+			'structured_types' => $structured_types,
+			'unsigned' => array("unsigned", "zerofill", "unsigned zerofill"), ///< @var array number variants
+			'operators' => array("=", "<", ">", "<=", ">=", "!=", "LIKE", "LIKE %%", "REGEXP", "IN", "FIND_IN_SET", "IS NULL", "NOT LIKE", "NOT REGEXP", "NOT IN", "IS NOT NULL", "SQL"), ///< @var array operators used in select
+			'functions' => array("char_length", "date", "from_unixtime", "unix_timestamp", "lower", "round", "floor", "ceil", "sec_to_time", "time_to_sec", "upper"), ///< @var array functions used in select
+			'grouping' => array("avg", "count", "count distinct", "group_concat", "max", "min", "sum"), ///< @var array grouping functions used in select
+			'edit_functions' => array( ///< @var array of array("$type|$type2" => "$function/$function2") functions used in editing, [0] - edit and insert, [1] - edit only
+				array(
+					"char" => "md5/sha1/password/encrypt/uuid",
+					"binary" => "md5/sha1",
+					"date|time" => "now",
+				), array(
+					number_type() => "+/-",
+					"date" => "+ interval/- interval",
+					"time" => "addtime/subtime",
+					"char|text" => "concat",
+				)
+			),
+		);
 	}
-	$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", "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
-		array(
-			"char" => "md5/sha1/password/encrypt/uuid", //! JavaScript for disabling maxlength
-			"binary" => "md5/sha1",
-			"date|time" => "now",
-		), array(
-			"(^|[^o])int|float|double|decimal" => "+/-", // not point
-			"date" => "+ interval/- interval",
-			"time" => "addtime/subtime",
-			"char|text" => "concat",
-		)
-	);
 }

adminer/drivers/oracle.inc.php

@@ -1,12 +1,12 @@
 <?php
-$drivers["oracle"] = "Oracle";
+$drivers["oracle"] = "Oracle (beta)";
 
 if (isset($_GET["oracle"])) {
-	$possible_drivers = array("OCI8", "PDO_OCI");
 	define("DRIVER", "oracle");
 	if (extension_loaded("oci8")) {
 		class Min_DB {
 			var $extension = "oci8", $_link, $_result, $server_info, $affected_rows, $errno, $error;
+			var $_current_db;
 
 			function _error($errno, $error) {
 				if (ini_bool("html_errors")) {
@@ -32,6 +32,7 @@ if (isset($_GET["oracle"])) {
 			}
 
 			function select_db($database) {
+				$this->_current_db = $database;
 				return true;
 			}
 
@@ -52,6 +53,7 @@ if (isset($_GET["oracle"])) {
 						return new Min_Result($result);
 					}
 					$this->affected_rows = oci_num_rows($result);
+					oci_free_statement($result);
 				}
 				return $return;
 			}
@@ -119,6 +121,7 @@ if (isset($_GET["oracle"])) {
 	} elseif (extension_loaded("pdo_oci")) {
 		class Min_DB extends Min_PDO {
 			var $extension = "PDO_OCI";
+			var $_current_db;
 
 			function connect($server, $username, $password) {
 				$this->dsn("oci:dbname=//$server;charset=AL32UTF8", $username, $password);
@@ -126,6 +129,7 @@ if (isset($_GET["oracle"])) {
 			}
 
 			function select_db($database) {
+				$this->_current_db = $database;
 				return true;
 			}
 		}
@@ -142,9 +146,35 @@ if (isset($_GET["oracle"])) {
 			return true; // automatic start
 		}
 
+		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;
+		}
 	}
 
-
+	/**
+	 * @param string $hostPath
+	 * @return bool
+	 */
+	function is_server_host_valid($hostPath) {
+		// EasyConnect host+path format: host[/[service_name][:server_type][/instance_name]]
+		return (bool)preg_match('~^[^/]+(/([^/:]+)?(:[^/:]+)?(/[^/:]+)?)?$~', $hostPath);
+	}
 
 	function idf_escape($idf) {
 		return '"' . str_replace('"', '""', $idf) . '"';
@@ -165,7 +195,7 @@ if (isset($_GET["oracle"])) {
 	}
 
 	function get_databases() {
-		return get_vals("SELECT tablespace_name FROM user_tablespaces");
+		return get_vals("SELECT tablespace_name FROM user_tablespaces ORDER BY 1");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
@@ -175,8 +205,8 @@ if (isset($_GET["oracle"])) {
 		));
 	}
 
-	function limit1($query, $where) {
-		return " $query$where";
+	function limit1($table, $query, $where, $separator = "\n") {
+		return " $query$where"; //! limit
 	}
 
 	function db_collation($db, $collations) {
@@ -193,22 +223,51 @@ if (isset($_GET["oracle"])) {
 		return $connection->result("SELECT USER FROM DUAL");
 	}
 
+	function get_current_db() {
+		global $connection;
+		$db = $connection->_current_db ? $connection->_current_db : DB;
+		unset($connection->_current_db);
+		return $db;
+	}
+
+	function where_owner($prefix, $owner = "owner") {
+		if (!$_GET["ns"]) {
+			return '';
+		}
+		return "$prefix$owner = sys_context('USERENV', 'CURRENT_SCHEMA')";
+	}
+
+	function views_table($columns) {
+		$owner = where_owner('');
+		return "(SELECT $columns FROM all_views WHERE " . ($owner ? $owner : "rownum < 0") . ")";
+	}
+
 	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
+		$view = views_table("view_name");
+		$owner = where_owner(" AND ");
+		return get_key_vals("SELECT table_name, 'table' FROM all_tables WHERE tablespace_name = " . q(DB) . "$owner
+UNION SELECT view_name, 'view' FROM $view
 ORDER BY 1"
 		); //! views don't have schema
 	}
 
 	function count_tables($databases) {
-		return array();
+		global $connection;
+		$return = array();
+		foreach ($databases as $db) {
+			$return[$db] = $connection->result("SELECT COUNT(*) FROM all_tables WHERE tablespace_name = " . q($db));
+		}
+		return $return;
 	}
 
 	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" : "") . "
+		$db = get_current_db();
+		$view = views_table("view_name");
+		$owner = where_owner(" AND ");
+		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) . $owner . ($name != "" ? " AND table_name = $search" : "") . "
+UNION SELECT view_name, 'view', 0, 0 FROM $view" . ($name != "" ? " WHERE view_name = $search" : "") . "
 ORDER BY 1"
 		) as $row) {
 			if ($name != "") {
@@ -229,11 +288,12 @@ ORDER BY 1"
 
 	function fields($table) {
 		$return = array();
-		foreach (get_rows("SELECT * FROM all_tab_columns WHERE table_name = " . q($table) . " ORDER BY column_id") as $row) {
+		$owner = where_owner(" AND ");
+		foreach (get_rows("SELECT * FROM all_tab_columns WHERE table_name = " . q($table) . "$owner ORDER BY column_id") as $row) {
 			$type = $row["DATA_TYPE"];
 			$length = "$row[DATA_PRECISION],$row[DATA_SCALE]";
 			if ($length == ",") {
-				$length = $row["DATA_LENGTH"];
+				$length = $row["CHAR_COL_DECL_LENGTH"];
 			} //! int
 			$return[$row["COLUMN_NAME"]] = array(
 				"field" => $row["COLUMN_NAME"],
@@ -244,7 +304,7 @@ ORDER BY 1"
 				"null" => ($row["NULLABLE"] == "Y"),
 				//! "auto_increment" => false,
 				//! "collation" => $row["CHARACTER_SET_NAME"],
-				"privileges" => array("insert" => 1, "select" => 1, "update" => 1),
+				"privileges" => array("insert" => 1, "select" => 1, "update" => 1, "where" => 1, "order" => 1),
 				//! "comment" => $row["Comment"],
 				//! "primary" => ($row["Key"] == "PRI"),
 			);
@@ -254,22 +314,27 @@ ORDER BY 1"
 
 	function indexes($table, $connection2 = null) {
 		$return = array();
-		foreach (get_rows("SELECT uic.*, uc.constraint_type
-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) {
+		$owner = where_owner(" AND ", "aic.table_owner");
+		foreach (get_rows("SELECT aic.*, ac.constraint_type, atc.data_default
+FROM all_ind_columns aic
+LEFT JOIN all_constraints ac ON aic.index_name = ac.constraint_name AND aic.table_name = ac.table_name AND aic.index_owner = ac.owner
+LEFT JOIN all_tab_cols atc ON aic.column_name = atc.column_name AND aic.table_name = atc.table_name AND aic.index_owner = atc.owner
+WHERE aic.table_name = " . q($table) . "$owner
+ORDER BY ac.constraint_type, aic.column_position", $connection2) as $row) {
 			$index_name = $row["INDEX_NAME"];
+			$column_name = $row["DATA_DEFAULT"];
+			$column_name = ($column_name ? trim($column_name, '"') : $row["COLUMN_NAME"]); // trim - possibly wrapped in quotes but never contains quotes inside
 			$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]["columns"][] = $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[$index_name]["descs"][] = ($row["DESCEND"] && $row["DESCEND"] == "DESC" ? '1' : null);
 		}
 		return $return;
 	}
 
 	function view($name) {
-		$rows = get_rows('SELECT text "select" FROM user_views WHERE view_name = ' . q($name));
+		$view = views_table("view_name, text");
+		$rows = get_rows('SELECT text "select" FROM ' . $view . ' WHERE view_name = ' . q($name));
 		return reset($rows);
 	}
 
@@ -294,13 +359,25 @@ ORDER BY uc.constraint_type, uic.column_position", $connection2) as $row) {
 	function found_rows($table_status, $where) {
 	}
 
+	function auto_increment() {
+		return "";
+	}
+
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		$alter = $drop = array();
+		$orig_fields = ($table ? fields($table) : array());
 		foreach ($fields as $field) {
 			$val = $field[1];
 			if ($val && $field[0] != "" && idf_escape($field[0]) != $val[0]) {
 				queries("ALTER TABLE " . table($table) . " RENAME COLUMN " . idf_escape($field[0]) . " TO $val[0]");
 			}
+			$orig_field = $orig_fields[$field[0]];
+			if ($val && $orig_field) {
+				$old = process_field($orig_field, $orig_field);
+				if ($val[2] == $old[2]) {
+					$val[2] = "";
+				}
+			}
 			if ($val) {
 				$alter[] = ($table != "" ? ($field[0] != "" ? "MODIFY (" : "ADD (") : "  ") . implode($val) . ($table != "" ? ")" : ""); //! error with name change only
 			} else {
@@ -316,6 +393,35 @@ ORDER BY uc.constraint_type, uic.column_position", $connection2) as $row) {
 		;
 	}
 
+	function alter_indexes($table, $alter) {
+		$drop = array();
+		$queries = array();
+		foreach ($alter as $val) {
+			if ($val[0] != "INDEX") {
+				//! descending UNIQUE indexes results in syntax error
+				$val[2] = preg_replace('~ DESC$~', '', $val[2]);
+				$create = ($val[2] == "DROP"
+					? "\nDROP CONSTRAINT " . idf_escape($val[1])
+					: "\nADD" . ($val[1] != "" ? " CONSTRAINT " . idf_escape($val[1]) : "") . " $val[0] " . ($val[0] == "PRIMARY" ? "KEY " : "") . "(" . implode(", ", $val[2]) . ")"
+				);
+				array_unshift($queries, "ALTER TABLE " . table($table) . $create);
+			} elseif ($val[2] == "DROP") {
+				$drop[] = idf_escape($val[1]);
+			} else {
+				$queries[] = "CREATE INDEX " . idf_escape($val[1] != "" ? $val[1] : uniqid($table . "_")) . " ON " . table($table) . " (" . implode(", ", $val[2]) . ")";
+			}
+		}
+		if ($drop) {
+			array_unshift($queries, "DROP INDEX " . implode(", ", $drop));
+		}
+		foreach ($queries as $query) {
+			if (!queries($query)) {
+				return false;
+			}
+		}
+		return true;
+	}
+
 	function foreign_keys($table) {
 		$return = array();
 		$query = "SELECT c_list.CONSTRAINT_NAME as NAME,
@@ -359,7 +465,8 @@ AND c_src.TABLE_NAME = " . q($table);
 	}
 
 	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'))");
+		$return = get_vals("SELECT DISTINCT owner FROM dba_segments WHERE owner IN (SELECT username FROM dba_users WHERE default_tablespace NOT IN ('SYSTEM','SYSAUX')) ORDER BY 1");
+		return ($return ? $return : get_vals("SELECT DISTINCT owner FROM all_tables WHERE tablespace_name = " . q(DB) . " ORDER BY 1"));
 	}
 
 	function get_schema() {
@@ -367,9 +474,12 @@ AND c_src.TABLE_NAME = " . q($table);
 		return $connection->result("SELECT sys_context('USERENV', 'SESSION_USER') FROM dual");
 	}
 
-	function set_schema($scheme) {
+	function set_schema($scheme, $connection2 = null) {
 		global $connection;
-		return $connection->query("ALTER SESSION SET CURRENT_SCHEMA = " . idf_escape($scheme));
+		if (!$connection2) {
+			$connection2 = $connection;
+		}
+		return $connection2->query("ALTER SESSION SET CURRENT_SCHEMA = " . idf_escape($scheme));
 	}
 
 	function show_variables() {
@@ -398,33 +508,40 @@ ORDER BY PROCESS
 	}
 
 	function support($feature) {
-		return preg_match('~^(columns|database|drop_col|indexes|processlist|scheme|sql|status|table|variables|view|view_trigger)$~', $feature); //!
+		return preg_match('~^(columns|database|drop_col|indexes|descidx|processlist|scheme|sql|status|table|variables|view)$~', $feature); //!
 	}
 
-	$jush = "oracle";
-	$types = array();
-	$structured_types = array();
-	foreach (array(
-		lang('Numbers') => array("number" => 38, "binary_float" => 12, "binary_double" => 21),
-		lang('Date and time') => array("date" => 10, "timestamp" => 29, "interval year" => 12, "interval day" => 28), //! year(), day() to second()
-		lang('Strings') => array("char" => 2000, "varchar2" => 4000, "nchar" => 2000, "nvarchar2" => 4000, "clob" => 4294967295, "nclob" => 4294967295),
-		lang('Binary') => array("raw" => 2000, "long raw" => 2147483648, "blob" => 4294967295, "bfile" => 4294967296),
-	) as $key => $val) {
-		$types += $val;
-		$structured_types[$key] = array_keys($val);
+	function driver_config() {
+		$types = array();
+		$structured_types = array();
+		foreach (array(
+			lang('Numbers') => array("number" => 38, "binary_float" => 12, "binary_double" => 21),
+			lang('Date and time') => array("date" => 10, "timestamp" => 29, "interval year" => 12, "interval day" => 28), //! year(), day() to second()
+			lang('Strings') => array("char" => 2000, "varchar2" => 4000, "nchar" => 2000, "nvarchar2" => 4000, "clob" => 4294967295, "nclob" => 4294967295),
+			lang('Binary') => array("raw" => 2000, "long raw" => 2147483648, "blob" => 4294967295, "bfile" => 4294967296),
+		) as $key => $val) {
+			$types += $val;
+			$structured_types[$key] = array_keys($val);
+		}
+		return array(
+			'possible_drivers' => array("OCI8", "PDO_OCI"),
+			'jush' => "oracle",
+			'types' => $types,
+			'structured_types' => $structured_types,
+			'unsigned' => array(),
+			'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(
+				array( //! no parentheses
+					"date" => "current_date",
+					"timestamp" => "current_timestamp",
+				), array(
+					"number|float|double" => "+/-",
+					"date|timestamp" => "+ interval/- interval",
+					"char|clob" => "||",
+				)
+			),
+		);
 	}
-	$unsigned = array();
-	$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(
-		array( //! no parentheses
-			"date" => "current_date",
-			"timestamp" => "current_timestamp",
-		), array(
-			"number|float|double" => "+/-",
-			"date|timestamp" => "+ interval/- interval",
-			"char|clob" => "||",
-		)
-	);
 }

adminer/drivers/pgsql.inc.php

@@ -2,11 +2,10 @@
 $drivers["pgsql"] = "PostgreSQL";
 
 if (isset($_GET["pgsql"])) {
-	$possible_drivers = array("PgSQL", "PDO_PgSQL");
 	define("DRIVER", "pgsql");
 	if (extension_loaded("pgsql")) {
 		class Min_DB {
-			var $extension = "PgSQL", $_link, $_result, $_string, $_database = true, $server_info, $affected_rows, $error;
+			var $extension = "PgSQL", $_link, $_result, $_string, $_database = true, $server_info, $affected_rows, $error, $timeout;
 
 			function _error($errno, $error) {
 				if (ini_bool("html_errors")) {
@@ -37,7 +36,15 @@ if (isset($_GET["pgsql"])) {
 			}
 
 			function quote($string) {
-				return "'" . pg_escape_string($this->_link, $string) . "'"; //! bytea
+				return "'" . pg_escape_string($this->_link, $string) . "'";
+			}
+
+			function value($val, $field) {
+				return ($field["type"] == "bytea" && $val !== null ? pg_unescape_bytea($val) : $val);
+			}
+
+			function quoteBinary($string) {
+				return "'" . pg_escape_bytea($this->_link, $string) . "'";
 			}
 
 			function select_db($database) {
@@ -61,12 +68,18 @@ if (isset($_GET["pgsql"])) {
 				$this->error = "";
 				if (!$result) {
 					$this->error = pg_last_error($this->_link);
-					return false;
+					$return = false;
 				} elseif (!pg_num_fields($result)) {
 					$this->affected_rows = pg_affected_rows($result);
-					return true;
+					$return = true;
+				} else {
+					$return = new Min_Result($result);
 				}
-				return new Min_Result($result);
+				if ($this->timeout) {
+					$this->timeout = 0;
+					$this->query("RESET statement_timeout");
+				}
+				return $return;
 			}
 
 			function multi_query($query) {
@@ -89,6 +102,10 @@ if (isset($_GET["pgsql"])) {
 				}
 				return pg_fetch_result($result->_result, 0, $field);
 			}
+
+			function warnings() {
+				return h(pg_last_notice($this->_link)); // second parameter is available since PHP 7.1.0
+			}
 		}
 
 		class Min_Result {
@@ -127,13 +144,12 @@ if (isset($_GET["pgsql"])) {
 
 	} elseif (extension_loaded("pdo_pgsql")) {
 		class Min_DB extends Min_PDO {
-			var $extension = "PDO_PgSQL";
+			var $extension = "PDO_PgSQL", $timeout;
 
 			function connect($server, $username, $password) {
 				global $adminer;
 				$db = $adminer->database();
-				$string = "pgsql:host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' options='-c client_encoding=utf8'";
-				$this->dsn("$string dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'", $username, $password);
+				$this->dsn("pgsql:host='" . str_replace(":", "' port='", addcslashes($server, "'\\")) . "' client_encoding=utf8 dbname='" . ($db != "" ? addcslashes($db, "'\\") : "postgres") . "'", $username, $password); //! client_encoding is supported since 9.1 but we can't yet use min_version here
 				//! connect without DB in case of an error
 				return true;
 			}
@@ -143,6 +159,23 @@ if (isset($_GET["pgsql"])) {
 				return ($adminer->database() == $database);
 			}
 
+			function quoteBinary($s) {
+				return q($s);
+			}
+
+			function query($query, $unbuffered = false) {
+				$return = parent::query($query, $unbuffered);
+				if ($this->timeout) {
+					$this->timeout = 0;
+					parent::query("RESET statement_timeout");
+				}
+				return $return;
+			}
+
+			function warnings() {
+				return ''; // not implemented in PDO_PgSQL as of PHP 7.2.1
+			}
+
 			function close() {
 			}
 		}
@@ -173,6 +206,40 @@ if (isset($_GET["pgsql"])) {
 			return true;
 		}
 
+		function slowQuery($query, $timeout) {
+			$this->_conn->query("SET statement_timeout = " . (1000 * $timeout));
+			$this->_conn->timeout = 1000 * $timeout;
+			return $query;
+		}
+
+		function convertSearch($idf, $val, $field) {
+			return (preg_match('~char|text'
+					. (!preg_match('~LIKE~', $val["op"]) ? '|date|time(stamp)?|boolean|uuid|' . number_type() : '')
+					. '~', $field["type"])
+				? $idf
+				: "CAST($idf AS text)"
+			);
+		}
+
+		function quoteBinary($s) {
+			return $this->_conn->quoteBinary($s);
+		}
+
+		function warnings() {
+			return $this->_conn->warnings();
+		}
+
+		function tableHelp($name) {
+			$links = array(
+				"information_schema" => "infoschema",
+				"pg_catalog" => "catalog",
+			);
+			$link = $links[$_GET["ns"]];
+			if ($link) {
+				return "$link-" . str_replace("_", "-", $name) . ".html";
+			}
+		}
+
 	}
 
 
@@ -186,12 +253,20 @@ 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) {
+			if (min_version(9, 0, $connection)) {
 				$connection->query("SET application_name = 'Adminer'");
+				if (min_version(9.2, 0, $connection)) {
+					$structured_types[lang('Strings')][] = "json";
+					$types["json"] = 4294967295;
+					if (min_version(9.4, 0, $connection)) {
+						$structured_types[lang('Strings')][] = "jsonb";
+						$types["jsonb"] = 4294967295;
+					}
+				}
 			}
 			return $connection;
 		}
@@ -199,20 +274,25 @@ if (isset($_GET["pgsql"])) {
 	}
 
 	function get_databases() {
-		return get_vals("SELECT datname FROM pg_database WHERE has_database_privilege(datname, 'CONNECT') ORDER BY datname");
+		return get_vals("SELECT d.datname FROM pg_database d JOIN pg_roles r ON d.datdba = r.oid
+                 WHERE d.datallowconn = TRUE AND has_database_privilege(d.datname, 'CONNECT') AND pg_has_role(r.rolname, 'USAGE')
+                 ORDER BY d.datname");
 	}
 
 	function limit($query, $where, $limit, $offset = 0, $separator = " ") {
 		return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
 	}
 
-	function limit1($query, $where) {
-		return " $query$where";
+	function limit1($table, $query, $where, $separator = "\n") {
+		return (preg_match('~^INTO~', $query)
+			? limit($query, $where, 1, 0, $separator)
+			: " $query" . (is_view(table_status1($table)) ? $where : $separator . "WHERE ctid = (SELECT ctid FROM " . table($table) . $where . $separator . "LIMIT 1)")
+		);
 	}
 
 	function db_collation($db, $collations) {
 		global $connection;
-		return $connection->result("SHOW LC_COLLATE"); //! respect $db
+		return $connection->result("SELECT datcollate FROM pg_database WHERE datname = " . q($db));
 	}
 
 	function engines() {
@@ -226,7 +306,7 @@ if (isset($_GET["pgsql"])) {
 
 	function tables_list() {
 		$query = "SELECT table_name, table_type FROM information_schema.tables WHERE table_schema = current_schema()";
-		if (support('materializedview')) {
+		if (support('materializedview')) { // ' - support("materializedview") could be removed by compile.php
 			$query .= "
 UNION ALL
 SELECT matviewname, 'MATERIALIZED VIEW'
@@ -244,10 +324,10 @@ ORDER BY 1";
 
 	function table_status($name = "") {
 		$return = array();
-		foreach (get_rows("SELECT c.relname AS \"Name\", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\", pg_relation_size(c.oid) AS \"Data_length\", pg_indexes_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
+		foreach (get_rows("SELECT c.relname AS \"Name\", CASE c.relkind WHEN 'r' THEN 'table' WHEN 'm' THEN 'materialized view' ELSE 'view' END AS \"Engine\", pg_table_size(c.oid) AS \"Data_length\", pg_indexes_size(c.oid) AS \"Index_length\", obj_description(c.oid, 'pg_class') AS \"Comment\", " . (min_version(12) ? "''" : "CASE WHEN c.relhasoids THEN 'oid' ELSE '' END") . " AS \"Oid\", c.reltuples as \"Rows\", n.nspname
 FROM pg_class c
 JOIN pg_namespace n ON(n.nspname = current_schema() AND n.oid = c.relnamespace)
-WHERE relkind IN ('r', 'm', 'v')
+WHERE relkind IN ('r', 'm', 'v', 'f', 'p')
 " . ($name != "" ? "AND relname = " . q($name) : "ORDER BY relname")
 		) as $row) { //! Index_length, Auto_increment
 			$return[$row["Name"]] = $row;
@@ -269,7 +349,8 @@ WHERE relkind IN ('r', 'm', 'v')
 			'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
+
+		foreach (get_rows("SELECT a.attname AS field, format_type(a.atttypid, a.atttypmod) AS full_type, pg_get_expr(d.adbin, d.adrelid) AS default, a.attnotnull::int, col_description(c.oid, a.attnum) AS comment" . (min_version(10) ? ", a.attidentity" : "") . "
 FROM pg_class c
 JOIN pg_namespace n ON c.relnamespace = n.oid
 JOIN pg_attribute a ON c.oid = a.attrelid
@@ -292,11 +373,14 @@ ORDER BY a.attnum"
 				$row["type"] = $type;
 				$row["full_type"] = $row["type"] . $length . $addon . $array;
 			}
+			if (in_array($row['attidentity'], array('a', 'd'))) {
+				$row['default'] = 'GENERATED ' . ($row['attidentity'] == 'd' ? 'BY DEFAULT' : 'ALWAYS') . ' AS IDENTITY';
+			}
 			$row["null"] = !$row["attnotnull"];
-			$row["auto_increment"] = preg_match('~^nextval\\(~i', $row["default"]);
+			$row["auto_increment"] = $row['attidentity'] || 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]) . $match[2];
+			if (preg_match('~(.+)::[^,)]+(.*)~', $row["default"], $match)) {
+				$row["default"] = ($match[1] == "NULL" ? null : idf_unescape($match[1]) . $match[2]);
 			}
 			$return[$row["field"]] = $row;
 		}
@@ -311,7 +395,7 @@ 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::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) {
+		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();
@@ -336,12 +420,12 @@ WHERE conrelid = (SELECT pc.oid FROM pg_class AS pc INNER JOIN pg_namespace AS p
 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['source'] = array_map('idf_unescape', array_map('trim', explode(',', $match[1])));
 				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['ns'] = idf_unescape($match2[2]);
+					$row['table'] = idf_unescape($match2[4]);
 				}
-				$row['target'] = array_map('trim', explode(',', $match[3]));
+				$row['target'] = array_map('idf_unescape', array_map('trim', explode(',', $match[3])));
 				$row['on_delete'] = (preg_match("~ON DELETE ($on_actions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
 				$row['on_update'] = (preg_match("~ON UPDATE ($on_actions)~", $match[4], $match2) ? $match2[1] : 'NO ACTION');
 				$return[$row['conname']] = $row;
@@ -350,9 +434,26 @@ ORDER BY conkey, conname") as $row) {
 		return $return;
 	}
 
+	function constraints($table) {
+		global $on_actions;
+		$return = array();
+		foreach (get_rows("SELECT conname, consrc
+FROM pg_catalog.pg_constraint
+INNER JOIN pg_catalog.pg_namespace ON pg_constraint.connamespace = pg_namespace.oid
+INNER JOIN pg_catalog.pg_class ON pg_constraint.conrelid = pg_class.oid AND pg_constraint.connamespace = pg_class.relnamespace
+WHERE pg_constraint.contype = 'c'
+AND conrelid != 0 -- handle only CONSTRAINTs here, not TYPES
+AND nspname = current_schema()
+AND relname = " . q($table) . "
+ORDER BY connamespace, conname") as $row) {
+			$return[$row['conname']] = $row['consrc'];
+		}
+		return $return;
+	}
+
 	function view($name) {
 		global $connection;
-		return array("select" => trim($connection->result("SELECT pg_get_viewdef(" . q($name) . ")")));
+		return array("select" => trim($connection->result("SELECT pg_get_viewdef(" . $connection->result("SELECT oid FROM pg_class WHERE relnamespace = (SELECT oid FROM pg_namespace WHERE nspname = current_schema()) AND relname = " . q($name)) . ")")));
 	}
 
 	function collations() {
@@ -367,8 +468,8 @@ ORDER BY conkey, conname") as $row) {
 	function error() {
 		global $connection;
 		$return = h($connection->error);
-		if (preg_match('~^(.*\\n)?([^\\n]*)\\n( *)\\^(\\n.*)?$~s', $return, $match)) {
-			$return = $match[1] . preg_replace('~((?:[^&]|&[^;]*;){' . strlen($match[3]) . '})(.*)~', '\\1<b>\\2</b>', $match[2]) . $match[4];
+		if (preg_match('~^(.*\n)?([^\n]*)\n( *)\^(\n.*)?$~s', $return, $match)) {
+			$return = $match[1] . preg_replace('~((?:[^&]|&[^;]*;){' . strlen($match[3]) . '})(.*)~', '\1<b>\2</b>', $match[2]) . $match[4];
 		}
 		return nl_br($return);
 	}
@@ -395,6 +496,9 @@ ORDER BY conkey, conname") as $row) {
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
 		$alter = array();
 		$queries = array();
+		if ($table != "" && $table != $name) {
+			$queries[] = "ALTER TABLE " . table($table) . " RENAME TO " . table($name);
+		}
 		foreach ($fields as $field) {
 			$column = idf_escape($field[0]);
 			$val = $field[1];
@@ -403,14 +507,17 @@ ORDER BY conkey, conname") as $row) {
 			} else {
 				$val5 = $val[5];
 				unset($val[5]);
-				if (isset($val[6]) && $field[0] == "") { // auto_increment
-					$val[1] = ($val[1] == "bigint" ? " big" : " ") . "serial";
-				}
 				if ($field[0] == "") {
+					if (isset($val[6])) { // auto_increment
+						$val[1] = ($val[1] == " bigint" ? " big" : ($val[1] == " smallint" ? " small" : " ")) . "serial";
+					}
 					$alter[] = ($table != "" ? "ADD " : "  ") . implode($val);
+					if (isset($val[6])) {
+						$alter[] = ($table != "" ? "ADD" : " ") . " PRIMARY KEY ($val[0])";
+					}
 				} else {
 					if ($column != $val[0]) {
-						$queries[] = "ALTER TABLE " . table($table) . " RENAME $column TO $val[0]";
+						$queries[] = "ALTER TABLE " . table($name) . " RENAME $column TO $val[0]";
 					}
 					$alter[] = "ALTER $column TYPE$val[1]";
 					if (!$val[6]) {
@@ -419,7 +526,7 @@ ORDER BY conkey, conname") as $row) {
 					}
 				}
 				if ($field[0] != "" || $val5 != "") {
-					$queries[] = "COMMENT ON COLUMN " . table($table) . ".$val[0] IS " . ($val5 != "" ? substr($val5, 9) : "''");
+					$queries[] = "COMMENT ON COLUMN " . table($name) . ".$val[0] IS " . ($val5 != "" ? substr($val5, 9) : "''");
 				}
 			}
 		}
@@ -429,10 +536,7 @@ ORDER BY conkey, conname") as $row) {
 		} elseif ($alter) {
 			array_unshift($queries, "ALTER TABLE " . table($table) . "\n" . implode(",\n", $alter));
 		}
-		if ($table != "" && $table != $name) {
-			$queries[] = "ALTER TABLE " . table($table) . " RENAME TO " . table($name);
-		}
-		if ($table != "" || $comment != "") {
+		if ($comment !== null) {
 			$queries[] = "COMMENT ON TABLE " . table($name) . " IS " . q($comment);
 		}
 		if ($auto_increment != "") {
@@ -506,21 +610,34 @@ ORDER BY conkey, conname") as $row) {
 		return true;
 	}
 
-	function trigger($name, $table = null) {
+	function trigger($name, $table) {
 		if ($name == "") {
 			return array("Statement" => "EXECUTE PROCEDURE ()");
 		}
-		if ($table === null) {
-			$table = $_GET['trigger'];
+		$columns = array();
+		$where = "WHERE trigger_schema = current_schema() AND event_object_table = " . q($table) . " AND trigger_name = " . q($name);
+		foreach (get_rows("SELECT * FROM information_schema.triggered_update_columns $where") as $row) {
+			$columns[] = $row["event_object_column"];
 		}
-		$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);
+		$return = array();
+		foreach (get_rows('SELECT trigger_name AS "Trigger", action_timing AS "Timing", event_manipulation AS "Event", \'FOR EACH \' || action_orientation AS "Type", action_statement AS "Statement" FROM information_schema.triggers ' . "$where ORDER BY event_manipulation DESC") as $row) {
+			if ($columns && $row["Event"] == "UPDATE") {
+				$row["Event"] .= " OF";
+			}
+			$row["Of"] = implode(", ", $columns);
+			if ($return) {
+				$row["Event"] .= " OR $return[Event]";
+			}
+			$return = $row;
+		}
+		return $return;
 	}
 
 	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["action_timing"], $row["event_manipulation"]);
+		foreach (get_rows("SELECT * FROM information_schema.triggers WHERE trigger_schema = current_schema() AND event_object_table = " . q($table)) as $row) {
+			$trigger = trigger($row["trigger_name"], $table);
+			$return[$trigger["Trigger"]] = array($trigger["Timing"], $trigger["Event"]);
 		}
 		return $return;
 	}
@@ -528,35 +645,41 @@ ORDER BY conkey, conname") as $row) {
 	function trigger_options() {
 		return array(
 			"Timing" => array("BEFORE", "AFTER"),
-			"Event" => array("INSERT", "UPDATE", "DELETE"),
+			"Event" => array("INSERT", "UPDATE", "UPDATE OF", "DELETE", "INSERT OR UPDATE", "INSERT OR UPDATE OF", "DELETE OR INSERT", "DELETE OR UPDATE", "DELETE OR UPDATE OF", "DELETE OR INSERT OR UPDATE", "DELETE OR INSERT OR UPDATE OF"),
 			"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
-		//! no procedures, only functions
-		//! different syntax of CREATE FUNCTION
-		$rows = get_rows('SELECT pg_catalog.format_type(p.prorettype, NULL) AS "returns", p.prosrc AS "definition"
-FROM pg_catalog.pg_namespace n
-JOIN pg_catalog.pg_proc p ON p.pronamespace = n.oid
-WHERE n.nspname = current_schema() AND p.proname = ' . q($name));
-		$rows[0]["fields"] = array(); //!
-		return $rows[0];
+		$rows = get_rows('SELECT routine_definition AS definition, LOWER(external_language) AS language, *
+FROM information_schema.routines
+WHERE routine_schema = current_schema() AND specific_name = ' . q($name));
+		$return = $rows[0];
+		$return["returns"] = array("type" => $return["type_udt_name"]);
+		$return["fields"] = get_rows('SELECT parameter_name AS field, data_type AS type, character_maximum_length AS length, parameter_mode AS inout
+FROM information_schema.parameters
+WHERE specific_schema = current_schema() AND specific_name = ' . q($name) . '
+ORDER BY ordinal_position');
+		return $return;
 	}
-	*/
 
 	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
-JOIN pg_catalog.pg_proc p ON p.pronamespace = n.oid
-WHERE n.nspname = current_schema()
-ORDER BY p.proname');
+		return get_rows('SELECT specific_name AS "SPECIFIC_NAME", routine_type AS "ROUTINE_TYPE", routine_name AS "ROUTINE_NAME", type_udt_name AS "DTD_IDENTIFIER"
+FROM information_schema.routines
+WHERE routine_schema = current_schema()
+ORDER BY SPECIFIC_NAME');
 	}
 
 	function routine_languages() {
-		return get_vals("SELECT langname FROM pg_catalog.pg_language");
+		return get_vals("SELECT LOWER(lanname) FROM pg_catalog.pg_language");
+	}
+
+	function routine_id($name, $row) {
+		$return = array();
+		foreach ($row["fields"] as $field) {
+			$return[] = $field["type"];
+		}
+		return idf_escape($name) . "(" . implode(", ", $return) . ")";
 	}
 
 	function last_id() {
@@ -597,9 +720,12 @@ AND typelem = 0"
 		return $connection->result("SELECT current_schema()");
 	}
 
-	function set_schema($schema) {
+	function set_schema($schema, $connection2 = null) {
 		global $connection, $types, $structured_types;
-		$return = $connection->query("SET search_path TO " . idf_escape($schema));
+		if (!$connection2) {
+			$connection2 = $connection;
+		}
+		$return = $connection2->query("SET search_path TO " . idf_escape($schema));
 		foreach (types() as $type) { //! get types from current_schemas('t')
 			if (!isset($types[$type])) {
 				$types[$type] = 0;
@@ -609,24 +735,38 @@ AND typelem = 0"
 		return $return;
 	}
 
-	/** Get SQL command to create table
-	* @param string
-	* @param bool
-	* @return string
-	*/
-	function create_sql($table, $auto_increment) {
+	// create_sql() produces CREATE TABLE without FK CONSTRAINTs
+	// foreign_keys_sql() produces all FK CONSTRAINTs as ALTER TABLE ... ADD CONSTRAINT
+	// so that all FKs can be added after all tables have been created, avoiding any need to reorder CREATE TABLE statements in order of their FK dependencies
+	function foreign_keys_sql($table) {
+		$return = "";
+
+		$status = table_status($table);
+		$fkeys = foreign_keys($table);
+		ksort($fkeys);
+
+		foreach ($fkeys as $fkey_name => $fkey) {
+			$return .= "ALTER TABLE ONLY " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " ADD CONSTRAINT " . idf_escape($fkey_name) . " $fkey[definition] " . ($fkey['deferrable'] ? 'DEFERRABLE' : 'NOT DEFERRABLE') . ";\n";
+		}
+
+		return ($return ? "$return\n" : $return);
+	}
+
+	function create_sql($table, $auto_increment, $style) {
 		global $connection;
 		$return = '';
 		$return_parts = array();
 		$sequences = array();
 
 		$status = table_status($table);
+		if (is_view($status)) {
+			$view = view($table);
+			return rtrim("CREATE VIEW " . idf_escape($table) . " AS $view[select]", ";");
+		}
 		$fields = fields($table);
 		$indexes = indexes($table);
 		ksort($indexes);
-		$fkeys = foreign_keys($table);
-		ksort($fkeys);
-		$triggers = triggers($table);
+		$constraints = constraints($table);
 
 		if (!$status || empty($fields)) {
 			return false;
@@ -637,15 +777,19 @@ AND typelem = 0"
 		// 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");
+				. default_value($field)
+				. ($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];";
+				$sq = reset(get_rows(min_version(10)
+					? "SELECT *, cache_size AS cache_value FROM pg_sequences WHERE schemaname = current_schema() AND sequencename = " . q($sequence_name)
+					: "SELECT * FROM $sequence_name"
+				));
+				$sequences[] = ($style == "DROP+CREATE" ? "DROP SEQUENCE IF EXISTS $sequence_name;\n" : "")
+					. "CREATE SEQUENCE $sequence_name INCREMENT $sq[increment_by] MINVALUE $sq[min_value] MAXVALUE $sq[max_value]" . ($auto_increment && $sq['last_value'] ? " START $sq[last_value]" : "") . " CACHE $sq[cache_value];";
 			}
 		}
 
@@ -662,9 +806,8 @@ AND typelem = 0"
 			}
 		}
 
-		// foreign keys
-		foreach ($fkeys as $fkey_name => $fkey) {
-			$return_parts[] = "CONSTRAINT " . idf_escape($fkey_name) . " $fkey[definition] " . ($fkey['deferrable'] ? 'DEFERRABLE' : 'NOT DEFERRABLE');
+		foreach ($constraints as $conname => $consrc) {
+			$return_parts[] = "CONSTRAINT " . idf_escape($conname) . " CHECK $consrc";
 		}
 
 		$return .= implode(",\n    ", $return_parts) . "\n) WITH (oids = " . ($status['Oid'] ? 'true' : 'false') . ");";
@@ -672,7 +815,11 @@ AND typelem = 0"
 		// "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'])) . ");";
+				$columns = array();
+				foreach ($index['columns'] as $key => $val) {
+					$columns[] = idf_escape($val) . ($index['descs'][$key] ? " DESC" : "");
+				}
+				$return .= "\n\nCREATE INDEX " . idf_escape($index_name) . " ON " . idf_escape($status['nspname']) . "." . idf_escape($status['Name']) . " USING btree (" . implode(', ', $columns) . ");";
 			}
 		}
 
@@ -687,30 +834,21 @@ AND typelem = 0"
 			}
 		}
 
-		// 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;
+	function truncate_sql($table) {
+		return "TRUNCATE " . table($table);
+	}
 
-		return false;
+	function trigger_sql($table) {
+		$status = table_status($table);
+		$return = "";
+		foreach (triggers($table) as $trg_id => $trg) {
+			$trigger = trigger($trg_id, $status['Name']);
+			$return .= "\nCREATE TRIGGER " . idf_escape($trigger['Trigger']) . " $trigger[Timing] $trigger[Event] ON " . idf_escape($status["nspname"]) . "." . idf_escape($status['Name']) . " $trigger[Type] $trigger[Statement];;\n";
+		}
+		return $return;
 	}
 
 
@@ -723,8 +861,7 @@ AND typelem = 0"
 	}
 
 	function process_list() {
-		global $connection;
-		return get_rows("SELECT * FROM pg_stat_activity ORDER BY " . ($connection->server_info < 9.2 ? "procpid" : "pid"));
+		return get_rows("SELECT * FROM pg_stat_activity ORDER BY " . (min_version(9.2) ? "pid" : "procpid"));
 	}
 
 	function show_status() {
@@ -738,8 +875,7 @@ AND typelem = 0"
 	}
 
 	function support($feature) {
-		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|
+		return preg_match('~^(database|table|columns|sql|indexes|descidx|comment|view|' . (min_version(9.3) ? 'materializedview|' : '') . 'scheme|routine|processlist|sequence|trigger|type|variables|drop_col|kill|dump)$~', $feature);
 	}
 
 	function kill_process($val) {
@@ -755,32 +891,39 @@ AND typelem = 0"
 		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, "timestamptz" => 21, "interval" => 0),
-		lang('Strings') => array("character" => 0, "character varying" => 0, "text" => 0, "tsquery" => 0, "tsvector" => 0, "uuid" => 0, "xml" => 0),
-		lang('Binary') => array("bit" => 0, "bit varying" => 0, "bytea" => 0),
-		lang('Network') => array("cidr" => 43, "inet" => 43, "macaddr" => 17, "txid_snapshot" => 0),
-		lang('Geometry') => array("box" => 0, "circle" => 0, "line" => 0, "lseg" => 0, "path" => 0, "point" => 0, "polygon" => 0),
-	) as $key => $val) { //! can be retrieved from pg_type
-		$types += $val;
-		$structured_types[$key] = array_keys($val);
+	function driver_config() {
+		$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, "timestamptz" => 21, "interval" => 0),
+			lang('Strings') => array("character" => 0, "character varying" => 0, "text" => 0, "tsquery" => 0, "tsvector" => 0, "uuid" => 0, "xml" => 0),
+			lang('Binary') => array("bit" => 0, "bit varying" => 0, "bytea" => 0),
+			lang('Network') => array("cidr" => 43, "inet" => 43, "macaddr" => 17, "txid_snapshot" => 0),
+			lang('Geometry') => array("box" => 0, "circle" => 0, "line" => 0, "lseg" => 0, "path" => 0, "point" => 0, "polygon" => 0),
+		) as $key => $val) { //! can be retrieved from pg_type
+			$types += $val;
+			$structured_types[$key] = array_keys($val);
+		}
+		return array(
+			'possible_drivers' => array("PgSQL", "PDO_PgSQL"),
+			'jush' => "pgsql",
+			'types' => $types,
+			'structured_types' => $structured_types,
+			'unsigned' => array(),
+			'operators' => array("=", "<", ">", "<=", ">=", "!=", "~", "!~", "LIKE", "LIKE %%", "ILIKE", "ILIKE %%", "IN", "IS NULL", "NOT LIKE", "NOT IN", "IS NOT NULL"), // no "SQL" to avoid CSRF
+			'functions' => array("char_length", "lower", "round", "to_hex", "to_timestamp", "upper"),
+			'grouping' => array("avg", "count", "count distinct", "max", "min", "sum"),
+			'edit_functions' => array(
+				array(
+					"char" => "md5",
+					"date|time" => "now",
+				), array(
+					number_type() => "+/-",
+					"date|time" => "+ interval/- interval", //! escape
+					"char|text" => "||",
+				)
+			),
+		);
 	}
-	$unsigned = array();
-	$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(
-		array(
-			"char" => "md5",
-			"date|time" => "now",
-		), array(
-			"int|numeric|real|money" => "+/-",
-			"date|time" => "+ interval/- interval", //! escape
-			"char|text" => "||",
-		)
-	);
 }

adminer/drivers/sqlite.inc.php

@@ -3,7 +3,6 @@ $drivers["sqlite"] = "SQLite 3";
 $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 (class_exists(isset($_GET["sqlite"]) ? "SQLite3" : "SQLiteDatabase")) {
 		if (isset($_GET["sqlite"])) {
@@ -141,7 +140,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 					}
 					$return = array();
 					foreach ($row as $key => $val) {
-						$return[($key[0] == '"' ? idf_unescape($key) : $key)] = $val;
+						$return[idf_unescape($key)] = $val;
 					}
 					return $return;
 				}
@@ -152,7 +151,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 
 				function fetch_field() {
 					$name = $this->_result->fieldName($this->_offset++);
-					$pattern = '(\\[.*]|"(?:[^"]|"")*"|(.+))';
+					$pattern = '(\[.*]|"(?:[^"]|"")*"|(.+))';
 					if (preg_match("~^($pattern\\.)?$pattern\$~", $name, $match)) {
 						$table = ($match[3] != "" ? $match[3] : idf_unescape($match[2]));
 						$name = ($match[5] != "" ? $match[5] : idf_unescape($match[4]));
@@ -184,11 +183,14 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 
 			function __construct() {
 				parent::__construct(":memory:");
+				$this->query("PRAGMA foreign_keys = 1");
 			}
 
 			function select_db($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);
+					$this->query("PRAGMA foreign_keys = 1");
+					$this->query("PRAGMA busy_timeout = 500");
 					return true;
 				}
 				return false;
@@ -216,6 +218,15 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			return queries("REPLACE INTO " . table($table) . " (" . implode(", ", array_keys(reset($rows))) . ") VALUES\n" . implode(",\n", $values));
 		}
 
+		function tableHelp($name) {
+			if ($name == "sqlite_sequence") {
+				return "fileformat2.html#seqtab";
+			}
+			if ($name == "sqlite_master") {
+				return "fileformat2.html#$name";
+			}
+		}
+
 	}
 
 
@@ -229,6 +240,11 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function connect() {
+		global $adminer;
+		list(, , $password) = $adminer->credentials();
+		if ($password != "") {
+			return lang('Database does not support password.');
+		}
 		return new Min_DB;
 	}
 
@@ -240,9 +256,12 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return " $query$where" . ($limit !== null ? $separator . "LIMIT $limit" . ($offset ? " OFFSET $offset" : "") : "");
 	}
 
-	function limit1($query, $where) {
+	function limit1($table, $query, $where, $separator = "\n") {
 		global $connection;
-		return ($connection->result("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')") ? limit($query, $where, 1) : " $query$where");
+		return (preg_match('~^INTO~', $query) || $connection->result("SELECT sqlite_compileoption_used('ENABLE_UPDATE_DELETE_LIMIT')")
+			? limit($query, $where, 1, 0, $separator)
+			: " $query WHERE rowid = (SELECT rowid FROM " . table($table) . $where . $separator . "LIMIT 1)" //! use primary key in tables with WITHOUT rowid
+		);
 	}
 
 	function db_collation($db, $collations) {
@@ -259,7 +278,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function tables_list() {
-		return get_key_vals("SELECT name, type FROM sqlite_master WHERE type IN ('table', 'view') ORDER BY (name = 'sqlite_sequence'), name", 1);
+		return get_key_vals("SELECT name, type FROM sqlite_master WHERE type IN ('table', 'view') ORDER BY (name = 'sqlite_sequence'), name");
 	}
 
 	function count_tables($databases) {
@@ -269,9 +288,7 @@ 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) : "ORDER BY name")) as $row) {
-			$row["Oid"] = 1;
-			$row["Auto_increment"] = "";
+		foreach (get_rows("SELECT name AS Name, type AS Engine, 'rowid' AS Oid, '' AS Auto_increment FROM sqlite_master WHERE type IN ('table', 'view') " . ($name != "" ? "AND name = " . q($name) : "ORDER BY name")) as $row) {
 			$row["Rows"] = $connection->result("SELECT COUNT(*) FROM " . idf_escape($row["Name"]));
 			$return[$row["Name"]] = $row;
 		}
@@ -304,7 +321,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 				"full_type" => $type,
 				"default" => (preg_match("~'(.*)'~", $default, $match) ? str_replace("''", "'", $match[1]) : ($default == "NULL" ? null : $default)),
 				"null" => !$row["notnull"],
-				"privileges" => array("select" => 1, "insert" => 1, "update" => 1),
+				"privileges" => array("select" => 1, "insert" => 1, "update" => 1, "where" => 1, "order" => 1),
 				"primary" => $row["pk"],
 			);
 			if ($row["pk"]) {
@@ -334,9 +351,9 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		}
 		$return = array();
 		$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)) {
+		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);
+			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);
@@ -390,7 +407,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 
 	function view($name) {
 		global $connection;
-		return array("select" => preg_replace('~^(?:[^`"[]+|`[^`]*`|"[^"]*")* AS\\s+~iU', '', $connection->result("SELECT sql FROM sqlite_master WHERE name = " . q($name)))); //! identifiers may be inside []
+		return array("select" => preg_replace('~^(?:[^`"[]+|`[^`]*`|"[^"]*")* AS\s+~iU', '', $connection->result("SELECT sql FROM sqlite_master WHERE name = " . q($name)))); //! identifiers may be inside []
 	}
 
 	function collations() {
@@ -465,6 +482,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function alter_table($table, $name, $fields, $foreign, $comment, $engine, $collation, $auto_increment, $partitioning) {
+		global $connection;
 		$use_all_fields = ($table == "" || $foreign);
 		foreach ($fields as $field) {
 			if ($field[0] != "" || !$field[1] || $field[2]) {
@@ -491,19 +509,28 @@ 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)) {
+		} elseif (!recreate_table($table, $name, $alter, $originals, $foreign, $auto_increment)) {
 			return false;
 		}
 		if ($auto_increment) {
+			queries("BEGIN");
 			queries("UPDATE sqlite_sequence SET seq = $auto_increment WHERE name = " . q($name)); // ignores error
+			if (!$connection->affected_rows) {
+				queries("INSERT INTO sqlite_sequence (name, seq) VALUES (" . q($name) . ", $auto_increment)");
+			}
+			queries("COMMIT");
 		}
 		return true;
 	}
 
-	function recreate_table($table, $name, $fields, $originals, $foreign, $indexes = array()) {
+	function recreate_table($table, $name, $fields, $originals, $foreign, $auto_increment, $indexes = array()) {
+		global $connection;
 		if ($table != "") {
 			if (!$fields) {
 				foreach (fields($table) as $key => $field) {
+					if ($indexes) {
+						$field["auto_increment"] = 0;
+					}
 					$fields[] = process_field($field, $field);
 					$originals[$key] = idf_escape($key);
 				}
@@ -558,12 +585,13 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 			$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)")) {
+		$temp_name = ($table == $name ? "adminer_$name" : $name);
+		if (!queries("CREATE TABLE " . table($temp_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))) {
+			if ($originals && !queries("INSERT INTO " . table($temp_name) . " (" . implode(", ", $originals) . ") SELECT " . implode(", ", array_map('idf_escape', array_keys($originals))) . " FROM " . table($table))) {
 				return false;
 			}
 			$triggers = array();
@@ -571,12 +599,15 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 				$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
+			$auto_increment = $auto_increment ? 0 : $connection->result("SELECT seq FROM sqlite_sequence WHERE name = " . q($table)); // if $auto_increment is set then it will be updated later
+			if (!queries("DROP TABLE " . table($table)) // drop before creating indexes and triggers to allow using old names
+				|| ($table == $name && !queries("ALTER TABLE " . table($temp_name) . " RENAME TO " . table($name)))
+				|| !alter_indexes($name, $indexes)
+			) {
 				return false;
 			}
-			queries("ALTER TABLE " . table("adminer_$name") . " RENAME TO " . table($name));
-			if (!alter_indexes($name, $indexes)) {
-				return false;
+			if ($auto_increment) {
+				queries("UPDATE sqlite_sequence SET seq = $auto_increment WHERE name = " . q($name)); // ignores error
 			}
 			foreach ($triggers as $trigger) {
 				if (!queries($trigger)) {
@@ -599,7 +630,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	function alter_indexes($table, $alter) {
 		foreach ($alter as $primary) {
 			if ($primary[0] == "PRIMARY") {
-				return recreate_table($table, $table, array(), array(), array(), $alter);
+				return recreate_table($table, $table, array(), array(), array(), 0, $alter);
 			}
 		}
 		foreach (array_reverse($alter) as $val) {
@@ -634,7 +665,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		if ($name == "") {
 			return array("Statement" => "BEGIN\n\t;\nEND");
 		}
-		$idf = '(?:[^`"\\s]+|`[^`]*`|"[^"]*")+';
+		$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",
@@ -645,7 +676,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return array(
 			"Timing" => strtoupper($match[1]),
 			"Event" => strtoupper($match[2]) . ($of ? " OF" : ""),
-			"Of" => ($of[0] == '`' || $of[0] == '"' ? idf_unescape($of) : $of),
+			"Of" => idf_unescape($of),
 			"Trigger" => $name,
 			"Statement" => $match[4],
 		);
@@ -655,7 +686,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		$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*(' . implode("|", $trigger_options["Timing"]) . ')\\s*(.*)\\s+ON\\b~iU', $row["sql"], $match);
+			preg_match('~^CREATE\s+TRIGGER\s*(?:[^`"\s]+|`[^`]*`|"[^"]*")+\s*(' . implode("|", $trigger_options["Timing"]) . ')\s*(.*?)\s+ON\b~i', $row["sql"], $match);
 			$return[$row["name"]] = array($match[1], $match[2]);
 		}
 		return $return;
@@ -669,18 +700,6 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		);
 	}
 
-	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");
 	}
@@ -713,7 +732,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 		return true;
 	}
 
-	function create_sql($table, $auto_increment) {
+	function create_sql($table, $auto_increment, $style) {
 		global $connection;
 		$return = $connection->result("SELECT sql FROM sqlite_master WHERE type IN ('table', 'view') AND name = " . q($table));
 		foreach (indexes($table) as $name => $index) {
@@ -732,7 +751,7 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	function use_sql($database) {
 	}
 
-	function trigger_sql($table, $style) {
+	function trigger_sql($table) {
 		return implode(get_vals("SELECT sql || ';;\n' FROM sqlite_master WHERE type = 'trigger' AND tbl_name = " . q($table)));
 	}
 
@@ -762,23 +781,29 @@ if (isset($_GET["sqlite"]) || isset($_GET["sqlite2"])) {
 	}
 
 	function support($feature) {
-		return preg_match('~^(columns|database|drop_col|dump|indexes|move_col|sql|status|table|trigger|variables|view|view_trigger)$~', $feature);
+		return preg_match('~^(columns|database|drop_col|dump|indexes|descidx|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", "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(
-		array(
-			// "text" => "date('now')/time('now')/datetime('now')",
-		), array(
-			"integer|real|numeric" => "+/-",
-			// "text" => "date/time/datetime",
-			"text" => "||",
-		)
-	);
+	function driver_config() {
+		$types = array("integer" => 0, "real" => 0, "numeric" => 0, "text" => 0, "blob" => 0);
+		return array(
+			'possible_drivers' => array((isset($_GET["sqlite"]) ? "SQLite3" : "SQLite"), "PDO_SQLite"),
+			'jush' => "sqlite",
+			'types' => $types,
+			'structured_types' => array_keys($types),
+			'unsigned' => array(),
+			'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(
+				array(
+					// "text" => "date('now')/time('now')/datetime('now')",
+				), array(
+					"integer|real|numeric" => "+/-",
+					// "text" => "date/time/datetime",
+					"text" => "||",
+				)
+			),
+		);
+	}
 }

adminer/dump.inc.php

@@ -14,15 +14,16 @@ if ($_POST && !$error) {
 	$is_sql = preg_match('~sql~', $_POST["format"]);
 
 	if ($is_sql) {
-		echo "-- Adminer $VERSION " . $drivers[DRIVER] . " dump\n\n";
+		echo "-- Adminer $VERSION " . $drivers[DRIVER] . " " . str_replace("\n", " ", $connection->server_info) . " dump\n\n";
 		if ($jush == "sql") {
 			echo "SET NAMES utf8;
 SET time_zone = '+00:00';
-" . ($_POST["data_style"] ? "SET foreign_key_checks = 0;
-SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
+SET foreign_key_checks = 0;
+" . ($_POST["data_style"] ? "SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 " : "") . "
 ";
-			$connection->query("SET time_zone = '+00:00';");
+			$connection->query("SET time_zone = '+00:00'");
+			$connection->query("SET sql_mode = ''");
 		}
 	}
 
@@ -92,7 +93,7 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 							$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"]))) {
+						if ($is_sql && $_POST["triggers"] && $table && ($triggers = trigger_sql($name))) {
 							echo "\nDELIMITER ;;\n$triggers\nDELIMITER ;\n";
 						}
 
@@ -105,6 +106,16 @@ SET sql_mode = 'NO_AUTO_VALUE_ON_ZERO';
 					}
 				}
 
+				// add FKs after creating tables (except in MySQL which uses SET FOREIGN_KEY_CHECKS=0)
+				if (function_exists('foreign_keys_sql')) {
+					foreach (table_status('', true) as $name => $table_status) {
+						$table = (DB == "" || in_array($name, (array) $_POST["tables"]));
+						if ($table && !is_view($table_status)) {
+							echo foreign_keys_sql($name);
+						}
+					}
+				}
+
 				foreach ($views as $view) {
 					$adminer->dumpTable($view, $_POST["table_style"], 1);
 				}
@@ -126,7 +137,7 @@ page_header(lang('Export'), $error, ($_GET["export"] != "" ? array("table" => $_
 ?>
 
 <form action="" method="post">
-<table cellspacing="0">
+<table cellspacing="0" class="layout">
 <?php
 $db_style = array('', 'USE', 'DROP+CREATE', 'CREATE');
 $table_style = array('', 'DROP+CREATE', 'CREATE');
@@ -136,16 +147,14 @@ if ($jush == "sql") { //! use insertUpdate() in all drivers
 }
 parse_str($_COOKIE["adminer_export"], $row);
 if (!$row) {
-	$row = array("output" => "text", "format" => "sql", "db_style" => (DB != "" ? "" : "CREATE"), "table_style" => "DROP+CREATE", "data_style" => "INSERT");
+	$row = array("output" => "file", "format" => "sql", "db_style" => (DB != "" ? "" : "CREATE"), "table_style" => "DROP+CREATE", "data_style" => "INSERT");
 }
 if (!isset($row["events"])) { // backwards compatibility
 	$row["routines"] = $row["events"] = ($_GET["dump"] == "");
 	$row["triggers"] = $row["table_style"];
 }
 
-echo "<tr><th>" . lang('Output') . "<td>" . html_select("output", $adminer->dumpOutput(), $row["output"], 0) . "\n"; // 0 - radio
-
-echo "<tr><th>" . lang('Format') . "<td>" . html_select("format", $adminer->dumpFormat(), $row["format"], 0) . "\n"; // 0 - radio
+echo "<tr><th>" . lang('Format') . "<td>" . html_select("format", $adminer->dumpFormat(), $row["format"], false) . "\n"; // false = 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')) : "")
@@ -158,6 +167,9 @@ echo "<tr><th>" . lang('Tables') . "<td>" . html_select('table_style', $table_st
 ;
 
 echo "<tr><th>" . lang('Data') . "<td>" . html_select('data_style', $data_style, $row["data_style"]);
+
+echo "<tr><th>" . lang('Output') . "<td>" . html_select("output", $adminer->dumpOutput(), $row["output"], false) . "\n"; // false = radio
+
 ?>
 </table>
 <p><input type="submit" value="<?php echo lang('Export'); ?>">
@@ -165,12 +177,13 @@ echo "<tr><th>" . lang('Data') . "<td>" . html_select('data_style', $data_style,
 
 <table cellspacing="0">
 <?php
+echo script("qsl('table').onclick = dumpClick;");
 $prefixes = array();
 if (DB != "") {
 	$checked = ($TABLE != "" ? "" : " checked");
 	echo "<thead><tr>";
-	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 "<th style='text-align: left;'><label class='block'><input type='checkbox' id='check-tables'$checked>" . lang('Tables') . "</label>" . script("qs('#check-tables').onclick = partial(formCheck, /^tables\\[/);", "");
+	echo "<th style='text-align: right;'><label class='block'>" . lang('Data') . "<input type='checkbox' id='check-data'$checked></label>" . script("qs('#check-data').onclick = partial(formCheck, /^data\\[/);", "");
 	echo "</thead>\n";
 
 	$views = "";
@@ -178,28 +191,31 @@ if (DB != "") {
 	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');", "block");
+		$print = "<tr><td>" . checkbox("tables[]", $name, $checked, $name, "", "block");
 		if ($type !== null && !preg_match('~table~i', $type)) {
 			$views .= "$print\n";
 		} else {
-			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";
+			echo "$print<td align='right'><label class='block'><span id='Rows-" . h($name) . "'></span>" . checkbox("data[]", $name, $checked) . "</label>\n";
 		}
 		$prefixes[$prefix]++;
 	}
 	echo $views;
 
 	if ($tables_list) {
-		echo "<script type='text/javascript'>ajaxSetHtml('" . js_escape(ME) . "script=db');</script>\n";
+		echo script("ajaxSetHtml('" . js_escape(ME) . "script=db');");
 	}
 
 } else {
-	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";
+	echo "<thead><tr><th style='text-align: left;'>";
+	echo "<label class='block'><input type='checkbox' id='check-databases'" . ($TABLE == "" ? " checked" : "") . ">" . lang('Database') . "</label>";
+	echo script("qs('#check-databases').onclick = partial(formCheck, /^databases\\[/);", "");
+	echo "</thead>\n";
 	$databases = $adminer->databases();
 	if ($databases) {
 		foreach ($databases as $db) {
 			if (!information_schema($db)) {
 				$prefix = preg_replace('~_.*~', '', $db);
-				echo "<tr><td>" . checkbox("databases[]", $db, $TABLE == "" || $TABLE == "$prefix%", $db, "formUncheck('check-databases');", "block") . "\n";
+				echo "<tr><td>" . checkbox("databases[]", $db, $TABLE == "" || $TABLE == "$prefix%", $db, "", "block") . "\n";
 				$prefixes[$prefix]++;
 			}
 		}

adminer/edit.inc.php

@@ -1,10 +1,10 @@
 <?php
 $TABLE = $_GET["edit"];
 $fields = fields($TABLE);
-$where = (isset($_GET["select"]) ? (count($_POST["check"]) == 1 ? where_check($_POST["check"][0], $fields) : "") : where($_GET, $fields));
+$where = (isset($_GET["select"]) ? ($_POST["check"] && 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) == "") {
+	if (!isset($field["privileges"][$update ? "update" : "insert"]) || $adminer->fieldName($field) == "" || $field["generated"]) {
 		unset($fields[$name]);
 	}
 }
@@ -82,9 +82,13 @@ if ($_POST["save"]) {
 	}
 	if ($select) {
 		$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 (!$result) {
+			$error = error();
+		} else {
+			$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;

adminer/elastic.php

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

adminer/event.inc.php

@@ -35,18 +35,18 @@ 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" autocapitalize="off">
+<table cellspacing="0" class="layout">
+<tr><th><?php echo lang('Name'); ?><td><input name="EVENT_NAME" value="<?php echo h($row["EVENT_NAME"]); ?>" data-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')); ?>
+<tr><th><?php echo lang('Comment'); ?><td><input name="EVENT_COMMENT" value="<?php echo h($row["EVENT_COMMENT"]); ?>" data-maxlength="64">
+<tr><th><td><?php echo checkbox("ON_COMPLETION", "PRESERVE", $row["ON_COMPLETION"] == "PRESERVE", lang('On completion preserve')); ?>
 </table>
 <p><?php textarea("EVENT_DEFINITION", $row["EVENT_DEFINITION"]); ?>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
-<?php if ($EVENT != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"<?php echo confirm(); ?>><?php } ?>
+<?php if ($EVENT != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $EVENT)); ?><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/file.inc.php

@@ -1,25 +1,18 @@
 <?php
-if ($_SERVER["HTTP_IF_MODIFIED_SINCE"]) {
-	header("HTTP/1.1 304 Not Modified");
-	exit;
-}
-
-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");
+// caching headers added in compile.php
 
 if ($_GET["file"] == "favicon.ico") {
 	header("Content-Type: image/x-icon");
 	echo lzw_decompress(compile_file('../adminer/static/favicon.ico', 'lzw_compress'));
 } elseif ($_GET["file"] == "default.css") {
 	header("Content-Type: text/css; charset=utf-8");
-	echo lzw_decompress(compile_file('../adminer/static/default.css;../externals/jush/jush.css', 'minify_css'));
+	echo lzw_decompress(compile_file('../adminer/static/default.css;../vendor/vrana/jush/jush.css', 'minify_css'));
 } elseif ($_GET["file"] == "functions.js") {
 	header("Content-Type: text/javascript; charset=utf-8");
 	echo lzw_decompress(compile_file('../adminer/static/functions.js;static/editing.js', 'minify_js'));
 } elseif ($_GET["file"] == "jush.js") {
 	header("Content-Type: text/javascript; charset=utf-8");
-	echo lzw_decompress(compile_file('../externals/jush/modules/jush.js;../externals/jush/modules/jush-textarea.js;../externals/jush/modules/jush-txt.js;../externals/jush/modules/jush-js.js;../externals/jush/modules/jush-sql.js;../externals/jush/modules/jush-pgsql.js;../externals/jush/modules/jush-sqlite.js;../externals/jush/modules/jush-mssql.js;../externals/jush/modules/jush-oracle.js;../externals/jush/modules/jush-simpledb.js', 'minify_js'));
+	echo lzw_decompress(compile_file('../vendor/vrana/jush/modules/jush.js;../vendor/vrana/jush/modules/jush-textarea.js;../vendor/vrana/jush/modules/jush-txt.js;../vendor/vrana/jush/modules/jush-js.js;../vendor/vrana/jush/modules/jush-sql.js;../vendor/vrana/jush/modules/jush-pgsql.js;../vendor/vrana/jush/modules/jush-sqlite.js;../vendor/vrana/jush/modules/jush-mssql.js;../vendor/vrana/jush/modules/jush-oracle.js;../vendor/vrana/jush/modules/jush-simpledb.js', 'minify_js'));
 } else {
 	header("Content-Type: image/gif");
 	switch ($_GET["file"]) {

adminer/foreign.inc.php

@@ -48,17 +48,33 @@ if ($_POST) {
 	$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_keys(array_filter(table_status('', true), 'fk_support'));
 ?>
 
 <form action="" method="post">
-<p>
-<?php if ($row["db"] == "" && $row["ns"] == "") { ?>
-<?php echo lang('Target table'); ?>:
-<?php echo html_select("table", $referencable, $row["table"], "this.form['change-js'].value = '1'; this.form.submit();"); ?>
+<?php
+$source = array_keys(fields($TABLE)); //! no text and blob
+if ($row["db"] != "") {
+	$connection->select_db($row["db"]);
+}
+if ($row["ns"] != "") {
+	set_schema($row["ns"]);
+}
+$referencable = array_keys(array_filter(table_status('', true), 'fk_support'));
+$target = array_keys(fields(in_array($row["table"], $referencable) ? $row["table"] : reset($referencable)));
+$onchange = "this.form['change-js'].value = '1'; this.form.submit();";
+echo "<p>" . lang('Target table') . ": " . html_select("table", $referencable, $row["table"], $onchange) . "\n";
+if ($jush == "pgsql") {
+	echo lang('Schema') . ": " . html_select("ns", $adminer->schemas(), $row["ns"] != "" ? $row["ns"] : $_GET["ns"], $onchange);
+} elseif ($jush != "sqlite") {
+	$dbs = array();
+	foreach ($adminer->databases() as $db) {
+		if (!information_schema($db)) {
+			$dbs[] = $db;
+		}
+	}
+	echo lang('DB') . ": " . html_select("db", $dbs, $row["db"] != "" ? $row["db"] : $_GET["db"], $onchange);
+}
+?>
 <input type="hidden" name="change-js" value="">
 <noscript><p><input type="submit" name="change" value="<?php echo lang('Change'); ?>"></noscript>
 <table cellspacing="0">
@@ -67,7 +83,7 @@ $referencable = array_keys(array_filter(table_status('', true), 'fk_support'));
 $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), "label-source");
+	echo "<td>" . html_select("source[" . (+$key) . "]", array(-1 => "") + $source, $val, ($j == count($row["source"]) - 1 ? "foreignAddRow.call(this);" : 1), "label-source");
 	echo "<td>" . html_select("target[" . (+$key) . "]", $target, $row["target"][$key], 1, "label-target");
 	$j++;
 }
@@ -78,14 +94,14 @@ foreach ($row["source"] as $key => $val) {
  <?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",
+	'mariadb' => "foreign-keys/",
 	'pgsql' => "sql-createtable.html#SQL-CREATETABLE-REFERENCES",
 	'mssql' => "ms174979.aspx",
-	'oracle' => "clauses002.htm#sthref2903",
+	'oracle' => "https://docs.oracle.com/cd/B19306_01/server.102/b14200/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 ($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(lang('Drop %s?', $name)); ?><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/include/adminer.inc.php

@@ -9,7 +9,7 @@ class Adminer {
 	* @return string HTML code
 	*/
 	function name() {
-		return "<a href='https://www.adminer.org/' target='_blank' id='h1'>Adminer</a>";
+		return "<a href='https://www.adminer.org/'" . target_blank() . " id='h1'>Adminer</a>";
 	}
 
 	/** Connection parameters
@@ -19,6 +19,12 @@ class Adminer {
 		return array(SERVER, $_GET["username"], get_password());
 	}
 
+	/** Get SSL connection options
+	* @return array array("key" => filename, "cert" => filename, "ca" => filename) or null
+	*/
+	function connectSsl() {
+	}
+
 	/** Get key used for permanent login
 	* @param bool
 	* @return string cryptic string which gets combined with password or false in case of an error
@@ -33,6 +39,14 @@ class Adminer {
 	function bruteForceKey() {
 		return $_SERVER["REMOTE_ADDR"];
 	}
+	
+	/** Get server name displayed in breadcrumbs
+	* @param string
+	* @return string HTML code or null
+	*/
+	function serverName($server) {
+		return h($server);
+	}
 
 	/** Identifier of selected database
 	* @return string
@@ -61,46 +75,69 @@ class Adminer {
 	* @return float number of seconds
 	*/
 	function queryTimeout() {
-		return 5;
+		return 2;
 	}
 
 	/** Headers to send before HTML output
-	* @return bool true to send security headers
+	* @return null
 	*/
 	function headers() {
-		return true;
+	}
+
+	/** Get Content Security Policy headers
+	* @return array of arrays with directive name in key, allowed sources in value
+	*/
+	function csp() {
+		return csp();
 	}
 
 	/** Print HTML code inside <head>
-	* @return bool true to link adminer.css if exists
+	* @return bool true to link favicon.ico and adminer.css if exists
 	*/
 	function head() {
 		?>
-<link rel="stylesheet" type="text/css" href="../externals/jush/jush.css">
+<link rel="stylesheet" type="text/css" href="../vendor/vrana/jush/jush.css">
 <?php
 		return true;
 	}
 
+	/** Get URLs of the CSS files
+	* @return array of strings
+	*/
+	function css() {
+		$return = array();
+		$filename = "adminer.css";
+		if (file_exists($filename)) {
+			$return[] = "$filename?v=" . crc32(file_get_contents($filename));
+		}
+		return $return;
+	}
+
 	/** Print login form
 	* @return null
 	*/
 	function loginForm() {
 		global $drivers;
-		?>
-<table cellspacing="0">
-<tr><th><?php echo lang('System'); ?><td><?php echo html_select("auth[driver]", $drivers, DRIVER); ?>
-<tr><th><?php echo lang('Server'); ?><td><input name="auth[server]" value="<?php echo h(SERVER); ?>" title="hostname[:port]" placeholder="localhost" autocapitalize="off">
-<tr><th><?php echo lang('Username'); ?><td><input name="auth[username]" id="username" value="<?php echo h($_GET["username"]); ?>" autocapitalize="off">
-<tr><th><?php echo lang('Password'); ?><td><input type="password" name="auth[password]">
-<tr><th><?php echo lang('Database'); ?><td><input name="auth[db]" value="<?php echo h($_GET["db"]); ?>" autocapitalize="off">
-</table>
-<script type="text/javascript">
-focus(document.getElementById('username'));
-</script>
-<?php
+		echo "<table cellspacing='0' class='layout'>\n";
+		echo $this->loginFormField('driver', '<tr><th>' . lang('System') . '<td>', html_select("auth[driver]", $drivers, DRIVER, "loginDriver(this);") . "\n");
+		echo $this->loginFormField('server', '<tr><th>' . lang('Server') . '<td>', '<input name="auth[server]" value="' . h(SERVER) . '" title="hostname[:port]" placeholder="localhost" autocapitalize="off">' . "\n");
+		echo $this->loginFormField('username', '<tr><th>' . lang('Username') . '<td>', '<input name="auth[username]" id="username" value="' . h($_GET["username"]) . '" autocomplete="username" autocapitalize="off">' . script("focus(qs('#username')); qs('#username').form['auth[driver]'].onchange();"));
+		echo $this->loginFormField('password', '<tr><th>' . lang('Password') . '<td>', '<input type="password" name="auth[password]" autocomplete="current-password">' . "\n");
+		echo $this->loginFormField('db', '<tr><th>' . lang('Database') . '<td>', '<input name="auth[db]" value="' . h($_GET["db"]) . '" autocapitalize="off">' . "\n");
+		echo "</table>\n";
 		echo "<p><input type='submit' value='" . lang('Login') . "'>\n";
 		echo checkbox("auth[permanent]", 1, $_COOKIE["adminer_permanent"], lang('Permanent login')) . "\n";
 	}
+	
+	/** Get login form field
+	* @param string
+	* @param string HTML
+	* @param string HTML
+	* @return string
+	*/
+	function loginFormField($name, $heading, $value) {
+		return $heading . $value;
+	}
 
 	/** Authorize the user
 	* @param string
@@ -108,9 +145,8 @@ focus(document.getElementById('username'));
 	* @return mixed true for success, string for error message, false for unknown error
 	*/
 	function login($login, $password) {
-		global $jush;
-		if ($jush == "sqlite") {
-			return lang('<a href="https://www.adminer.org/en/extension/" target="_blank">Implement</a> %s method to use SQLite.', '<code>login()</code>');
+		if ($password == "") {
+			return lang('Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.', target_blank());
 		}
 		return true;
 	}
@@ -138,6 +174,7 @@ focus(document.getElementById('username'));
 	* @return null
 	*/
 	function selectLinks($tableStatus, $set = "") {
+		global $jush, $driver;
 		echo '<p class="links">';
 		$links = array("select" => lang('Select data'));
 		if (support("table") || support("indexes")) {
@@ -153,9 +190,11 @@ focus(document.getElementById('username'));
 		if ($set !== null) {
 			$links["edit"] = lang('New item');
 		}
+		$name = $tableStatus["Name"];
 		foreach ($links as $key => $val) {
-			echo " <a href='" . h(ME) . "$key=" . urlencode($tableStatus["Name"]) . ($key == "edit" ? $set : "") . "'" . bold(isset($_GET[$key])) . ">$val</a>";
+			echo " <a href='" . h(ME) . "$key=" . urlencode($name) . ($key == "edit" ? $set : "") . "'" . bold(isset($_GET[$key])) . ">$val</a>";
 		}
+		echo doc_link(array($jush => $driver->tableHelp($name)), "?");
 		echo "\n";
 	}
 
@@ -186,15 +225,31 @@ focus(document.getElementById('username'));
 
 	/** Query printed in select before execution
 	* @param string query to be executed
-	* @param string elapsed time
+	* @param float start time of the query
+	* @param bool
 	* @return string
 	*/
-	function selectQuery($query, $time) {
-		global $jush;
-		return "<p><code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> <span class='time'>($time)</span>"
-			. (support("sql") ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "")
-			. "</p>" // </p> - required for IE9 inline edit
-		;
+	function selectQuery($query, $start, $failed = false) {
+		global $jush, $driver;
+
+        $supportSql = support("sql");
+
+		$result = "<p>"
+            . "<code class='jush-$jush'>" . h(str_replace("\n", " ", $query)) . "</code> "
+            . "<span class='time'>(" . format_time($start) . ")</span>"
+			. ($supportSql ? " <a href='" . h(ME) . "sql=" . urlencode($query) . "'>" . lang('Edit') . "</a>" : "");
+
+		if (!$failed && ($warnings = $driver->warnings())) {
+			$id = "warnings";
+			$result = ($supportSql ? "," : "")
+                . " <a href='#$id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "")
+                . "</p>\n"
+                . "<div id='$id' class='hidden'>\n$warnings</div>\n";
+		} else {
+			$result .= "</p>\n";
+		}
+
+        return $result;
 	}
 
 	/** Query printed in SQL command before execution
@@ -239,14 +294,14 @@ focus(document.getElementById('username'));
 	* @return string
 	*/
 	function selectVal($val, $link, $field, $original) {
-		$return = ($val === null ? "<i>NULL</i>" : (preg_match("~char|binary~", $field["type"]) && !preg_match("~var~", $field["type"]) ? "<code>$val</code>" : $val));
+		$return = ($val === null ? "<i>NULL</i>" : (preg_match("~char|binary|boolean~", $field["type"]) && !preg_match("~var~", $field["type"]) ? "<code>$val</code>" : $val));
 		if (preg_match('~blob|bytea|raw|file~', $field["type"]) && !is_utf8($val)) {
 			$return = "<i>" . lang('%d byte(s)', strlen($original)) . "</i>";
 		}
 		if (preg_match('~json~', $field["type"])) {
 			$return = "<code class='jush-js'>$return</code>";
 		}
-		return ($link ? "<a href='" . h($link) . "'" . (is_url($link) ? " rel='noreferrer'" : "") . ">$return</a>" : $return);
+		return ($link ? "<a href='" . h($link) . "'" . (is_web_url($link) ? target_blank() : "") . ">$return</a>" : $return);
 	}
 
 	/** Value conversion used in select and edit
@@ -263,7 +318,8 @@ focus(document.getElementById('username'));
 	* @return null
 	*/
 	function tableStructurePrint($fields) {
-		echo "<table cellspacing='0'>\n";
+		echo "<div class='scrollable'>\n";
+		echo "<table cellspacing='0' class='nowrap'>\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"]);
@@ -271,10 +327,11 @@ focus(document.getElementById('username'));
 			echo ($field["null"] ? " <i>NULL</i>" : "");
 			echo ($field["auto_increment"] ? " <i>" . lang('Auto Increment') . "</i>" : "");
 			echo (isset($field["default"]) ? " <span title='" . lang('Default value') . "'>[<b>" . h($field["default"]) . "</b>]</span>" : "");
-			echo (support("comment") ? "<td>" . nbsp($field["comment"]) : "");
+			echo (support("comment") ? "<td>" . h($field["comment"]) : "");
 			echo "\n";
 		}
 		echo "</table>\n";
+		echo "</div>\n";
 	}
 
 	/** Print list of indexes on table in tabular format
@@ -309,9 +366,16 @@ focus(document.getElementById('username'));
 		$select[""] = array();
 		foreach ($select as $key => $val) {
 			$val = $_GET["columns"][$key];
-			$column = select_input(" name='columns[$i][col]' onchange='" . ($key !== ""  ? "selectFieldChange(this.form)" : "selectAddRow(this)") . ";'", $columns, $val["col"]);
-			echo "<div>" . ($functions || $grouping ? "<select name='columns[$i][fun]' onchange='helpClose();" . ($key !== "" ? "" : " this.nextSibling.nextSibling.onchange();") . "'"
-				. on_help("getTarget(event).value && getTarget(event).value.replace(/ |\$/, '(') + ')'", 1) . ">" . optionlist(array(-1 => "") + array_filter(array(lang('Functions') => $functions, lang('Aggregation') => $grouping)), $val["fun"]) . "</select>"
+			$column = select_input(
+				" name='columns[$i][col]'",
+				$columns,
+				$val["col"],
+				($key !== "" ? "selectFieldChange" : "selectAddRow")
+			);
+			echo "<div>" . ($functions || $grouping ? "<select name='columns[$i][fun]'>"
+				. optionlist(array(-1 => "") + array_filter(array(lang('Functions') => $functions, lang('Aggregation') => $grouping)), $val["fun"]) . "</select>"
+				. on_help("getTarget(event).value && getTarget(event).value.replace(/ |\$/, '(') + ')'", 1)
+				. script("qsl('select').onchange = function () { helpClose();" . ($key !== "" ? "" : " qsl('select, input', this.parentNode).onchange();") . " };", "")
 				. "($column)" : $column) . "</div>\n";
 			$i++;
 		}
@@ -328,21 +392,27 @@ focus(document.getElementById('username'));
 		print_fieldset("search", lang('Search'), $where);
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT") {
-				echo "(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST";
-				echo " <input type='search' name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "' onchange='selectFieldChange(this.form);'>";
+				echo "<div>(<i>" . implode("</i>, <i>", array_map('h', $index["columns"])) . "</i>) AGAINST";
+				echo " <input type='search' name='fulltext[$i]' value='" . h($_GET["fulltext"][$i]) . "'>";
+				echo script("qsl('input').oninput = selectFieldChange;", "");
 				echo checkbox("boolean[$i]", 1, isset($_GET["boolean"][$i]), "BOOL");
-				echo "<br>\n";
+				echo "</div>\n";
 			}
 		}
-		$_GET["where"] = (array) $_GET["where"];
-		reset($_GET["where"]);
-		$change_next = "this.nextSibling.onchange();";
-		for ($i = 0; $i <= count($_GET["where"]); $i++) {
-			list(, $val) = each($_GET["where"]);
+		$change_next = "this.parentNode.firstChild.onchange();";
+		foreach (array_merge((array) $_GET["where"], array(array())) as $i => $val) {
 			if (!$val || ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators))) {
-				echo "<div>" . select_input(" name='where[$i][col]' onchange='$change_next'", $columns, $val["col"], "(" . lang('anywhere') . ")");
+				echo "<div>" . select_input(
+					" name='where[$i][col]'",
+					$columns,
+					$val["col"],
+					($val ? "selectFieldChange" : "selectAddRow"),
+					"(" . lang('anywhere') . ")"
+				);
 				echo html_select("where[$i][op]", $this->operators, $val["op"], $change_next);
-				echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "' onchange='" . ($val ? "selectFieldChange(this.form)" : "selectAddRow(this)") . ";' onkeydown='selectSearchKeydown(this, event);' onsearch='selectSearchSearch(this);'></div>\n";
+				echo "<input type='search' name='where[$i][val]' value='" . h($val["val"]) . "'>";
+				echo script("mixin(qsl('input'), {oninput: function () { $change_next }, onkeydown: selectSearchKeydown, onsearch: selectSearchSearch});", "");
+				echo "</div>\n";
 			}
 		}
 		echo "</div></fieldset>\n";
@@ -359,12 +429,12 @@ focus(document.getElementById('username'));
 		$i = 0;
 		foreach ((array) $_GET["order"] as $key => $val) {
 			if ($val != "") {
-				echo "<div>" . select_input(" name='order[$i]' onchange='selectFieldChange(this.form);'", $columns, $val);
+				echo "<div>" . select_input(" name='order[$i]'", $columns, $val, "selectFieldChange");
 				echo checkbox("desc[$i]", 1, isset($_GET["desc"][$key]), lang('descending')) . "</div>\n";
 				$i++;
 			}
 		}
-		echo "<div>" . select_input(" name='order[$i]' onchange='selectAddRow(this);'", $columns);
+		echo "<div>" . select_input(" name='order[$i]'", $columns, "", "selectAddRow");
 		echo checkbox("desc[$i]", 1, false, lang('descending')) . "</div>\n";
 		echo "</div></fieldset>\n";
 	}
@@ -375,7 +445,8 @@ focus(document.getElementById('username'));
 	*/
 	function selectLimitPrint($limit) {
 		echo "<fieldset><legend>" . lang('Limit') . "</legend><div>"; // <div> for easy styling
-		echo "<input type='number' name='limit' class='size' value='" . h($limit) . "' onchange='selectFieldChange(this.form);'>";
+		echo "<input type='number' name='limit' class='size' value='" . h($limit) . "'>";
+		echo script("qsl('input').oninput = selectFieldChange;", "");
 		echo "</div></fieldset>\n";
 	}
 
@@ -399,7 +470,7 @@ focus(document.getElementById('username'));
 		echo "<fieldset><legend>" . lang('Action') . "</legend><div>";
 		echo "<input type='submit' value='" . lang('Select') . "'>";
 		echo " <span id='noindex' title='" . lang('Full table scan') . "'></span>";
-		echo "<script type='text/javascript'>\n";
+		echo "<script" . nonce() . ">\n";
 		echo "var indexColumns = ";
 		$columns = array();
 		foreach ($indexes as $index) {
@@ -413,11 +484,11 @@ focus(document.getElementById('username'));
 			json_row($key);
 		}
 		echo ";\n";
-		echo "selectFieldChange(document.getElementById('form'));\n";
+		echo "selectFieldChange.call(qs('#form')['select']);\n";
 		echo "</script>\n";
 		echo "</div></fieldset>\n";
 	}
-
+	
 	/** Print command box in select
 	* @return bool whether to print default commands
 	*/
@@ -466,15 +537,16 @@ focus(document.getElementById('username'));
 	* @return array expressions to join by AND
 	*/
 	function selectSearchProcess($fields, $indexes) {
-		global $connection, $jush;
+		global $connection, $driver;
 		$return = array();
 		foreach ($indexes as $i => $index) {
 			if ($index["type"] == "FULLTEXT" && $_GET["fulltext"][$i] != "") {
 				$return[] = "MATCH (" . implode(", ", array_map('idf_escape', $index["columns"])) . ") AGAINST (" . q($_GET["fulltext"][$i]) . (isset($_GET["boolean"][$i]) ? " IN BOOLEAN MODE" : "") . ")";
 			}
 		}
-		foreach ((array) $_GET["where"] as $val) {
+		foreach ((array) $_GET["where"] as $key => $val) {
 			if ("$val[col]$val[val]" != "" && in_array($val["op"], $this->operators)) {
+				$prefix = "";
 				$cond = " $val[op]";
 				if (preg_match('~IN$~', $val["op"])) {
 					$in = process_length($val["val"]);
@@ -485,24 +557,27 @@ focus(document.getElementById('username'));
 					$cond = " LIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
 				} elseif ($val["op"] == "ILIKE %%") {
 					$cond = " ILIKE " . $this->processInput($fields[$val["col"]], "%$val[val]%");
+				} elseif ($val["op"] == "FIND_IN_SET") {
+					$prefix = "$val[op](" . q($val["val"]) . ", ";
+					$cond = ")";
 				} elseif (!preg_match('~NULL$~', $val["op"])) {
 					$cond .= " " . $this->processInput($fields[$val["col"]], $val["val"]);
 				}
 				if ($val["col"] != "") {
-					$return[] = idf_escape($val["col"]) . $cond;
+					$return[] = $prefix . $driver->convertSearch(idf_escape($val["col"]), $val, $fields[$val["col"]]) . $cond;
 				} else {
 					// find anywhere
 					$cols = array();
 					foreach ($fields as $name => $field) {
-						$is_text = preg_match('~char|text|enum|set~', $field["type"]);
-						if ((is_numeric($val["val"]) || !preg_match('~(^|[^o])int|float|double|decimal|bit~', $field["type"]))
-							&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || $is_text)
+						if (isset($field["privileges"]["where"])
+                            && (preg_match('~^[-\d.' . (preg_match('~IN$~', $val["op"]) ? ',' : '') . ']+$~', $val["val"]) || !preg_match('~' . number_type() . '|bit~', $field["type"]))
+							&& (!preg_match("~[\x80-\xFF]~", $val["val"]) || preg_match('~char|text|enum|set~', $field["type"]))
+							&& (!preg_match('~date|timestamp~', $field["type"]) || preg_match('~^\d+-\d+-\d+~', $val["val"]))
 						) {
-							$name = idf_escape($name);
-							$cols[] = ($jush == "sql" && $is_text && !preg_match("~^utf8_~", $field["collation"]) ? "CONVERT($name USING " . charset($connection) . ")" : $name);
+							$cols[] = $prefix . $driver->convertSearch(idf_escape($name), $val, $field) . $cond;
 						}
 					}
-					$return[] = ($cols ? "(" . implode("$cond OR ", $cols) . "$cond)" : "0");
+					$return[] = ($cols ? "(" . implode(" OR ", $cols) . ")" : "1 = 0");
 				}
 			}
 		}
@@ -518,7 +593,7 @@ focus(document.getElementById('username'));
 		$return = array();
 		foreach ((array) $_GET["order"] as $key => $val) {
 			if ($val != "") {
-				$return[] = (preg_match('~^((COUNT\\(DISTINCT |[A-Z0-9_]+\\()(`(?:[^`]|``)+`|"(?:[^"]|"")+")\\)|COUNT\\(\\*\\))$~', $val) ? $val : idf_escape($val)) //! MS SQL uses []
+				$return[] = (preg_match('~^((COUNT\(DISTINCT |[A-Z0-9_]+\()(`(?:[^`]|``)+`|"(?:[^"]|"")+")\)|COUNT\(\*\))$~', $val) ? $val : idf_escape($val)) //! MS SQL uses []
 					. (isset($_GET["desc"][$key]) ? " DESC" : "")
 				;
 			}
@@ -565,25 +640,44 @@ focus(document.getElementById('username'));
 	/** Query printed after execution in the message
 	* @param string executed query
 	* @param string elapsed time
+	* @param bool
 	* @return string
 	*/
-	function messageQuery($query, $time) {
-		global $jush;
+	function messageQuery($query, $time, $failed = false) {
+		global $jush, $driver;
 		restart_session();
 		$history = &get_session("queries");
-		$id = "sql-" . count($history[$_GET["db"]]);
+		if (!$history[$_GET["db"]]) {
+			$history[$_GET["db"]] = array();
+		}
 		if (strlen($query) > 1e6) {
-			$query = preg_replace('~[\x80-\xFF]+$~', '', substr($query, 0, 1e6)) . "\n..."; // [\x80-\xFF] - valid UTF-8, \n - can end by one-line comment
+			$query = preg_replace('~[\x80-\xFF]+$~', '', substr($query, 0, 1e6)) . "\n…"; // [\x80-\xFF] - valid UTF-8, \n - can end by one-line comment
 		}
 		$history[$_GET["db"]][] = array($query, time(), $time); // not DB - $_GET["db"] is changed in database.inc.php //! respect $_GET["ns"]
-		return " <span class='time'>" . @date("H:i:s") . "</span> <a href='#$id' onclick=\"return !toggle('$id');\">" . lang('SQL command') . "</a>" // @ - time zone may be not set
-			. "<div id='$id' class='hidden'><pre><code class='jush-$jush'>" . shorten_utf8($query, 1000) . '</code></pre>'
+		$sql_id = "sql-" . count($history[$_GET["db"]]);
+		$return = "<a href='#$sql_id' class='toggle'>" . lang('SQL command') . "</a>\n";
+		if (!$failed && ($warnings = $driver->warnings())) {
+			$id = "warnings-" . count($history[$_GET["db"]]);
+			$return = "<a href='#$id' class='toggle'>" . lang('Warnings') . "</a>, $return<div id='$id' class='hidden'>\n$warnings</div>\n";
+		}
+		return " <span class='time'>" . @date("H:i:s") . "</span>" // @ - time zone may be not set
+			. " $return<div id='$sql_id' class='hidden'><pre><code class='jush-$jush'>" . shorten_utf8($query, 1000) . "</code></pre>"
 			. ($time ? " <span class='time'>($time)</span>" : '')
 			. (support("sql") ? '<p><a href="' . h(str_replace("db=" . urlencode(DB), "db=" . urlencode($_GET["db"]), ME) . 'sql=&history=' . (count($history[$_GET["db"]]) - 1)) . '">' . lang('Edit') . '</a>' : '')
 			. '</div>'
 		;
 	}
 
+	/** Print before edit form
+	* @param string
+	* @param array
+	* @param mixed
+	* @param bool
+	* @return null
+	*/
+	function editRowPrint($table, $fields, $row, $update) {
+	}
+
 	/** Functions displayed in edit form
 	* @param array single field from fields()
 	* @return array
@@ -591,19 +685,20 @@ focus(document.getElementById('username'));
 	function editFunctions($field) {
 		global $edit_functions;
 		$return = ($field["null"] ? "NULL/" : "");
+		$update = isset($_GET["select"]) || where($_GET);
 		foreach ($edit_functions as $key => $functions) {
-			if (!$key || (!isset($_GET["call"]) && (isset($_GET["select"]) || where($_GET)))) { // relative functions
+			if (!$key || (!isset($_GET["call"]) && $update)) { // relative functions
 				foreach ($functions as $pattern => $val) {
 					if (!$pattern || preg_match("~$pattern~", $field["type"])) {
 						$return .= "/$val";
 					}
 				}
-				if ($key && !preg_match('~set|blob|bytea|raw|file~', $field["type"])) {
-					$return .= "/SQL";
-				}
+			}
+			if ($key && !preg_match('~set|blob|bytea|raw|file|bool~', $field["type"])) {
+				$return .= "/SQL";
 			}
 		}
-		if ($field["auto_increment"] && !isset($_GET["select"]) && !where($_GET)) {
+		if ($field["auto_increment"] && !$update) {
 			$return = lang('Auto Increment');
 		}
 		return explode("/", $return);
@@ -626,6 +721,16 @@ focus(document.getElementById('username'));
 		return "";
 	}
 
+	/** Get hint for edit field
+	* @param string table name
+	* @param array single field from fields()
+	* @param string
+	* @return string
+	*/
+	function editHint($table, $field, $value) {
+		return "";
+	}
+
 	/** Process sent input
 	* @param array single field from fields()
 	* @param string
@@ -642,10 +747,10 @@ focus(document.getElementById('username'));
 			$return = "$function()";
 		} elseif (preg_match('~^current_(date|timestamp)$~', $function)) {
 			$return = $function;
-		} elseif (preg_match('~^([+-]|\\|\\|)$~', $function)) {
+		} elseif (preg_match('~^([+-]|\|\|)$~', $function)) {
 			$return = idf_escape($name) . " $function $return";
 		} elseif (preg_match('~^[+-] interval$~', $function)) {
-			$return = idf_escape($name) . " $function " . (preg_match("~^(\\d+|'[0-9.: -]') [A-Z_]+$~i", $value) ? $value : $return);
+			$return = idf_escape($name) . " $function " . (preg_match("~^(\\d+|'[0-9.: -]') [A-Z_]+\$~i", $value) ? $value : $return);
 		} elseif (preg_match('~^(addtime|subtime|concat)$~', $function)) {
 			$return = "$function(" . idf_escape($name) . ", $return)";
 		} elseif (preg_match('~^(md5|sha1|password|encrypt)$~', $function)) {
@@ -658,10 +763,11 @@ focus(document.getElementById('username'));
 	* @return array
 	*/
 	function dumpOutput() {
-		$return = array('text' => lang('open'), 'file' => lang('save'));
+		$return = array('file' => lang('save'), 'text' => lang('open'));
 		if (function_exists('gzencode')) {
 			$return['gz'] = 'gzip';
 		}
+
 		return $return;
 	}
 
@@ -699,7 +805,7 @@ focus(document.getElementById('username'));
 				}
 				$create = "CREATE TABLE " . table($table) . " (" . implode(", ", $fields) . ")";
 			} else {
-				$create = create_sql($table, $_POST["auto_increment"]);
+				$create = create_sql($table, $_POST["auto_increment"], $style);
 			}
 			set_utf8mb4($create);
 			if ($style && $create) {
@@ -735,6 +841,7 @@ focus(document.getElementById('username'));
 				$insert = "";
 				$buffer = "";
 				$keys = array();
+				$generatedKeys = array();
 				$suffix = "";
 				$fetch_function = ($table != '' ? 'fetch_assoc' : 'fetch_row');
 				while ($row = $result->$fetch_function()) {
@@ -742,6 +849,10 @@ focus(document.getElementById('username'));
 						$values = array();
 						foreach ($row as $val) {
 							$field = $result->fetch_field();
+							if (!empty($fields[$field->name]['generated'])) {
+								$generatedKeys[$field->name] = true;
+								continue;
+                            }
 							$keys[] = $field->name;
 							$key = idf_escape($field->name);
 							$values[] = "$key = VALUES($key)";
@@ -759,9 +870,13 @@ focus(document.getElementById('username'));
 							$insert = "INSERT INTO " . table($table) . " (" . implode(", ", array_map('idf_escape', $keys)) . ") VALUES";
 						}
 						foreach ($row as $key => $val) {
+							if (isset($generatedKeys[$key])) {
+								unset($row[$key]);
+								continue;
+                            }
 							$field = $fields[$key];
 							$row[$key] = ($val !== null
-								? unconvert_field($field, preg_match('~(^|[^o])int|float|double|decimal~', $field["type"]) && $val != '' ? $val : q($val))
+								? unconvert_field($field, preg_match(number_type(), $field["type"]) && !preg_match('~\[~', $field["full_type"]) && is_numeric($val) ? $val : q(($val === false ? 0 : $val)))
 								: "NULL"
 							);
 						}
@@ -812,6 +927,13 @@ focus(document.getElementById('username'));
 		return $ext;
 	}
 
+	/** Set the path of the file for webserver load
+	* @return string path of the sql dump file
+	*/
+	function importServerPath() {
+		return "adminer.sql";
+	}
+
 	/** Print homepage
 	* @return bool whether to print default homepage
 	*/
@@ -831,43 +953,44 @@ focus(document.getElementById('username'));
 		global $VERSION, $jush, $drivers, $connection;
 		?>
 <h1>
-<?php echo $this->name(); ?> <span class="version"><?php echo $VERSION; ?></span>
-<a href="https://www.adminer.org/#download" target="_blank" id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
+    <?php echo $this->name(); ?>
+    <?php if ($missing != "auth"): ?>
+    <span class="version"><?php echo $VERSION; ?></span>
+    <a href="https://www.adminer.org/#download"<?php echo target_blank(); ?> id="version"><?php echo (version_compare($VERSION, $_COOKIE["adminer_version"]) < 0 ? h($_COOKIE["adminer_version"]) : ""); ?></a>
+    <?php endif; ?>
 </h1>
 <?php
 		if ($missing == "auth") {
-			$first = true;
+			$output = "";
 			foreach ((array) $_SESSION["pwds"] as $vendor => $servers) {
 				foreach ($servers as $server => $usernames) {
 					foreach ($usernames as $username => $password) {
 						if ($password !== null) {
-							if ($first) {
-								echo "<p id='logins' onmouseover='menuOver(this, event);' onmouseout='menuOut(this);'>\n";
-								$first = false;
-							}
 							$dbs = $_SESSION["db"][$vendor][$server][$username];
 							foreach (($dbs ? array_keys($dbs) : array("")) as $db) {
-								echo "<a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>($drivers[$vendor]) " . h($username . ($server != "" ? "@$server" : "") . ($db != "" ? " - $db" : "")) . "</a><br>\n";
+								$output .= "<li><a href='" . h(auth_url($vendor, $server, $username, $db)) . "'>($drivers[$vendor]) " . h($username . ($server != "" ? "@" . $this->serverName($server) : "") . ($db != "" ? " - $db" : "")) . "</a>\n";
 							}
 						}
 					}
 				}
 			}
+			if ($output) {
+				echo "<ul id='logins'>\n$output</ul>\n" . script("mixin(qs('#logins'), {onmouseover: menuOver, onmouseout: menuOut});");
+			}
 		} else {
+			$tables = array();
 			if ($_GET["ns"] !== "" && !$missing && DB != "") {
 				$connection->select_db(DB);
 				$tables = table_status('', true);
 			}
-			?>
-<script type="text/javascript" src="../externals/jush/modules/jush.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush-textarea.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush-txt.js"></script>
-<script type="text/javascript" src="../externals/jush/modules/jush-js.js"></script>
-<?php
+			echo script_src("../vendor/vrana/jush/modules/jush.js");
+			echo script_src("../vendor/vrana/jush/modules/jush-textarea.js");
+			echo script_src("../vendor/vrana/jush/modules/jush-txt.js");
+			echo script_src("../vendor/vrana/jush/modules/jush-js.js");
 			if (support("sql")) {
+				echo script_src("../vendor/vrana/jush/modules/jush-$jush.js");
 				?>
-<script type="text/javascript" src="../externals/jush/modules/jush-<?php echo $jush; ?>.js"></script>
-<script type="text/javascript">
+<script<?php echo nonce(); ?>>
 <?php
 				if ($tables) {
 					$links = array();
@@ -879,8 +1002,9 @@ focus(document.getElementById('username'));
 						echo "jushLinks.$val = jushLinks.$jush;\n";
 					}
 				}
+				$server_info = $connection->server_info;
 				?>
-bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info, 0, 3) : ""); ?>');
+bodyLoad('<?php echo (is_object($connection) ? preg_replace('~^(\d\.?\d).*~s', '\1', $server_info) : ""); ?>'<?php echo (preg_match('~MariaDB~', $server_info) ? ", true" : ""); ?>);
 </script>
 <?php
 			}
@@ -909,30 +1033,34 @@ bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info,
 	function databasesPrint($missing) {
 		global $adminer, $connection;
 		$databases = $this->databases();
+		if (DB && $databases && !in_array(DB, $databases)) {
+			array_unshift($databases, DB);
+		}
 		?>
 <form action="">
 <p id="dbs">
 <?php
 		hidden_fields_get();
-		$db_events = " onmousedown='dbMouseDown(event, this);' onchange='dbChange(this);'";
-		echo "<span title='" . lang('database') . "'>DB</span>: " . ($databases
-			? "<select name='db'$db_events>" . optionlist(array("" => "") + $databases, DB) . "</select>"
-			: '<input name="db" value="' . h(DB) . '" autocapitalize="off">'
+		$db_events = script("mixin(qsl('select'), {onmousedown: dbMouseDown, onchange: dbChange});");
+		echo "<span title='" . lang('database') . "'>" . lang('DB') . "</span>: " . ($databases
+			? "<select name='db'>" . optionlist(array("" => "") + $databases, DB) . "</select>$db_events"
+			: "<input name='db' value='" . h(DB) . "' autocapitalize='off'>\n"
 		);
 		echo "<input type='submit' value='" . lang('Use') . "'" . ($databases ? " class='hidden'" : "") . ">\n";
-		if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
-			if (support("scheme")) {
-				echo "<br>" . lang('Schema') . ": <select name='ns'$db_events>" . optionlist(array("" => "") + $adminer->schemas(), $_GET["ns"]) . "</select>";
+		if (support("scheme")) {
+			if ($missing != "db" && DB != "" && $connection->select_db(DB)) {
+				echo "<br>" . lang('Schema') . ": <select name='ns'>" . optionlist(array("" => "") + $adminer->schemas(), $_GET["ns"]) . "</select>$db_events";
 				if ($_GET["ns"] != "") {
 					set_schema($_GET["ns"]);
 				}
 			}
 		}
-		echo (isset($_GET["sql"]) ? '<input type="hidden" name="sql" value="">'
-			: (isset($_GET["schema"]) ? '<input type="hidden" name="schema" value="">'
-			: (isset($_GET["dump"]) ? '<input type="hidden" name="dump" value="">'
-			: (isset($_GET["privileges"]) ? '<input type="hidden" name="privileges" value="">'
-		: ""))));
+		foreach (array("import", "sql", "schema", "dump", "privileges") as $val) {
+			if (isset($_GET[$val])) {
+				echo "<input type='hidden' name='$val' value=''>";
+				break;
+			}
+		}
 		echo "</p></form>\n";
 	}
 
@@ -941,23 +1069,23 @@ bodyLoad('<?php echo (is_object($connection) ? substr($connection->server_info,
 	* @return null
 	*/
 	function tablesPrint($tables) {
-		echo "<ul id='tables' onmouseover='menuOver(this, event);' onmouseout='menuOut(this);'>\n";
+		echo "<ul id='tables'>" . script("mixin(qs('#tables'), {onmouseover: menuOver, onmouseout: menuOut});");
 		foreach ($tables as $table => $status) {
-			echo '<li><a href="' . h(ME) . 'select=' . urlencode($table) . '"' . bold($_GET["select"] == $table || $_GET["edit"] == $table, "select") . ">" . lang('select') . "</a> ";
 			$name = $this->tableName($status);
-			echo (support("table") || support("indexes")
-				? '<a href="' . h(ME) . 'table=' . urlencode($table) . '"'
-					. bold(in_array($table, array($_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"])), (is_view($status) ? "view" : "structure"))
-					. " title='" . lang('Show structure') . "'>$name</a>"
-				: "<span>$name</span>"
-			) . "\n";
+			if ($name != "") {
+				echo '<li><a href="' . h(ME) . 'select=' . urlencode($table) . '"'
+					. bold($_GET["select"] == $table || $_GET["edit"] == $table, "select")
+					. " title='" . lang('Select data') . "'>" . lang('select') . "</a> "
+				;
+				echo (support("table") || support("indexes")
+					? '<a href="' . h(ME) . 'table=' . urlencode($table) . '"'
+						. bold(in_array($table, array($_GET["table"], $_GET["create"], $_GET["indexes"], $_GET["foreign"], $_GET["trigger"])), (is_view($status) ? "view" : "structure"))
+						. " title='" . lang('Show structure') . "'>$name</a>"
+					: "<span>$name</span>"
+				) . "\n";
+			}
 		}
 		echo "</ul>\n";
 	}
 
 }
-
-$adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);
-if ($adminer->operators === null) {
-	$adminer->operators = $operators;
-}

adminer/include/auth.inc.php

@@ -15,17 +15,77 @@ if ($_COOKIE["adminer_permanent"]) {
 	}
 }
 
+function validate_server_input() {
+	if (SERVER == "") {
+		return;
+	}
+
+	$parts = parse_url(SERVER);
+	if (!$parts) {
+		auth_error(lang('Invalid server or credentials.'));
+	}
+
+	// Check proper URL parts.
+	if (isset($parts['user']) || isset($parts['pass']) || isset($parts['query']) || isset($parts['fragment'])) {
+		auth_error(lang('Invalid server or credentials.'));
+	}
+
+	// Allow only HTTP/S scheme.
+	if (isset($parts['scheme']) && !preg_match('~^(https?)$~i', $parts['scheme'])) {
+		auth_error(lang('Invalid server or credentials.'));
+	}
+
+	// Note that "localhost" and IP address without a scheme is parsed as a path.
+	$hostPath = (isset($parts['host']) ? $parts['host'] : '') . (isset($parts['path']) ? $parts['path'] : '');
+
+	// Validate host.
+	if (!is_server_host_valid($hostPath)) {
+		auth_error(lang('Invalid server or credentials.'));
+	}
+
+	// Check privileged ports.
+	if (isset($parts['port']) && ($parts['port'] < 1024 || $parts['port'] > 65535)) {
+		auth_error(lang('Connecting to privileged ports is not allowed.'));
+	}
+}
+
+if (!function_exists('is_server_host_valid')) {
+	/**
+	 * @param string $hostPath
+	 * @return bool
+	 */
+	function is_server_host_valid($hostPath)
+	{
+		return strpos($hostPath, '/') === false;
+	}
+}
+
+/**
+ * @param string $server
+ * @param string $username
+ * @param string $password
+ * @param string $defaultServer
+ * @param int|null $defaultPort
+ * @return string
+ */
+function build_http_url($server, $username, $password, $defaultServer, $defaultPort = null) {
+	if (!preg_match('~^(https?://)?([^:]*)(:\d+)?$~', rtrim($server, '/'), $matches)) {
+		$this->error = lang('Invalid server or credentials.');
+		return false;
+	}
+
+	return ($matches[1] ?: "http://") .
+		($username !== "" || $password !== "" ? "$username:$password@" : "") .
+		($matches[2] !== "" ? $matches[2] : $defaultServer) .
+		(isset($matches[3]) ? $matches[3] : ($defaultPort ? ":$defaultPort" : ""));
+}
+
 function add_invalid_login() {
 	global $adminer;
-	$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;
-		}
+	$fp = file_open_lock(get_temp_dir() . "/adminer.invalid");
+	if (!$fp) {
+		return;
 	}
-	flock($fp, LOCK_EX);
 	$invalids = unserialize(stream_get_contents($fp));
 	$time = time();
 	if ($invalids) {
@@ -40,25 +100,24 @@ function add_invalid_login() {
 		$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);
+	file_write_unlock($fp, serialize($invalids));
+}
+
+function check_invalid_login() {
+	global $adminer;
+	$invalids = unserialize(@file_get_contents(get_temp_dir() . "/adminer.invalid")); // @ - may not exist
+	$invalid = ($invalids ? $invalids[$adminer->bruteForceKey()] : array());
+	$next_attempt = ($invalid[1] > 29 ? $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)));
+	}
 }
 
 $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
 	$vendor = $auth["driver"];
-	$server = $auth["server"];
+	$server = trim($auth["server"]);
 	$username = $auth["username"];
 	$password = (string) $auth["password"];
 	$db = $auth["db"];
@@ -78,20 +137,14 @@ if ($auth) {
 	) {
 		redirect(auth_url($vendor, $server, $username, $db));
 	}
-	
-} elseif ($_POST["logout"]) {
-	if ($has_token && !verify_token()) {
-		page_header(lang('Logout'), lang('Invalid CSRF token. Send the form again.'));
-		page_footer("db");
-		exit;
-	} else {
-		foreach (array("pwds", "db", "dbs", "queries") as $key) {
-			set_session($key, null);
-		}
-		unset_permanent();
-		redirect(substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1), lang('Logout successful.'));
+
+} elseif ($_POST["logout"] && (!$has_token || verify_token())) {
+	foreach (array("pwds", "db", "dbs", "queries") as $key) {
+		set_session($key, null);
 	}
-	
+	unset_permanent();
+	redirect(substr(preg_replace('~\b(username|db|ns)=[^&]*&~', '', ME), 0, -1), lang('Logout successful.') . ' ' . lang('Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.'));
+
 } elseif ($permanent && !$_SESSION["pwds"]) {
 	session_regenerate_id();
 	$private = $adminer->permanentLogin();
@@ -126,11 +179,12 @@ function auth_error($error) {
 		if (($_COOKIE[$session_name] || $_GET[$session_name]) && !$has_token) {
 			$error = lang('Session expired, please login again.');
 		} else {
+			restart_session();
 			add_invalid_login();
 			$password = get_password();
 			if ($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>');
+					$error .= ($error ? '<br>' : '') . lang('Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.', target_blank(), '<code>permanentLogin()</code>');
 				}
 				set_password(DRIVER, SERVER, $_GET["username"], null);
 			}
@@ -144,30 +198,45 @@ function auth_error($error) {
 	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();
 	echo "<div>";
-	hidden_fields($_POST, array("auth")); // expired session
+	if (hidden_fields($_POST, array("auth"))) { // expired session
+		echo "<p class='message'>" . lang('The action will be performed after successful login with the same credentials.') . "\n";
+	}
 	echo "</div>\n";
+	$adminer->loginForm();
 	echo "</form>\n";
 	page_footer("auth");
 	exit;
 }
 
-if (isset($_GET["username"])) {
-	if (!class_exists("Min_DB")) {
-		unset($_SESSION["pwds"][DRIVER]);
-		unset_permanent();
-		page_header(lang('No extension'), lang('None of the supported PHP extensions (%s) are available.', implode(", ", $possible_drivers)), false);
-		page_footer("auth");
-		exit;
-	}
-	$connection = connect();
+if (isset($_GET["username"]) && !class_exists("Min_DB")) {
+	unset($_SESSION["pwds"][DRIVER]);
+	unset_permanent();
+	page_header(lang('No extension'), lang('None of the supported PHP extensions (%s) are available.', implode(", ", $possible_drivers)), false);
+	page_footer("auth");
+	exit;
 }
 
-$driver = new Min_Driver($connection);
+stop_session(true);
 
+if (isset($_GET["username"]) && is_string(get_password())) {
+	validate_server_input();
+	check_invalid_login();
+
+	$connection = connect();
+	$driver = new Min_Driver($connection);
+}
+
+$login = null;
 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.'))));
+	$error = (is_string($connection) ? h($connection) : (is_string($login) ? $login : lang('Invalid server or credentials.')));
+	auth_error($error . (preg_match('~^ | $~', get_password()) ? '<br>' . lang('There is a space in the input password which might be the cause.') : ''));
+}
+
+if ($_POST["logout"] && $has_token && !verify_token()) {
+	page_header(lang('Logout'), lang('Invalid CSRF token. Send the form again.'));
+	page_footer("db");
+	exit;
 }
 
 if ($auth && $_POST["token"]) {
@@ -193,7 +262,7 @@ if ($_POST) {
 			: lang('Invalid CSRF token. Send the form again.') . ' ' . lang('If you did not send this request from Adminer then close this page.')
 		);
 	}
-	
+
 } elseif ($_SERVER["REQUEST_METHOD"] == "POST") {
 	// posted form with no data means that post_max_size exceeded because Adminer always sends token at least
 	$error = lang('Too big POST data. Reduce the data or increase the %s configuration directive.', "'post_max_size'");

adminer/include/bootstrap.inc.php

@@ -1,5 +1,10 @@
 <?php
+function adminer_errors($errno, $errstr) {
+	return (bool)preg_match('~^(Trying to access array offset on( value of type)? null|Undefined array key)~', $errstr);
+}
+
 error_reporting(6135); // errors and warnings
+set_error_handler('adminer_errors', E_WARNING);
 
 include "../adminer/include/coverage.inc.php";
 
@@ -18,14 +23,22 @@ if (function_exists("mb_internal_encoding")) {
 	mb_internal_encoding("8bit");
 }
 
+include "../adminer/include/functions.inc.php";
+
 // used only in compiled file
 if (isset($_GET["file"])) {
 	include "../adminer/file.inc.php";
 }
 
-include "../adminer/include/functions.inc.php";
+if ($_GET["script"] == "version") {
+	$fp = file_open_lock(get_temp_dir() . "/adminer.version");
+	if ($fp) {
+		file_write_unlock($fp, serialize(array("signature" => $_POST["signature"], "version" => $_POST["version"])));
+	}
+	exit;
+}
 
-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
+global $adminer, $connection, $driver, $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"];
@@ -33,13 +46,16 @@ if (!$_SERVER["REQUEST_URI"]) { // IIS 5 compatibility
 if (!strpos($_SERVER["REQUEST_URI"], '?') && $_SERVER["QUERY_STRING"] != "") { // IIS 7 compatibility
 	$_SERVER["REQUEST_URI"] .= "?$_SERVER[QUERY_STRING]";
 }
-$HTTPS = $_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off");
+if ($_SERVER["HTTP_X_FORWARDED_PREFIX"]) {
+	$_SERVER["REQUEST_URI"] = $_SERVER["HTTP_X_FORWARDED_PREFIX"] . $_SERVER["REQUEST_URI"];
+}
+$HTTPS = ($_SERVER["HTTPS"] && strcasecmp($_SERVER["HTTPS"], "off")) || ini_bool("session.cookie_secure"); // session.cookie_secure could be set on HTTP if we are behind a reverse proxy
 
 @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_cache_limiter(""); // to allow restarting session
 	session_name("adminer_sid"); // use specific session name to get own namespace
-	$params = array(0, preg_replace('~\\?.*~', '', $_SERVER["REQUEST_URI"]), "", $HTTPS);
+	$params = array(0, preg_replace('~\?.*~', '', $_SERVER["REQUEST_URI"]), "", $HTTPS);
 	if (version_compare(PHP_VERSION, '5.2.0') >= 0) {
 		$params[] = true; // HttpOnly
 	}
@@ -49,12 +65,12 @@ if (!defined("SID")) {
 
 // disable magic quotes to be able to use database escaping function
 remove_slashes(array(&$_GET, &$_POST, &$_COOKIE), $filter);
-if (get_magic_quotes_runtime()) {
+if (function_exists("get_magic_quotes_runtime") && get_magic_quotes_runtime()) {
 	set_magic_quotes_runtime(false);
 }
 @set_time_limit(0); // @ - can be disabled
 @ini_set("zend.ze1_compatibility_mode", false); // @ - deprecated
-@ini_set("precision", 20); // @ - can be disabled
+@ini_set("precision", 15); // @ - can be disabled, 15 - internal PHP precision
 
 include "../adminer/include/lang.inc.php";
 include "../adminer/lang/$LANG.inc.php";
@@ -64,15 +80,28 @@ 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 "./include/adminer.inc.php";
+$adminer = (function_exists('adminer_object') ? adminer_object() : new Adminer);
 include "../adminer/drivers/mysql.inc.php"; // must be included as last driver
 
+$config = driver_config();
+$possible_drivers = $config['possible_drivers'];
+$jush = $config['jush'];
+$types = $config['types'];
+$structured_types = $config['structured_types'];
+$unsigned = $config['unsigned'];
+$operators = $config['operators'];
+$functions = $config['functions'];
+$grouping = $config['grouping'];
+$edit_functions = $config['edit_functions'];
+if ($adminer->operators === null) {
+	$adminer->operators = $operators;
+}
+
 define("SERVER", $_GET[DRIVER]); // read from pgsql=localhost
 define("DB", $_GET["db"]); // for the sake of speed and size
-define("ME", preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"]) . '?'
+define("ME", preg_replace('~\?.*~', '', relative_uri()) . '?'
 	. (sid() ? SID . '&' : '')
 	. (SERVER !== null ? DRIVER . "=" . urlencode(SERVER) . '&' : '')
 	. (isset($_GET["username"]) ? "username=" . urlencode($_GET["username"]) . '&' : '')
@@ -80,15 +109,9 @@ define("ME", preg_replace('~^[^?]*/([^?]*).*~', '\\1', $_SERVER["REQUEST_URI"])
 );
 
 include "../adminer/include/version.inc.php";
-include "./include/adminer.inc.php";
 include "../adminer/include/design.inc.php";
 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_write_close(); // improves concurrency if a user opens several pages at once, may be restarted later
-}
-
 include "./include/editing.inc.php";
 include "./include/connect.inc.php";
 

adminer/include/connect.inc.php

@@ -17,7 +17,6 @@ function connect_error() {
 			'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";
@@ -30,13 +29,14 @@ function connect_error() {
 			$scheme = support("scheme");
 			$collations = collations();
 			echo "<form action='' method='post'>\n";
-			echo "<table cellspacing='0' class='checkable' onclick='tableClick(event);' ondblclick='tableClick(event, true);'>\n";
+			echo "<table cellspacing='0' class='checkable'>\n";
+			echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
 			echo "<thead><tr>"
-				. (support("database") ? "<td>&nbsp;" : "")
+				. (support("database") ? "<td>" : "")
 				. "<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>"
+				. "<td>" . lang('Size') . " - <a href='" . h(ME) . "dbsize=1'>" . lang('Compute') . "</a>" . script("qsl('a').onclick = partial(ajaxSetHtml, '" . js_escape(ME) . "script=connect');", "")
 				. "</thead>\n"
 			;
 			
@@ -46,8 +46,8 @@ function connect_error() {
 				$root = h(ME) . "db=" . urlencode($db);
 				$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 "<th><a href='$root' id='$id'>" . h($db) . "</a>";
+				$collation = h(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) : "?");
@@ -56,15 +56,17 @@ function connect_error() {
 			
 			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 class='footer'><div>\n"
+					. "<fieldset><legend>" . lang('Selected') . " <span id='selected'></span></legend><div>\n"
+					. "<input type='hidden' name='all' value=''>" . script("qsl('input').onclick = function () { selectCount('selected', formChecked(this, /^db/)); };") // used by trCheck()
+					. "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . confirm() . "\n"
 					. "</div></fieldset>\n"
+					. "</div></div>\n"
 				: ""
 			);
-			echo "<script type='text/javascript'>tableCheck();</script>\n";
 			echo "<input type='hidden' name='token' value='$token'>\n";
 			echo "</form>\n";
+			echo script("tableCheck();");
 		}
 	}
 	
@@ -78,7 +80,7 @@ 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 != "" ? $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 (DB != "" || $_GET["refresh"]) {
 		restart_session();
 		set_session("dbs", null);
@@ -87,14 +89,16 @@ if (!(DB != "" ? $connection->select_db(DB) : isset($_GET["sql"]) || isset($_GET
 	exit;
 }
 
-if (support("scheme") && DB != "" && $_GET["ns"] !== "") {
-	if (!isset($_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;
+if (support("scheme")) {
+	if (DB != "" && $_GET["ns"] !== "") {
+		if (!isset($_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

@@ -19,28 +19,50 @@ function page_header($title, $error = "", $breadcrumb = array(), $title2 = "") {
 <!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 echo script_src("../adminer/static/functions.js"); ?>
+<?php echo script_src("static/editing.js"); ?>
 <?php if ($adminer->head()) { ?>
 <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 foreach ($adminer->css() as $css) { ?>
+<link rel="stylesheet" type="text/css" href="<?php echo h($css); ?>">
 <?php } ?>
 <?php } ?>
 
-<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">
+<body class="<?php echo lang('ltr'); ?> nojs">
+<?php
+	$filename = get_temp_dir() . "/adminer.version";
+	if (!$_COOKIE["adminer_version"] && function_exists('openssl_verify') && file_exists($filename) && filemtime($filename) + 86400 > time()) { // 86400 - 1 day in seconds
+		$version = unserialize(file_get_contents($filename));
+		$public = "-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwqWOVuF5uw7/+Z70djoK
+RlHIZFZPO0uYRezq90+7Amk+FDNd7KkL5eDve+vHRJBLAszF/7XKXe11xwliIsFs
+DFWQlsABVZB3oisKCBEuI71J4kPH8dKGEWR9jDHFw3cWmoH3PmqImX6FISWbG3B8
+h7FIx3jEaw5ckVPVTeo5JRm/1DZzJxjyDenXvBQ/6o9DgZKeNDgxwKzH+sw9/YCO
+jHnq1cFpOIISzARlrHMa/43YfeNRAm/tsBXjSxembBPo7aQZLAWHmaj5+K19H10B
+nCpz9Y++cipkVEiKRGih4ZEvjoFysEOdRLj6WiD/uUNky4xGeA6LaJqh5XpkFkcQ
+fQIDAQAB
+-----END PUBLIC KEY-----
+";
+		if (openssl_verify($version["version"], base64_decode($version["signature"]), $public) == 1) {
+			$_COOKIE["adminer_version"] = $version["version"]; // doesn't need to send to the browser
+		}
+	}
+	?>
+<script<?php echo nonce(); ?>>
+mixin(document.body, {onkeydown: bodyKeydown, onclick: bodyClick<?php
+	echo (isset($_COOKIE["adminer_version"]) ? "" : ", onload: partial(verifyVersion, '$VERSION', '" . js_escape(ME) . "', '" . get_token() . "')"); // $token may be empty in auth.inc.php
+	?>});
 document.body.className = document.body.className.replace(/ nojs/, ' js');
 var offlineMessage = '<?php echo js_escape(lang('You are offline.')); ?>';
+var thousandsSeparator = '<?php echo js_escape(lang(',')); ?>';
 </script>
 
-<div id="help" class="jush-<?php echo $jush; ?> jsonly hidden" onmouseover="helpOpen = 1;" onmouseout="helpMouseout(this, event);"></div>
+<div id="help" class="jush-<?php echo $jush; ?> jsonly hidden"></div>
+<?php echo script("mixin(qs('#help'), {onmouseover: function () { helpOpen = 1; }, onmouseout: helpMouseout});"); ?>
 
 <div id="content">
 <?php
@@ -48,11 +70,12 @@ var offlineMessage = '<?php echo js_escape(lang('You are offline.')); ?>';
 		$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('~\b(db|ns)=[^&]*&~', '', ME), 0, -1);
-		$server = (SERVER != "" ? h(SERVER) : lang('Server'));
+		$server = $adminer->serverName(SERVER);
+		$server = ($server != "" ? $server : lang('Server'));
 		if ($breadcrumb === false) {
 			echo "$server\n";
 		} else {
-			echo "<a href='" . ($link ? h($link) : ".") . "' accesskey='1' title='Alt+Shift+1'>$server</a> &raquo; ";
+			echo "<a href='" . h($link) . "' accesskey='1' title='Alt+Shift+1'>$server</a> &raquo; ";
 			if ($_GET["ns"] != "" || (DB != "" && is_array($breadcrumb))) {
 				echo '<a href="' . h($link . "&db=" . urlencode(DB) . (support("scheme") ? "&ns=" : "")) . '">' . h(DB) . '</a> &raquo; ';
 			}
@@ -89,10 +112,45 @@ 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
+	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
+	header("X-Content-Type-Options: nosniff");
+	header("Referrer-Policy: origin-when-cross-origin");
+	foreach ($adminer->csp() as $csp) {
+		$header = array();
+		foreach ($csp as $key => $val) {
+			$header[] = "$key $val";
+		}
+		header("Content-Security-Policy: " . implode("; ", $header));
 	}
+	$adminer->headers();
+}
+
+/** Get Content Security Policy headers
+* @return array of arrays with directive name in key, allowed sources in value
+*/
+function csp() {
+	return array(
+		array(
+			"script-src" => "'self' 'unsafe-inline' 'nonce-" . get_nonce() . "' 'strict-dynamic'", // 'self' is a fallback for browsers not supporting 'strict-dynamic', 'unsafe-inline' is a fallback for browsers not supporting 'nonce-'
+			"connect-src" => "'self'",
+			"frame-src" => "https://www.adminer.org",
+			"object-src" => "'none'",
+			"base-uri" => "'none'",
+			"form-action" => "'self'",
+		),
+	);
+}
+
+/** Get a CSP nonce
+* @return string Base64 value
+*/
+function get_nonce() {
+	static $nonce;
+	if (!$nonce) {
+		$nonce = base64_encode(rand_string());
+	}
+	return $nonce;
 }
 
 /** Print flash and error messages
@@ -103,7 +161,7 @@ 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";
+		echo "<div class='message'>" . implode("</div>\n<div class='message'>", $messages) . "</div>" . script("messagesPrint();");
 		unset($_SESSION["messages"][$uri]);
 	}
 	if ($error) {
@@ -132,6 +190,6 @@ function page_footer($missing = "") {
 <div id="menu">
 <?php $adminer->navigation($missing); ?>
 </div>
-<script type="text/javascript">setupSubmitHighlight(document);</script>
 <?php
+	echo script("setupSubmitHighlight(document);");
 }

adminer/include/driver.inc.php

@@ -1,4 +1,15 @@
 <?php
+$drivers = array();
+
+/** Add a driver
+* @param string
+* @param string
+* @return null
+*/
+function add_driver($id, $name) {
+	global $drivers;
+	$drivers[$id] = $name;
+}
 
 /*abstract*/ class Min_SQL {
 	var $_conn;
@@ -27,7 +38,7 @@
 		$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),
+				($_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),
@@ -37,7 +48,7 @@
 		$start = microtime(true);
 		$return = $this->_conn->query($query);
 		if ($print) {
-			echo $adminer->selectQuery($query, format_time($start));
+			echo $adminer->selectQuery($query, $start, !$return);
 		}
 		return $return;
 	}
@@ -50,7 +61,7 @@
 	*/
 	function delete($table, $queryWhere, $limit = 0) {
 		$query = "FROM " . table($table);
-		return queries("DELETE" . ($limit ? limit1($query, $queryWhere) : " $query$queryWhere"));
+		return queries("DELETE" . ($limit ? limit1($table, $query, $queryWhere) : " $query$queryWhere"));
 	}
 	
 	/** Update data in table
@@ -67,7 +78,7 @@
 			$values[] = "$key = $val";
 		}
 		$query = table($table) . " SET$separator" . implode(",$separator", $values);
-		return queries("UPDATE" . ($limit ? limit1($query, $queryWhere) : " $query$queryWhere"));
+		return queries("UPDATE" . ($limit ? limit1($table, $query, $queryWhere, $separator) : " $query$queryWhere"));
 	}
 	
 	/** Insert data into table
@@ -99,12 +110,78 @@
 		return queries("BEGIN");
 	}
 	
+	/** Commit transaction
+	* @return bool
+	*/
 	function commit() {
 		return queries("COMMIT");
 	}
 	
+	/** Rollback transaction
+	* @return bool
+	*/
 	function rollback() {
 		return queries("ROLLBACK");
 	}
 	
+	/** Return query with a timeout
+	* @param string
+	* @param int seconds
+	* @return string or null if the driver doesn't support query timeouts
+	*/
+	function slowQuery($query, $timeout) {
+	}
+	
+	/** Convert column to be searchable
+	* @param string escaped column name
+	* @param array array("op" => , "val" => )
+	* @param array
+	* @return string
+	*/
+	function convertSearch($idf, $val, $field) {
+		return $idf;
+	}
+
+	/** Convert operator so it can be used in search
+	 * @param string $operator
+	 * @return string
+	 */
+	function convertOperator($operator) {
+		return $operator;
+	}
+
+	/** Convert value returned by database to actual value
+	* @param string
+	* @param array
+	* @return string
+	*/
+	function value($val, $field) {
+		return (method_exists($this->_conn, 'value')
+			? $this->_conn->value($val, $field)
+			: (is_resource($val) ? stream_get_contents($val) : $val)
+		);
+	}
+
+	/** Quote binary string
+	* @param string
+	* @return string
+	*/
+	function quoteBinary($s) {
+		return q($s);
+	}
+	
+	/** Get warnings about the last command
+	* @return string HTML
+	*/
+	function warnings() {
+		return '';
+	}
+	
+	/** Get help link for table
+	* @param string
+	* @return string relative URL or null
+	*/
+	function tableHelp($name) {
+	}
+	
 }

adminer/include/editing.inc.php

@@ -17,14 +17,15 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 	odd(''); // reset odd for each result
 	for ($i=0; (!$limit || $i < $limit) && ($row = $result->fetch_row()); $i++) {
 		if (!$i) {
+			echo "<div class='scrollable'>\n";
 			echo "<table cellspacing='0' class='nowrap'>\n";
 			echo "<thead><tr>";
 			for ($j=0; $j < count($row); $j++) {
-				$field = $result->fetch_field();
-				$name = $field->name;
-				$orgtable = $field->orgtable;
-				$orgname = $field->orgname;
-				$return[$field->table] = $orgtable;
+				$field = (array)$result->fetch_field();
+				$name = $field["name"];
+				$orgtable = $field["orgtable"];
+				$orgname = $field["orgname"];
+				$return[$field["table"]] = $orgtable;
 				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
 					$links[$j] = ($name == "table" ? "table=" : ($name == "possible_keys" ? "indexes=" : null));
 				} elseif ($orgtable != "") {
@@ -45,46 +46,52 @@ function select($result, $connection2 = null, $orgtables = array(), $limit = 0)
 						$links[$j] = $orgtable;
 					}
 				}
-				if ($field->charsetnr == 63) { // 63 - binary
+				if ($field["charsetnr"] == 63) { // 63 - binary
 					$blobs[$j] = true;
 				}
-				$types[$j] = $field->type;
-				echo "<th" . ($orgtable != "" || $field->name != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($name)
-					. ($orgtables ? doc_link(array('sql' => "explain-output.html#explain_" . strtolower($name))) : "")
+				$types[$j] = $field["type"];
+				echo "<th" . ($orgtable != "" || $field["name"] != $orgname ? " title='" . h(($orgtable != "" ? "$orgtable." : "") . $orgname) . "'" : "") . ">" . h($name)
+					. ($orgtables ? doc_link(array(
+						'sql' => "explain-output.html#explain_" . strtolower($name),
+						'mariadb' => "explain/#the-columns-in-explain-select",
+					)) : "")
 				;
 			}
 			echo "</thead>\n";
 		}
 		echo "<tr" . odd() . ">";
 		foreach ($row as $key => $val) {
+			$link = "";
+			if (isset($links[$key]) && !$columns[$links[$key]]) {
+				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
+					$table = $row[array_search("table=", $links)];
+					$link = ME . $links[$key] . urlencode($orgtables[$table] != "" ? $orgtables[$table] : $table);
+				} else {
+					$link = ME . "edit=" . urlencode($links[$key]);
+					foreach ($indexes[$links[$key]] as $col => $j) {
+						$link .= "&where" . urlencode("[" . bracket_escape($col) . "]") . "=" . urlencode($row[$j]);
+					}
+				}
+			} elseif (is_web_url($val)) {
+				$link = $val;
+			}
 			if ($val === null) {
 				$val = "<i>NULL</i>";
 			} elseif ($blobs[$key] && !is_utf8($val)) {
 				$val = "<i>" . lang('%d byte(s)', strlen($val)) . "</i>"; //! link to download
-			} elseif (!strlen($val)) { // strlen - SQLite can return int
-				$val = "&nbsp;"; // some content to print a border
 			} else {
 				$val = h($val);
 				if ($types[$key] == 254) { // 254 - char
 					$val = "<code>$val</code>";
 				}
 			}
-			if (isset($links[$key]) && !$columns[$links[$key]]) {
-				if ($orgtables && $jush == "sql") { // MySQL EXPLAIN
-					$table = $row[array_search("table=", $links)];
-					$link = $links[$key] . urlencode($orgtables[$table] != "" ? $orgtables[$table] : $table);
-				} else {
-					$link = "edit=" . urlencode($links[$key]);
-					foreach ($indexes[$links[$key]] as $col => $j) {
-						$link .= "&where" . urlencode("[" . bracket_escape($col) . "]") . "=" . urlencode($row[$j]);
-					}
-				}
-				$val = "<a href='" . h(ME . $link) . "'>$val</a>";
+			if ($link) {
+				$val = "<a href='" . h($link) . "'" . (is_web_url($link) ? target_blank() : '') . ">$val</a>";
 			}
 			echo "<td>$val";
 		}
 	}
-	echo ($i ? "</table>" : "<p class='message'>" . lang('No rows.')) . "\n";
+	echo ($i ? "</table>\n</div>" : "<p class='message'>" . lang('No rows.')) . "\n";
 	return $return;
 }
 
@@ -110,6 +117,31 @@ function referencable_primary($self) {
 	return $return;
 }
 
+/** Get settings stored in a cookie
+* @return array
+*/
+function adminer_settings() {
+	parse_str($_COOKIE["adminer_settings"], $settings);
+	return $settings;
+}
+
+/** Get setting stored in a cookie
+* @param string
+* @return array
+*/
+function adminer_setting($key) {
+	$settings = adminer_settings();
+	return $settings[$key];
+}
+
+/** Store settings to a cookie
+* @param array
+* @return bool
+*/
+function set_adminer_settings($settings) {
+	return cookie("adminer_settings", http_build_query($settings + adminer_settings()));
+}
+
 /** Print SQL <textarea> tag
 * @param string
 * @param string or array in which case [0] of every element is used
@@ -119,7 +151,7 @@ function referencable_primary($self) {
 */
 function textarea($name, $value, $rows = 10, $cols = 80) {
 	global $jush;
-	echo "<textarea name='$name' rows='$rows' cols='$cols' class='sqlarea jush-$jush' spellcheck='false' wrap='off'>";
+	echo "<textarea name='" . h($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, $elapsed)
@@ -135,25 +167,25 @@ function textarea($name, $value, $rows = 10, $cols = 80) {
 * @param array
 * @param array
 * @param array returned by referencable_primary()
+* @param array extra types to prepend
 * @return null
 */
-function edit_type($key, $field, $collations, $foreign_keys = array()) {
+function edit_type($key, $field, $collations, $foreign_keys = array(), $extra_types = array()) {
 	global $structured_types, $types, $unsigned, $on_actions;
 	$type = $field["type"];
 	?>
-<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);
+<td><select name="<?php echo h($key); ?>[type]" class="type" aria-labelledby="label-type"><?php
+if ($type && !isset($types[$type]) && !isset($foreign_keys[$type]) && !in_array($type, $extra_types)) {
+	$extra_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 optionlist(array_merge($extra_types, $structured_types), $type);
+?></select><td><input name="<?php echo h($key); ?>[length]" value="<?php echo h($field["length"]); ?>" size="3"<?php echo (!$field["length"] && preg_match('~var(char|binary)$~', $type) ? " class='required'" : ""); //! type="number" with enabled JavaScript ?> aria-labelledby="label-length"><td class="options"><?php
 	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 ($unsigned ? "<select name='" . h($key) . "[unsigned]'" . (!$type || preg_match(number_type(), $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"), (preg_match('~^CURRENT_TIMESTAMP~i', $field["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
 }
 
@@ -178,7 +210,7 @@ function process_type($field, $collate = "COLLATE") {
 	global $unsigned;
 	return " $field[type]"
 		. process_length($field["length"])
-		. (preg_match('~(^|[^o])int|float|double|decimal~', $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
+		. (preg_match(number_type(), $field["type"]) && in_array($field["unsigned"], $unsigned) ? " $field[unsigned]" : "")
 		. (preg_match('~char|text|enum|set~', $field["type"]) && $field["collation"] ? " $collate " . q($field["collation"]) : "")
 	;
 }
@@ -189,24 +221,26 @@ 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($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)) : ""),
+		default_value($field),
 		(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),
 	);
 }
 
+/** Get default value clause
+* @param array
+* @return string
+*/
+function default_value($field) {
+	$default = $field["default"];
+	return ($default === null ? "" : " DEFAULT " . (preg_match('~char|binary|text|enum|set~', $field["type"]) || preg_match('~^(?![a-z])~i', $default) ? q($default) : $default));
+}
+
 /** Get type class to use in CSS
 * @param string
 * @return string class=''
@@ -229,34 +263,37 @@ function type_class($type) {
 * @param array
 * @param string TABLE or PROCEDURE
 * @param array returned by referencable_primary()
-* @param bool display comments column
 * @return null
 */
-function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = array(), $comments = false) {
-	global $connection, $inout;
+function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = array()) {
+	global $inout;
 	$fields = array_values($fields);
+	$default_class = (($_POST ? $_POST["defaults"] : adminer_setting("defaults")) ? "" : " class='hidden'");
+	$comment_class = (($_POST ? $_POST["comments"] : adminer_setting("comments")) ? "" : " class='hidden'");
 	?>
-<thead><tr class="wrap">
-<?php if ($type == "PROCEDURE") { ?><td>&nbsp;<?php } ?>
+<thead><tr>
+<?php if ($type == "PROCEDURE") { ?><td><?php } ?>
 <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-type"><?php echo lang('Type'); ?><textarea id="enum-edit" rows="4" cols="12" wrap="off" style="display: none;"></textarea><?php echo script("qs('#enum-edit').onblur = editingLengthBlur;"); ?>
 <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 id="label-null">NULL
-<td><input type="radio" name="auto_increment_col" value=""><acronym id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</acronym><?php echo doc_link(array(
+<td><input type="radio" name="auto_increment_col" value=""><abbr id="label-ai" title="<?php echo lang('Auto Increment'); ?>">AI</abbr><?php echo doc_link(array(
 	'sql' => "example-auto-increment.html",
+	'mariadb' => "auto_increment/",
 	'sqlite' => "autoinc.html",
-	'pgsql' => "datatype.html#DATATYPE-SERIAL",
+	'pgsql' => "datatype-numeric.html#DATATYPE-SERIAL",
 	'mssql' => "ms186775.aspx",
 )); ?>
-<td id="label-default"><?php echo lang('Default value'); ?>
-<?php echo (support("comment") ? "<td id='label-comment'" . ($comments ? "" : " class='hidden'") . ">" . lang('Comment') : ""); ?>
+<td id="label-default"<?php echo $default_class; ?>><?php echo lang('Default value'); ?>
+<?php echo (support("comment") ? "<td id='label-comment'$comment_class>" . 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>
+<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("row_count = " . count($fields) . ";"); ?>
 </thead>
-<tbody onkeydown="return editingKeydown(event);">
+<tbody>
 <?php
+	echo script("mixin(qsl('tbody'), {onclick: editingClick, onkeydown: editingKeydown, oninput: editingInput});");
 	foreach ($fields as $i => $field) {
 		$i++;
 		$orig = $field[($_POST ? "orig" : "field")];
@@ -264,24 +301,21 @@ function edit_fields($fields, $collations, $type = "TABLE", $foreign_keys = arra
 		?>
 <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="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); ?>
+<th><?php if ($display) { ?><input name="fields[<?php echo $i; ?>][field]" value="<?php echo h($field["field"]); ?>" data-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"], "", "", "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
+<td><label class="block"><input type="radio" name="auto_increment_col" value="<?php echo $i; ?>"<?php if ($field["auto_increment"]) { ?> checked<?php } ?> aria-labelledby="label-ai"></label><td<?php echo $default_class; ?>><?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"]); ?>" aria-labelledby="label-default"><?php
+			echo (support("comment") ? "<td$comment_class><input name='fields[$i][comment]' value='" . h($field["comment"]) . "' data-maxlength='" . (min_version(5.5) ? 1024 : 255) . "' aria-labelledby='label-comment'>" : "");
+		}
 		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, 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;"
+			"<input type='image' class='icon' name='add[$i]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'> "
+			. "<input type='image' class='icon' name='up[$i]' src='../adminer/static/up.gif' alt='↑' title='" . lang('Move up') . "'> "
+			. "<input type='image' class='icon' name='down[$i]' src='../adminer/static/down.gif' alt='↓' title='" . lang('Move down') . "'> "
 		: "");
-		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";
+		echo ($orig == "" || support("drop_col") ? "<input type='image' class='icon' name='drop_col[$i]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "'>" : "");
 	}
 }
 
@@ -352,7 +386,7 @@ function grant($grant, $privileges, $columns, $on) {
 			: queries("$grant ALL PRIVILEGES$on") && queries("$grant GRANT OPTION$on")
 		);
 	}
-	return queries("$grant " . preg_replace('~(GRANT OPTION)\\([^)]*\\)~', '\\1', implode("$columns, ", $privileges) . $columns) . $on);
+	return queries("$grant " . preg_replace('~(GRANT OPTION)\([^)]*\)~', '\1', implode("$columns, ", $privileges) . $columns) . $on);
 }
 
 /** Drop old object and create a new one
@@ -396,7 +430,7 @@ function drop_create($drop, $create, $drop_created, $test, $drop_test, $location
 */
 function create_trigger($on, $row) {
 	global $jush;
-	$timing_event = " $row[Timing] $row[Event]" . ($row["Event"] == "UPDATE OF" ? " " . idf_escape($row["Of"]) : "");
+	$timing_event = " $row[Timing] $row[Event]" . (preg_match('~ OF~', $row["Event"]) ? " $row[Of]" : ""); // SQL injection
 	return "CREATE TRIGGER "
 		. idf_escape($row["Trigger"])
 		. ($jush == "mssql" ? $on . $timing_event : $timing_event . $on)
@@ -411,7 +445,7 @@ function create_trigger($on, $row) {
 * @return string
 */
 function create_routine($routine, $row) {
-	global $inout;
+	global $inout, $jush;
 	$set = array();
 	$fields = (array) $row["fields"];
 	ksort($fields); // enforce fields order
@@ -420,13 +454,13 @@ function create_routine($routine, $row) {
 			$set[] = (preg_match("~^($inout)\$~", $field["inout"]) ? "$field[inout] " : "") . idf_escape($field["field"]) . process_type($field, "CHARACTER SET");
 		}
 	}
+	$definition = rtrim("\n$row[definition]", ";");
 	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]", ";")
-		. ";"
+		. ($jush == "pgsql" ? " AS " . q($definition) : "$definition;")
 	;
 }
 
@@ -435,16 +469,21 @@ function create_routine($routine, $row) {
 * @return string
 */
 function remove_definer($query) {
-	return preg_replace('~^([A-Z =]+) DEFINER=`' . preg_replace('~@(.*)~', '`@`(%|\\1)', logged_user()) . '`~', '\\1', $query); //! proper escaping of user
+	return preg_replace('~^([A-Z =]+) DEFINER=`' . preg_replace('~@(.*)~', '`@`(%|\1)', logged_user()) . '`~', '\1', $query); //! proper escaping of user
 }
 
 /** 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)
+* @param array ("db" => string, "ns" => string, "table" => string, "source" => array, "target" => array, "on_delete" => one of $on_actions, "on_update" => one of $on_actions)
 * @return string
 */
 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"])
+	$db = $foreign_key["db"];
+	$ns = $foreign_key["ns"];
+	return " FOREIGN KEY (" . implode(", ", array_map('idf_escape', $foreign_key["source"])) . ") REFERENCES "
+		. ($db != "" && $db != $_GET["db"] ? idf_escape($db) . "." : "")
+		. ($ns != "" && $ns != $_GET["ns"] ? idf_escape($ns) . "." : "")
+		. 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]" : "")
@@ -485,18 +524,25 @@ function ini_bytes($ini) {
 
 /** Create link to database documentation
 * @param array $jush => $path
+* @param string HTML code
 * @return string HTML code
 */
-function doc_link($paths) {
+function doc_link($paths, $text = "<sup>?</sup>") {
 	global $jush, $connection;
+	$server_info = $connection->server_info;
+	$version = preg_replace('~^(\d\.?\d).*~s', '\1', $server_info); // two most significant digits
 	$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/",
+		'sql' => "https://dev.mysql.com/doc/refman/$version/en/",
+		'sqlite' => "https://www.sqlite.org/",
+		'pgsql' => "https://www.postgresql.org/docs/$version/",
+		'mssql' => "https://msdn.microsoft.com/library/",
+		'oracle' => "https://www.oracle.com/pls/topic/lookup?ctx=db" . preg_replace('~^.* (\d+)\.(\d+)\.\d+\.\d+\.\d+.*~s', '\1\2', $server_info) . "&id=",
 	);
-	return ($paths[$jush] ? "<a href='$urls[$jush]$paths[$jush]' target='_blank' rel='noreferrer'><sup>?</sup></a>" : "");
+	if (preg_match('~MariaDB~', $server_info)) {
+		$urls['sql'] = "https://mariadb.com/kb/en/library/";
+		$paths['sql'] = (isset($paths['mariadb']) ? $paths['mariadb'] : str_replace(".html", "/", $paths['sql']));
+	}
+	return ($paths[$jush] ? "<a href='" . h($urls[$jush] . $paths[$jush]) . "'" . target_blank() . ">$text</a>" : "");
 }
 
 /** Wrap gzencode() for usage in ob_start()
@@ -529,7 +575,7 @@ function db_size($db) {
 * @return null
 */
 function set_utf8mb4($create) {
-  global $connection;
+	global $connection;
 	static $set = false;
 	if (!$set && preg_match('~\butf8mb4~i', $create)) { // possible false positive
 		$set = true;

adminer/include/functions.inc.php

@@ -16,11 +16,22 @@ function adminer() {
 	return $adminer;
 }
 
+/** Get Adminer version
+* @return string
+*/
+function version() {
+	global $VERSION;
+	return $VERSION;
+}
+
 /** Unescape database identifier
 * @param string text inside ``
 * @return string
 */
 function idf_unescape($idf) {
+	if (!preg_match('~^[`\'"[]~', $idf)) {
+		return $idf;
+	}
 	$last = substr($idf, -1);
 	return str_replace($last . $last, $last, substr($idf, 1, -1));
 }
@@ -38,7 +49,14 @@ function escape_string($val) {
 * @return string
 */
 function number($val) {
-  return preg_replace('~[^0-9]+~', '', $val);
+	return preg_replace('~[^0-9]+~', '', $val);
+}
+
+/** Get regular expression to match numeric types
+* @return string
+*/
+function number_type() {
+	return '((?<!o)int(?!er)|numeric|real|float|double|decimal|money)'; // not point, not interval
 }
 
 /** Disable magic_quotes_gpc
@@ -47,7 +65,7 @@ function number($val) {
 * @return null modified in place
 */
 function remove_slashes($process, $filter = false) {
-	if (get_magic_quotes_gpc()) {
+	if (function_exists("get_magic_quotes_gpc") && get_magic_quotes_gpc()) {
 		while (list($key, $val) = each($process)) {
 			foreach ($val as $k => $v) {
 				unset($process[$key][$k]);
@@ -73,12 +91,62 @@ function bracket_escape($idf, $back = false) {
 	return strtr($idf, ($back ? array_flip($trans) : $trans));
 }
 
+/** Check if connection has at least the given version
+* @param string required version
+* @param string required MariaDB version
+* @param Min_DB defaults to $connection
+* @return bool
+*/
+function min_version($version, $maria_db = "", $connection2 = null) {
+	global $connection;
+	if (!$connection2) {
+		$connection2 = $connection;
+	}
+	$server_info = $connection2->server_info;
+	if ($maria_db && preg_match('~([\d.]+)-MariaDB~', $server_info, $match)) {
+		$server_info = $match[1];
+		$version = $maria_db;
+	}
+	return (version_compare($server_info, $version) >= 0);
+}
+
 /** 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
+	return (min_version("5.5.3", 0, $connection) ? "utf8mb4" : "utf8"); // SHOW CHARSET would require an extra query
+}
+
+/** Return <script> element
+* @param string
+* @param string
+* @return string
+*/
+function script($source, $trailing = "\n") {
+	return "<script" . nonce() . ">$source</script>$trailing";
+}
+
+/** Return <script src> element
+* @param string
+* @return string
+*/
+function script_src($url) {
+	return "<script src='" . h($url) . "'" . nonce() . "></script>\n";
+}
+
+/** Get a nonce="" attribute with CSP nonce
+* @return string
+*/
+function nonce() {
+	return ' nonce="' . get_nonce() . '"';
+}
+
+/** Get a target="_blank" attribute
+* @return string
+*/
+function target_blank() {
+	return ' target="_blank" rel="noreferrer noopener"';
 }
 
 /** Escape for HTML
@@ -89,14 +157,6 @@ function h($string) {
 	return str_replace("\0", "&#0;", htmlspecialchars($string, ENT_QUOTES, 'utf-8'));
 }
 
-/** Escape for TD
-* @param string
-* @return string
-*/
-function nbsp($string) {
-	return (trim($string) != "" ? h($string) : "&nbsp;");
-}
-
 /** Convert \n to <br>
 * @param string
 * @return string
@@ -119,8 +179,8 @@ function checkbox($name, $value, $checked, $label = "", $onclick = "", $class =
 	$return = "<input type='checkbox' name='$name' value='" . h($value) . "'"
 		. ($checked ? " checked" : "")
 		. ($labelled_by ? " aria-labelledby='$labelled_by'" : "")
-		. ($onclick ? ' onclick="' . h($onclick) . '"' : '')
 		. ">"
+		. ($onclick ? script("qsl('input').onclick = function () { $onclick };", "") : "")
 	;
 	return ($label != "" || $class ? "<label" . ($class ? " class='$class'" : "") . ">$return" . h($label) . "</label>" : $return);
 }
@@ -153,16 +213,17 @@ function optionlist($options, $selected = null, $use_keys = false) {
 * @param string
 * @param array
 * @param string
-* @param string true for no onchange, false for radio
+* @param string|bool true for no onchange, false for radio
 * @param string
 * @return string
 */
 function html_select($name, $options, $value = "", $onchange = true, $labelled_by = "") {
 	if ($onchange) {
 		return "<select name='" . h($name) . "'"
-			. (is_string($onchange) ? ' onchange="' . h($onchange) . '"' : "")
 			. ($labelled_by ? " aria-labelledby='$labelled_by'" : "")
-			. ">" . optionlist($options, $value) . "</select>";
+			. ">" . optionlist($options, $value) . "</select>"
+			. (is_string($onchange) ? script("qsl('select').onchange = function () { $onchange };", "") : "")
+		;
 	}
 	$return = "";
 	foreach ($options as $key => $val) {
@@ -172,35 +233,42 @@ function html_select($name, $options, $value = "", $onchange = true, $labelled_b
 }
 
 /** 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'>"
-	);
+* @param string
+* @param array
+* @param string
+* @param string
+* @param string
+* @return string
+*/
+function select_input($attrs, $options, $value = "", $onchange = "", $placeholder = "") {
+	$tag = ($options ? "select" : "input");
+	return "<$tag$attrs" . ($options
+		? "><option value=''>$placeholder" . optionlist($options, $value, true) . "</select>"
+		: " size='10' value='" . h($value) . "' placeholder='$placeholder'>"
+	) . ($onchange ? script("qsl('$tag').onchange = $onchange;", "") : ""); //! use oninput for input
 }
 
 /** Get onclick confirmation
+* @param string
+* @param string
 * @return string
 */
-function confirm() {
-	return " onclick=\"return confirm('" . lang('Are you sure?') . "');\"";
+function confirm($message = "", $selector = "qsl('input')") {
+	return script("$selector.onclick = function () { return confirm('" . ($message ? js_escape($message) : lang('Are you sure?')) . "'); };", "");
 }
 
 /** Print header for hidden fieldset (close by </div></fieldset>)
 * @param string
 * @param string
 * @param bool
-* @param string
 * @return null
 */
-function print_fieldset($id, $legend, $visible = false, $onclick = "") {
-	echo "<fieldset><legend><a href='#fieldset-$id' onclick=\"" . h($onclick) . "return !toggle('fieldset-$id');\">$legend</a></legend><div id='fieldset-$id'" . ($visible ? "" : " class='hidden'") . ">\n";
+function print_fieldset($id, $legend, $visible = false) {
+	echo "<fieldset><legend>";
+	echo "<a href='#fieldset-$id'>$legend</a>";
+	echo script("qsl('a').onclick = partial(toggle, 'fieldset-$id');", "");
+	echo "</legend>";
+	echo "<div id='fieldset-$id'" . ($visible ? "" : " class='hidden'") . ">\n";
 }
 
 /** Return class='active' if $bold is true
@@ -286,7 +354,7 @@ function set_password($vendor, $server, $username, $password) {
 }
 
 /** Get password from session
-* @return string
+* @return string or null for missing password or false for expired password
 */
 function get_password() {
 	$return = get_session("pwds");
@@ -328,21 +396,23 @@ function get_vals($query, $column = 0) {
 /** Get keys from first column and values from second
 * @param string
 * @param Min_DB
-* @param float
+* @param bool
 * @return array
 */
-function get_key_vals($query, $connection2 = null, $timeout = 0) {
+function get_key_vals($query, $connection2 = null, $set_keys = true) {
 	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];
+			if ($set_keys) {
+				$return[$row[0]] = $row[1];
+			} else {
+				$return[] = $row[0];
+			}
 		}
 	}
 	return $return;
@@ -352,7 +422,7 @@ function get_key_vals($query, $connection2 = null, $timeout = 0) {
 * @param string
 * @param Min_DB
 * @param string
-* @return array associative
+* @return array of associative arrays
 */
 function get_rows($query, $connection2 = null, $error = "<p class='error'>") {
 	global $connection;
@@ -412,10 +482,10 @@ function where($where, $fields = array()) {
 		$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))
+			. ($jush == "sql" && is_numeric($val) && preg_match('~\.~', $val) ? " LIKE " . q($val) // LIKE because of floats but slow with ints
+				: ($jush == "mssql" ? " LIKE " . q(preg_replace('~[_%[]~', '[\0]', $val)) // LIKE because of text
 				: " = " . 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";
@@ -479,10 +549,10 @@ function cookie($name, $value, $lifetime = 2592000) { // 2592000 - 30 days
 	global $HTTPS;
 	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"])
+		. "; path=" . preg_replace('~\?.*~', '', $_SERVER["REQUEST_URI"])
 		. ($HTTPS ? "; secure" : "")
-		. "; HttpOnly; SameSite=lax"
-	);
+		. "; HttpOnly; SameSite=lax",
+		false);
 }
 
 /** Restart stopped session
@@ -494,12 +564,17 @@ function restart_session() {
 	}
 }
 
-/** Stop session if it would be possible to restart it later
+/** Stop session if possible
+* @param bool
 * @return null
 */
-function stop_session() {
-	if (!ini_bool("session.use_cookies")) {
-		session_write_close();
+function stop_session($force = false) {
+	$use_cookies = ini_bool("session.use_cookies");
+	if (!$use_cookies || $force) {
+		session_write_close(); // improves concurrency if a user opens several pages at once, may be restarted later
+		if ($use_cookies && @ini_set("session.use_cookies", false) === false) { // @ - may be disabled
+			session_start();
+		}
 	}
 }
 
@@ -529,7 +604,7 @@ function set_session($key, $val) {
 */
 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);
+	preg_match('~([^?]*)\??(.*)~', remove_from_uri(implode("|", array_keys($drivers)) . "|username|" . ($db !== null ? "db|" : "") . session_name()), $match);
 	return "$match[1]?"
 		. (sid() ? SID . "&" : "")
 		. ($vendor != "server" || $server != "" ? urlencode($vendor) . "=" . urlencode($server) . "&" : "")
@@ -584,10 +659,10 @@ function query_redirect($query, $location, $message, $redirect = true, $execute
 	}
 	$sql = "";
 	if ($query) {
-		$sql = $adminer->messageQuery($query, $time);
+		$sql = $adminer->messageQuery($query, $time, $failed);
 	}
 	if ($failed) {
-		$error = error() . $sql;
+		$error = error() . $sql . script("messagesPrint();");
 		return false;
 	}
 	if ($redirect) {
@@ -649,12 +724,19 @@ function format_time($start) {
 	return lang('%.3f s', max(0, microtime(true) - $start));
 }
 
+/** Get relative REQUEST_URI
+* @return string
+*/
+function relative_uri() {
+	return str_replace(":", "%3a", preg_replace('~^[^?]*/([^?]*)~', '\1', $_SERVER["REQUEST_URI"]));
+}
+
 /** Remove parameter from query string
 * @param string
 * @return string
 */
 function remove_from_uri($param = "") {
-	return substr(preg_replace("~(?<=[?&])($param" . (SID ? "" : "|" . session_name()) . ")=[^&]*&~", '', "$_SERVER[REQUEST_URI]&"), 0, -1);
+	return substr(preg_replace("~(?<=[?&])($param" . (SID ? "" : "|" . session_name()) . ")=[^&]*&~", '', relative_uri() . "&"), 0, -1);
 }
 
 /** Generate page number for pagination
@@ -689,7 +771,7 @@ function get_file($key, $decompress = false) {
 		}
 		$name = $file["name"][$key];
 		$tmp_name = $file["tmp_name"][$key];
-		$content = file_get_contents($decompress && preg_match('~\\.gz$~', $name)
+		$content = file_get_contents($decompress && preg_match('~\.gz$~', $name)
 			? "compress.zlib://$tmp_name"
 			: $tmp_name
 		); //! may not be reachable because of open_basedir
@@ -734,7 +816,7 @@ function repeat_pattern($pattern, $length) {
 */
 function is_utf8($val) {
 	// don't print control chars except \t\r\n
-	return (preg_match('~~u', $val) && !preg_match('~[\\0-\\x8\\xB\\xC\\xE-\\x1F]~', $val));
+	return (preg_match('~~u', $val) && !preg_match('~[\0-\x8\xB\xC\xE-\x1F]~', $val));
 }
 
 /** Shorten UTF-8 string
@@ -747,7 +829,7 @@ function shorten_utf8($string, $length = 80, $suffix = "") {
 	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>");
+	return h($match[1]) . $suffix . (isset($match[2]) ? "" : "<i>…</i>");
 }
 
 /** Format decimal number
@@ -755,7 +837,7 @@ function shorten_utf8($string, $length = 80, $suffix = "") {
 * @return string
 */
 function format_number($val) {
-  return strtr(number_format($val, 0, ".", lang(',')), preg_split('~~u', lang('0123456789'), -1, PREG_SPLIT_NO_EMPTY));
+	return strtr(number_format($val, 0, ".", lang(',')), preg_split('~~u', lang('0123456789'), -1, PREG_SPLIT_NO_EMPTY));
 }
 
 /** Generate friendly URL
@@ -770,20 +852,22 @@ function friendly_url($val) {
 /** Print hidden fields
 * @param array
 * @param array
-* @return null
+* @param string
+* @return bool
 */
-function hidden_fields($process, $ignore = array()) {
-	while (list($key, $val) = each($process)) {
+function hidden_fields($process, $ignore = array(), $prefix = '') {
+	$return = false;
+	foreach ($process as $key => $val) {
 		if (!in_array($key, $ignore)) {
 			if (is_array($val)) {
-				foreach ($val as $k => $v) {
-					$process[$key . "[$k]"] = $v;
-				}
+				hidden_fields($val, array(), $key);
 			} else {
-				echo '<input type="hidden" name="' . h($key) . '" value="' . h($val) . '">';
+				$return = true;
+				echo '<input type="hidden" name="' . h($prefix ? $prefix . "[$key]" : $key) . '" value="' . h($val) . '">';
 			}
 		}
 	}
+	return $return;
 }
 
 /** Print hidden fields for GET forms
@@ -847,7 +931,7 @@ function enum_input($type, $attrs, $field, $value, $empty = null) {
 * @return null
 */
 function input($field, $value, $function) {
-	global $connection, $types, $adminer, $jush;
+	global $types, $adminer, $jush;
 	$name = h(bracket_escape($field["field"]));
 	echo "<td class='function'>";
 	if (is_array($value) && !$function) {
@@ -865,38 +949,31 @@ function input($field, $value, $function) {
 	$functions = (isset($_GET["select"]) || $reset ? array("orig" => lang('original')) : array()) + $adminer->editFunctions($field);
 	$attrs = " name='fields[$name]'";
 	if ($field["type"] == "enum") {
-		echo nbsp($functions[""]) . "<td>" . $adminer->editInput($_GET["edit"], $field, $attrs, $value);
+		echo h($functions[""]) . "<td>" . $adminer->editInput($_GET["edit"], $field, $attrs, $value);
 	} else {
-		$first = 0;
-		foreach ($functions as $key => $val) {
-			if ($key === "" || !$val) {
-				break;
-			}
-			$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;
 		$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))
+			? "<select name='function[$name]'>" . optionlist($functions, $function === null || $has_function ? $function : "") . "</select>"
+				. on_help("getTarget(event).value.replace(/^SQL\$/, '')", 1)
+				. script("qsl('select').onchange = functionChange;", "")
+			: h(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'>";
+				"<input type='checkbox'" . (preg_match('~^(1|t|true|y|yes|on)$~i', $value) ? " checked='checked'" : "") . "$attrs value='1'>";
 		} elseif ($field["type"] == "set") { //! 64 bits
 			preg_match_all("~'((?:[^']|'')*)'~", $field["length"], $matches);
 			foreach ($matches[1] as $i => $val) {
 				$val = stripcslashes(str_replace("''", "'", $val));
 				$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>';
+				echo " <label><input type='checkbox' name='fields[$name][$i]' value='" . (1 << $i) . "'" . ($checked ? ' checked' : '') . ">" . h($adminer->editVal($val, $field)) . '</label>';
 			}
 		} elseif (preg_match('~blob|bytea|raw|file~', $field["type"]) && ini_bool("file_uploads")) {
-			echo "<input type='file' name='fields-$name'$onchange>";
-		} elseif (($text = preg_match('~text|lob~', $field["type"])) || preg_match("~\n~", $value)) {
+			echo "<input type='file' name='fields-$name'>";
+		} elseif (($text = preg_match('~text|lob|memo~i', $field["type"])) || preg_match("~\n~", $value)) {
 			if ($text && $jush != "sqlite") {
 				$attrs .= " cols='50' rows='12'";
 			} else {
@@ -908,18 +985,30 @@ function input($field, $value, $function) {
 			echo "<textarea$attrs cols='50' rows='12' class='jush-js'>" . h($value) . '</textarea>';
 		} else {
 			// int(3) is only a display hint
-			$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 = (!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' && min_version(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'" : "")
+				. ((!$has_function || $function === "") && preg_match('~(?<!o)int(?!er)~', $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>"
 			;
 		}
+		echo $adminer->editHint($_GET["edit"], $field, $value);
+		// skip 'original'
+		$first = 0;
+		foreach ($functions as $key => $val) {
+			if ($key === "" || !$val) {
+				break;
+			}
+			$first++;
+		}
+		if ($first) {
+			echo script("mixin(qsl('td'), {onchange: partial(skipOriginal, $first), oninput: function () { this.onchange(); }});");
+		}
 	}
 }
 
@@ -928,7 +1017,7 @@ function input($field, $value, $function) {
 * @return string or false to leave the original value
 */
 function process_input($field) {
-	global $adminer;
+	global $adminer, $driver;
 	$idf = bracket_escape($field["field"]);
 	$function = $_POST["function"][$idf];
 	$value = $_POST["fields"][$idf];
@@ -945,7 +1034,7 @@ function process_input($field) {
 		return null;
 	}
 	if ($function == "orig") {
-		return ($field["on_update"] == "CURRENT_TIMESTAMP" ? idf_escape($field["field"]) : false);
+		return (preg_match('~^CURRENT_TIMESTAMP~i', $field["on_update"]) ? idf_escape($field["field"]) : false);
 	}
 	if ($function == "NULL") {
 		return "NULL";
@@ -966,7 +1055,7 @@ function process_input($field) {
 		if (!is_string($file)) {
 			return false; //! report errors
 		}
-		return q($file);
+		return $driver->quoteBinary($file);
 	}
 	return $adminer->processInput($field, $value, $function);
 }
@@ -988,7 +1077,7 @@ function fields_from_edit() {
 		$name = bracket_escape($key, 1); // 1 - back
 		$return[$name] = array(
 			"field" => $name,
-			"privileges" => array("insert" => 1, "update" => 1),
+			"privileges" => array("insert" => 1, "update" => 1, "where" => 1, "order" => 1),
 			"null" => 1,
 			"auto_increment" => ($key == $driver->primary),
 		);
@@ -1003,25 +1092,20 @@ function fields_from_edit() {
 */
 function search_tables() {
 	global $adminer, $connection;
-	$_GET["where"][0]["op"] = "LIKE %%";
 	$_GET["where"][0]["val"] = $_POST["query"];
-	$found = false;
+	$sep = "<ul>\n";
 	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));
 			if (!$result || $result->fetch_row()) {
-				if (!$found) {
-					echo "<ul>\n";
-					$found = true;
-				}
-				echo "<li>" . ($result
-					? "<a href='" . h(ME . "select=" . urlencode($table) . "&where[0][op]=" . urlencode($_GET["where"][0]["op"]) . "&where[0][val]=" . urlencode($_GET["where"][0]["val"])) . "'>$name</a>\n"
-					: "$name: <span class='error'>" . error() . "</span>\n");
+				$print = "<a href='" . h(ME . "select=" . urlencode($table) . "&where[0][op]=" . urlencode($_GET["where"][0]["op"]) . "&where[0][val]=" . urlencode($_GET["where"][0]["val"])) . "'>$name</a>";
+				echo "$sep<li>" . ($result ? $print : "<p class='error'>$print: " . error()) . "\n";
+				$sep = "";
 			}
 		}
 	}
-	echo ($found ? "</ul>" : "<p class='message'>" . lang('No tables.')) . "\n";
+	echo ($sep ? "<p class='message'>" . lang('No tables.') : "</ul>") . "\n";
 }
 
 /** Send headers for export
@@ -1034,7 +1118,7 @@ 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" && !preg_match('~[^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();
@@ -1048,7 +1132,7 @@ function dump_headers($identifier, $multi_table = false) {
 */
 function dump_csv($row) {
 	foreach ($row as $key => $val) {
-		if (preg_match("~[\"\n,;\t]~", $val) || $val === "") {
+		if (preg_match('~["\n,;\t]|^0|\.\d*0$~', $val) || $val === "") {
 			$row[$key] = '"' . str_replace('"', '""', $val) . '"';
 		}
 	}
@@ -1084,6 +1168,35 @@ function get_temp_dir() {
 	return $return;
 }
 
+/** Open and exclusively lock a file
+* @param string
+* @return resource or null for error
+*/
+function file_open_lock($filename) {
+	$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;
+		}
+		chmod($filename, 0660);
+	}
+	flock($fp, LOCK_EX);
+	return $fp;
+}
+
+/** Write and unlock a file
+* @param resource
+* @param string
+*/
+function file_write_unlock($fp, $data) {
+	rewind($fp);
+	fwrite($fp, $data);
+	ftruncate($fp, strlen($data));
+	flock($fp, LOCK_UN);
+	fclose($fp);
+}
+
 /** 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
@@ -1119,7 +1232,7 @@ function rand_string() {
 * @return string HTML
 */
 function select_value($val, $link, $field, $text_length) {
-	global $adminer, $HTTPS;
+	global $adminer;
 	if (is_array($val)) {
 		$return = "";
 		foreach ($val as $k => $v) {
@@ -1137,18 +1250,13 @@ function select_value($val, $link, $field, $text_length) {
 		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
-			);
+		if (is_web_url($val)) {
+			$link = $val; // IE 11 and all modern browsers hide referrer
 		}
 	}
 	$return = $adminer->editVal($val, $field);
 	if ($return !== null) {
-		if ($return === "") { // === - may be int
-			$return = "&nbsp;";
-		} elseif (!is_utf8($return)) {
+		if (!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
@@ -1163,20 +1271,32 @@ function select_value($val, $link, $field, $text_length) {
 * @param string
 * @return bool
 */
-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 is_string($email) && preg_match("(^$pattern(,\\s*$pattern)*\$)i", $email);
+function is_mail($value) {
+	return is_string($value) && filter_var($value, FILTER_VALIDATE_EMAIL);
 }
 
-/** Check whether the string is URL address
+/** Check whether the string is web URL address
 * @param string
-* @return string "http", "https" or ""
+* @return bool
 */
-function is_url($string) {
-	$domain = '[a-z0-9]([-a-z0-9]{0,61}[a-z0-9])'; // one domain component //! IDN
-	return (preg_match("~^(https?)://($domain?\\.)+$domain(:\\d+)?(/.*)?(\\?.*)?(#.*)?\$~i", $string, $match) ? strtolower($match[1]) : ""); //! restrict path, query and fragment characters
+function is_web_url($value) {
+	if (!is_string($value) || !preg_match('~^https?://~i', $value)) {
+		return false;
+	}
+
+	$components = parse_url($value);
+    if (!$components) {
+        return false;
+    }
+
+    // Encode URL path. If path was encoded already, it will be encoded twice, but we are OK with that.
+	$encodedParts = array_map('urlencode', explode('/', $components['path']));
+	$url = str_replace($components['path'], implode('/', $encodedParts), $value);
+
+	parse_str($components['query'], $params);
+	$url = str_replace($components['query'], http_build_query($params), $url);
+
+	return (bool)filter_var($url, FILTER_VALIDATE_URL);
 }
 
 /** Check if field should be shortened
@@ -1184,7 +1304,7 @@ function is_url($string) {
 * @return bool
 */
 function is_shortable($field) {
-	return preg_match('~char|text|lob|geometry|point|linestring|polygon|string|bytea~', $field["type"]);
+	return preg_match('~char|text|json|lob|geometry|point|linestring|polygon|string|bytea~', $field["type"]);
 }
 
 /** Get query to compute number of found rows
@@ -1199,7 +1319,7 @@ function count_rows($table, $where, $is_group, $group) {
 	$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)
+		: "SELECT COUNT(*)" . ($is_group ? " FROM (SELECT 1$query GROUP BY " . implode(", ", $group) . ") x" : $query)
 	);
 }
 
@@ -1208,16 +1328,17 @@ function count_rows($table, $where, $is_group, $group) {
 * @return array of strings
 */
 function slow_query($query) {
-	global $adminer, $token;
+	global $adminer, $token, $driver;
 	$db = $adminer->database();
 	$timeout = $adminer->queryTimeout();
-	if (support("kill") && is_object($connection2 = connect()) && ($db == "" || $connection2->select_db($db))) {
+	$slow_query = $driver->slowQuery($query, $timeout);
+	if (!$slow_query && support("kill") && is_object($connection2 = connect()) && ($db == "" || $connection2->select_db($db))) {
 		$kill = $connection2->result(connection_id()); // MySQL and MySQLi can use thread_id but it's not in PDO_MySQL
 		?>
-<script type="text/javascript">
+<script<?php echo nonce(); ?>>
 var timeout = setTimeout(function () {
 	ajax('<?php echo js_escape(ME); ?>script=kill', function () {
-	}, 'token=<?php echo $token; ?>&kill=<?php echo $kill; ?>');
+	}, 'kill=<?php echo $kill; ?>&token=<?php echo $token; ?>');
 }, <?php echo 1000 * $timeout; ?>);
 </script>
 <?php
@@ -1226,13 +1347,13 @@ var timeout = setTimeout(function () {
 	}
 	ob_flush();
 	flush();
-	$return = @get_key_vals($query, $connection2, $timeout); // @ - may be killed
+	$return = @get_key_vals(($slow_query ? $slow_query : $query), $connection2, false); // @ - may be killed
 	if ($connection2) {
-		echo "<script type='text/javascript'>clearTimeout(timeout);</script>\n";
+		echo script("clearTimeout(timeout);");
 		ob_flush();
 		flush();
 	}
-	return array_keys($return);
+	return $return;
 }
 
 /** Generate BREACH resistant CSRF token
@@ -1295,7 +1416,7 @@ function lzw_decompress($binary) {
 * @return string
 */
 function on_help($command, $side = 0) {
-	return " onmouseover='helpMouseover(this, event, " . h($command) . ", $side);' onmouseout='helpMouseout(this, event);'";
+	return script("mixin(qsl('select, input'), {onmouseover: function (event) { helpMouseover.call(this, event, $command, $side) }, onmouseout: helpMouseout});", "");
 }
 
 /** Print edit data form
@@ -1305,15 +1426,16 @@ function on_help($command, $side = 0) {
 * @param bool
 * @return null
 */
-function edit_form($TABLE, $fields, $row, $update) {
+function edit_form($table, $fields, $row, $update) {
 	global $adminer, $jush, $token, $error;
-	$table_name = $adminer->tableName(table_status1($TABLE, true));
+	$table_name = $adminer->tableName(table_status1($table, true));
 	page_header(
 		($update ? lang('Edit') : lang('Insert')),
 		$error,
-		array("select" => array($TABLE, $table_name)),
+		array("select" => array($table, $table_name)),
 		$table_name
 	);
+	$adminer->editRowPrint($table, $fields, $row, $update);
 	if ($row === false) {
 		echo "<p class='error'>" . lang('No rows.') . "\n";
 	}
@@ -1323,7 +1445,7 @@ function edit_form($TABLE, $fields, $row, $update) {
 	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";
+		echo "<table cellspacing='0' class='layout'>" . script("qsl('table').onkeydown = editingKeydown;");
 
 		foreach ($fields as $name => $field) {
 			echo "<tr><th>" . $adminer->fieldName($field);
@@ -1337,7 +1459,7 @@ function edit_form($TABLE, $fields, $row, $update) {
 			$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]
+					: (is_bool($row[$name]) ? +$row[$name] : $row[$name])
 				)
 				: (!$update && $field["auto_increment"]
 					? ""
@@ -1349,12 +1471,15 @@ function edit_form($TABLE, $fields, $row, $update) {
 			}
 			$function = ($_POST["save"]
 				? (string) $_POST["function"][$name]
-				: ($update && $field["on_update"] == "CURRENT_TIMESTAMP"
+				: ($update && preg_match('~^CURRENT_TIMESTAMP~i', $field["on_update"])
 					? "now"
 					: ($value === false ? null : ($value !== null ? '' : 'NULL'))
 				)
 			);
-			if (preg_match("~time~", $field["type"]) && $value == "CURRENT_TIMESTAMP") {
+			if (!$_POST && !$update && $value == $field["default"] && preg_match('~^[\w.]+\(~', $value)) {
+				$function = "SQL";
+			}
+			if (preg_match("~time~", $field["type"]) && preg_match('~^CURRENT_TIMESTAMP~i', $value)) {
 				$value = "";
 				$function = "now";
 			}
@@ -1363,7 +1488,8 @@ function edit_form($TABLE, $fields, $row, $update) {
 		}
 		if (!support("table")) {
 			echo "<tr>"
-				. "<th><input name='field_keys[]' onkeyup='keyupChange.call(this);' onchange='fieldChange(this);' value=''>" // needs empty value for keyupChange()
+				. "<th><input name='field_keys[]'>"
+				. script("qsl('input').oninput = fieldChange;")
 				. "<td class='function'>" . html_select("field_funs[]", $adminer->editFunctions(array("null" => isset($_GET["select"]))))
 				. "<td><input name='field_vals[]'>"
 				. "\n"
@@ -1376,13 +1502,14 @@ function edit_form($TABLE, $fields, $row, $update) {
 		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 continue edit')
 				: lang('Save and insert next')
 			) . "' title='Ctrl+Shift+Enter'>\n";
+			echo ($update ? script("qsl('input').onclick = function () { return !ajaxForm(this.form, '" . lang('Saving') . "…', this); };") : "");
 		}
 	}
-	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")
+	echo ($update ? "<input type='submit' name='delete' value='" . lang('Delete') . "'>" . confirm() . "\n"
+		: ($_POST || !$fields ? "" : script("focus(qsa('td', qs('#form'))[1].firstChild);"))
 	);
 	if (isset($_GET["select"])) {
 		hidden_fields(array("check" => (array) $_POST["check"], "clone" => $_POST["clone"], "all" => $_POST["all"]));

adminer/include/lang.inc.php

@@ -2,13 +2,13 @@
 // not used in a single language version
 
 $langs = array(
-	'en' => 'English', // Jakub Vrána - http://www.vrana.cz
+	'en' => 'English', // Jakub Vrána - https://www.vrana.cz
 	'ar' => 'العربية', // Y.M Amine - Algeria - nbr7@live.fr
 	'bg' => 'Български', // Deyan Delchev
-	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com
+	'bn' => 'বাংলা', // Dipak Kumar - dipak.ndc@gmail.com | Hossain Ahmed Saiman - hossain.ahmed@altscope.com
 	'bs' => 'Bosanski', // Emir Kurtovic
 	'ca' => 'Català', // Joan Llosas
-	'cs' => 'Čeština', // Jakub Vrána - http://www.vrana.cz
+	'cs' => 'Čeština', // Jakub Vrána - https://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
@@ -18,24 +18,29 @@ $langs = array(
 	'fi' => 'Suomi', // Finnish - Kari Eveli - http://www.lexitec.fi/
 	'fr' => 'Français', // Francis Gagné, Aurélien Royer
 	'gl' => 'Galego', // Eduardo Penabad Ramos
+	'he' => 'עברית', // Binyamin Yawitz - https://stuff-group.com/
 	'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/
+	'ka' => 'ქართული', // Saba Khmaladze skhmaladze@uglt.org
 	'ko' => '한국어', // dalli - skcha67@gmail.com
-	'lt' => 'Lietuvių', // Paulius Leščinskas - http://www.lescinskas.lt
+    'lv' => 'Latviešu', // Kristaps Lediņš - https://krysits.com
+    'lt' => 'Lietuvių', // Paulius Leščinskas - http://www.lescinskas.lt
+	'ms' => 'Bahasa Melayu', // Pisyek
 	'nl' => 'Nederlands', // Maarten Balliauw - http://blog.maartenballiauw.be
 	'no' => 'Norsk', // Iver Odin Kvello, mupublishing.com
 	'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
+	'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
+	'sv' => 'Svenska', // rasmusolle - https://github.com/rasmusolle
 	'ta' => 'த‌மிழ்', // G. Sampath Kumar, Chennai, India, sampathkumar11@gmail.com
-	'th' => 'ภาษาไทย', // Panya  Saraphi, elect.tu@gmail.com - http://www.opencart2u.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

adminer/include/pdo.inc.php

@@ -1,8 +1,8 @@
 <?php
 // PDO can be used in several database drivers
 if (extension_loaded('pdo')) {
-	/*abstract*/ class Min_PDO extends PDO {
-		var $_result, $server_info, $affected_rows, $errno, $error;
+	/*abstract*/ class Min_PDO {
+		var $_result, $server_info, $affected_rows, $errno, $error, $pdo;
 		
 		function __construct() {
 			global $adminer;
@@ -12,23 +12,31 @@ if (extension_loaded('pdo')) {
 			}
 		}
 		
-		function dsn($dsn, $username, $password) {
+		function dsn($dsn, $username, $password, $options = array()) {
+			$options[PDO::ATTR_ERRMODE] = PDO::ERRMODE_SILENT;
+			$options[PDO::ATTR_STATEMENT_CLASS] = array('Min_PDOStatement');
 			try {
-				parent::__construct($dsn, $username, $password);
+				$this->pdo = new PDO($dsn, $username, $password, $options);
 			} 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->pdo->getAttribute(PDO::ATTR_SERVER_VERSION);
 		}
 		
 		/*abstract function select_db($database);*/
 		
+		function quote($string) {
+			return $this->pdo->quote($string);
+		}
+		
 		function query($query, $unbuffered = false) {
-			$result = parent::query($query);
+			$result = $this->pdo->query($query);
 			$this->error = "";
 			if (!$result) {
-				list(, $this->errno, $this->error) = $this->errorInfo();
+				list(, $this->errno, $this->error) = $this->pdo->errorInfo();
+				if (!$this->error) {
+					$this->error = lang('Unknown error.');
+				}
 				return false;
 			}
 			$this->store_result($result);
@@ -76,11 +84,11 @@ if (extension_loaded('pdo')) {
 		var $_offset = 0, $num_rows;
 		
 		function fetch_assoc() {
-			return $this->fetch(2); // PDO::FETCH_ASSOC
+			return $this->fetch(PDO::FETCH_ASSOC);
 		}
 		
 		function fetch_row() {
-			return $this->fetch(3); // PDO::FETCH_NUM
+			return $this->fetch(PDO::FETCH_NUM);
 		}
 		
 		function fetch_field() {
@@ -92,5 +100,3 @@ if (extension_loaded('pdo')) {
 		}
 	}
 }
-
-$drivers = array();

adminer/include/version.inc.php

@@ -1,2 +1,2 @@
 <?php
-$VERSION = "4.3.0";
+$VERSION = "4.9.1";

adminer/index.php

@@ -3,8 +3,8 @@
 * @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)
+* @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
+* @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
 */
 
 include "./include/bootstrap.inc.php";
@@ -65,8 +65,6 @@ 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

@@ -2,10 +2,10 @@
 $TABLE = $_GET["indexes"];
 $index_types = array("PRIMARY", "UNIQUE", "INDEX");
 $table_status = table_status($TABLE, true);
-if (preg_match('~MyISAM|M?aria' . ($connection->server_info >= 5.6 ? '|InnoDB' : '') . '~i', $table_status["Engine"])) {
+if (preg_match('~MyISAM|M?aria' . (min_version(5.6, '10.0.5') ? '|InnoDB' : '') . '~i', $table_status["Engine"])) {
 	$index_types[] = "FULLTEXT";
 }
-if (preg_match('~MyISAM|M?aria' . ($connection->server_info >= 5.7 ? '|InnoDB' : '') . '~i', $table_status["Engine"])) {
+if (preg_match('~MyISAM|M?aria' . (min_version(5.7, '10.2.2') ? '|InnoDB' : '') . '~i', $table_status["Engine"])) {
 	$index_types[] = "SPATIAL";
 }
 $indexes = indexes($TABLE);
@@ -94,12 +94,13 @@ if (!$row) {
 ?>
 
 <form action="" method="post">
+<div class="scrollable">
 <table cellspacing="0" class="nowrap">
 <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;
+<th><noscript><?php echo "<input type='image' class='icon' name='add[0]' src='../adminer/static/plus.gif' alt='+' title='" . lang('Add next') . "'>"; ?></noscript>
 </thead>
 <?php
 if ($primary) {
@@ -113,30 +114,32 @@ if ($primary) {
 $j = 1;
 foreach ($row["indexes"] as $index) {
 	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 "<tr><td>" . html_select("indexes[$j][type]", array(-1 => "") + $index_types, $index["type"], ($j == count($row["indexes"]) ? "indexesAddRow.call(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') . "'",
+				" name='indexes[$j][columns][$i]' title='" . lang('Column') . "'",
 				($fields ? array_combine($fields, $fields) : $fields),
-				$column
+				$column,
+				"partial(" . ($i == count($index["columns"]) ? "indexesAddColumn" : "indexesChangeColumn") . ", '" . js_escape($jush == "sql" ? "" : $_GET["indexes"] . "_") . "')"
 			);
 			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 (support("descidx") ? 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 type='image' class='icon' name='drop_col[$j]' src='../adminer/static/cross.gif' alt='x' title='" . lang('Remove') . "'>" . script("qsl('input').onclick = partial(editingRemoveRow, 'indexes\$1[type]');");
 	}
 	$j++;
 }
 ?>
 </table>
+</div>
 <p>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <input type="hidden" name="token" value="<?php echo $token; ?>">

adminer/lang/ar.inc.php

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

adminer/lang/bg.inc.php

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

adminer/lang/bn.inc.php

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

adminer/lang/bs.inc.php

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

adminer/lang/ca.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Inicia la sessió',
 	'Logout successful.' => 'Desconnexió correcta.',
-	'Invalid credentials.' => 'Credencials invàlids.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Servidor',
 	'Username' => 'Nom d\'usuari',
 	'Password' => 'Contrasenya',
@@ -35,7 +35,7 @@ $translations = array(
 	'Use' => 'Utilitza',
 	'No tables.' => 'No hi ha cap taula.',
 	'select' => 'registres',
-	'Item has been deleted.' => 'S\'ha suprmit l\'element.',
+	'Item has been deleted.' => 'S\'ha suprimit l\'element.',
 	'Item has been updated.' => 'S\'ha actualitzat l\'element.',
 	'Item%s has been inserted.' => 'S\'ha insertat l\'element%s.',
 	'Edit' => 'Edita',
@@ -44,9 +44,9 @@ $translations = array(
 	'Delete' => 'Suprimeix',
 	'Database' => 'Base de dades',
 	'Routines' => 'Rutines',
-	'Indexes have been altered.' => 'S\'han modificat els índexs.',
+	'Indexes have been altered.' => 'S\'han modificat els índex.',
 	'Indexes' => 'Índexs',
-	'Alter indexes' => 'Modifica els índexs',
+	'Alter indexes' => 'Modifica els índex',
 	'Add next' => 'Afegeix el següent',
 	'Language' => 'Idioma',
 	'Select' => 'Selecciona',
@@ -74,11 +74,11 @@ $translations = array(
 	'No commands to execute.' => 'Cap comanda per executar.',
 	'Unable to upload a file.' => 'Impossible adjuntar el fitxer.',
 	'File upload' => 'Adjunta un fitxer',
-	'File uploads are disabled.' => 'L\'ddjunció de fitxers està desactivada.',
+	'File uploads are disabled.' => 'La pujada de fitxers està desactivada.',
 	'Routine has been called, %d row(s) affected.' => array('S\'ha cridat la rutina, %d registre modificat.', 'S\'ha cridat la rutina, %d registres modificats.'),
 	'Call' => 'Crida',
 	'No extension' => 'Cap extensió',
-	'None of the supported PHP extensions (%s) are available.' => 'No hi ha cap de les extensions PHP soporatades (%s) disponible.',
+	'None of the supported PHP extensions (%s) are available.' => 'No hi ha cap de les extensions PHP suportades (%s) disponible.',
 	'Session support must be enabled.' => 'Cal que estigui permès l\'us de sessions.',
 	'Session expired, please login again.' => 'La sessió ha expirat, torna a iniciar-ne una.',
 	'Text length' => 'Longitud del text',
@@ -86,7 +86,7 @@ $translations = array(
 	'Foreign key has been altered.' => 'S\'ha modificat la clau forana.',
 	'Foreign key has been created.' => 'S\'ha creat la clau forana.',
 	'Foreign key' => 'Clau forana',
-	'Target table' => 'Taula de destí',
+	'Target table' => 'Taula de destinació',
 	'Change' => 'Canvi',
 	'Source' => 'Font',
 	'Target' => 'Destí',
@@ -139,7 +139,7 @@ $translations = array(
 	'Grant' => 'Grant',
 	'Revoke' => 'Revoke',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Les dades POST són massa grans. Redueix les dades o incrementa la directiva de configuració %s.',
-	'Logged as: %s' => 'Connectat com: %s',
+	'Logged as: %s' => 'Connectat com a: %s',
 	'Move up' => 'Mou a dalt',
 	'Move down' => 'Mou a baix',
 	'Functions' => 'Funcions',
@@ -185,7 +185,7 @@ $translations = array(
 	'Save and continue edit' => 'Desa i segueix editant',
 	'original' => 'original',
 	'%d item(s) have been affected.' => array('S\'ha modificat %d element.', 'S\'han modificat %d elements.'),
-	'whole result' => 'tots els resultats',
+	'Whole result' => 'Tots els resultats',
 	'Tables have been dropped.' => 'S\'han suprimit les taules.',
 	'Clone' => 'Clona',
 	'Partition by' => 'Fes particions segons',
@@ -204,7 +204,7 @@ $translations = array(
 	'[yyyy]-mm-dd' => 'dd/mm/[aaaa]',
 	'History' => 'Història',
 	'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.' => 'Les columnes origen i destí han de ser del mateix tipus, la columna destí ha d\'estar indexada i les dades referenciades han d\'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.' => 'Les columnes d\'origen i de destinació han de ser del mateix tipus, la columna de destinació ha d\'estar indexada i les dades referenciades han d\'existir.',
 	'E-mail' => 'Correu electrònic',
 	'From' => 'De',
 	'Subject' => 'Assumpte',
@@ -265,4 +265,49 @@ $translations = array(
 	'Permanent link' => 'Enllaç permanent',
 	'Edit all' => 'Edita-ho tot',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/cs.inc.php

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

adminer/lang/da.inc.php

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

adminer/lang/de.inc.php

@@ -2,7 +2,8 @@
 $translations = array(
 	'Login' => 'Login',
 	'Logout successful.' => 'Abmeldung erfolgreich.',
-	'Invalid credentials.' => 'Ungültige Anmelde-Informationen.',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Danke, dass Sie Adminer genutzt haben. <a href="https://www.adminer.org/de/donation/">Spenden willkommen!</a>',
+	'Invalid server or credentials.' => 'Ungültige Server oder Anmelde-Informationen.',
 	'Server' => 'Server',
 	'Username' => 'Benutzer',
 	'Password' => 'Passwort',
@@ -186,7 +187,7 @@ $translations = array(
 	'original' => 'Original',
 	'Tables have been dropped.' => 'Tabellen wurden entfernt (drop).',
 	'%d item(s) have been affected.' => '%d Artikel betroffen.',
-	'whole result' => 'Gesamtergebnis',
+	'Whole result' => 'Gesamtergebnis',
 	'Clone' => 'Klonen',
 	'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',
@@ -279,10 +280,34 @@ $translations = array(
 	'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.' ,
+	'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.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Das Master-Passwort ist abgelaufen. <a href="https://www.adminer.org/de/extension/"%s>Implementieren</a> Sie die %s Methode, um es permanent zu machen.',
 	'%d / ' => '%d / ',
+
+	'Drop %s?' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Full table scan' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ja',
+	'No' => 'Nein',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/el.inc.php

@@ -10,23 +10,23 @@ $translations = array(
 	'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 για να τον κάνετε μόνιμο.',
+	'Invalid server or credentials.' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Επανειλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτό.', 'Επανειλημμένες ανεπιτυχείς προσπάθειες σύνδεσης, δοκιμάστε ξανά σε %s λεπτά.'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Έληξε ο Κύριος Κωδικός. <a href="https://www.adminer.org/en/extension/"%s>Ενεργοποιήστε</a> τη μέθοδο %s για να τον κάνετε μόνιμο.',
 	'Language' => 'Γλώσσα',
 	'Invalid CSRF token. Send the form again.' => 'Άκυρο κουπόνι CSRF. Στείλτε τη φόρμα ξανά.',
 	'If you did not send this request from Adminer then close this page.' => 'Αν δε στείλατε αυτό το αίτημα από το Adminer, τότε κλείστε αυτή τη σελίδα.',
-	'No extension' => 'Χωρίς Επεκτάσεις',
+	'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' => 'Προνόμια',
+
+	'Privileges' => 'Δικαιώματα',
 	'Create user' => 'Δημιουργία Χρήστη',
 	'User has been dropped.' => 'Ο Χρήστης διαγράφηκε.',
 	'User has been altered.' => 'Ο Χρήστης τροποποιήθηκε.',
@@ -36,18 +36,18 @@ $translations = array(
 	'Routine' => 'Ρουτίνα',
 	'Grant' => 'Παραχώρηση',
 	'Revoke' => 'Ανάκληση',
-	
+
 	'Process list' => 'Λίστα διεργασιών',
-	'%d process(es) have been killed.' => array('Τερματίστηκαν %d διεργασία.', 'Τερματίστηκαν %d διεργασίες.'),
+	'%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.' => 'Δεν υπάρχει εντολή να εκτελεστεί.',
+	'Query executed OK, %d row(s) affected.' => array('Το ερώτημα εκτελέστηκε ΟΚ, επηρεάστηκε %d σειρά.', 'Το ερώτημα εκτελέστηκε ΟΚ, επηρεάστηκαν %d σειρές.'),
+	'No commands to execute.' => 'Δεν υπάρχουν εντολές να εκτελεστούν.',
 	'Error in query' => 'Σφάλμα στο ερώτημα',
 	'Execute' => 'Εκτέλεση',
 	'Stop on error' => 'Διακοπή όταν υπάρχει σφάλμα',
@@ -57,19 +57,19 @@ $translations = array(
 	'History' => 'Ιστορικό',
 	'Clear' => 'Καθαρισμός',
 	'Edit all' => 'Επεξεργασία όλων',
-	
-	'File upload' => 'Ανέβασμα αρχείου',
+
+	'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.',
+	'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 can upload a big SQL file via FTP and import it from server.' => 'Μπορείτε να μεταφορτώσετε ένα μεγάλο αρχείο SQL μέσω FTP και να το εισάγετε από το διακομιστή.',
 	'You are offline.' => 'Βρίσκεστε εκτός σύνδεσης.',
-	
+
 	'Export' => 'Εξαγωγή',
 	'Output' => 'Αποτέλεσμα',
 	'open' => 'άνοιγμα',
@@ -77,12 +77,12 @@ $translations = array(
 	'Saving' => 'Γίνεται Αποθήκευση',
 	'Format' => 'Μορφή',
 	'Data' => 'Δεδομένα',
-	
+
 	'Database' => 'Β. Δεδομένων',
 	'database' => 'β. δεδομένων',
 	'Use' => 'χρήση',
 	'Select database' => 'Επιλέξτε Β.Δ.',
-	'Invalid database.' => 'Άκυρη Β.Δ.',
+	'Invalid database.' => 'Λανθασμένη Β.Δ.',
 	'Database has been dropped.' => 'Η Β.Δ. διαγράφηκε.',
 	'Databases have been dropped.' => 'Οι Β.Δ. διαγράφηκαν.',
 	'Database has been created.' => 'Η Β.Δ. δημιουργήθηκε.',
@@ -91,10 +91,10 @@ $translations = array(
 	'Alter database' => 'Τροποποίηση Β.Δ.',
 	'Create database' => 'Δημιουργία Β.Δ.',
 	'Database schema' => 'Σχήμα Β.Δ.',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Μόνιμος Σύνδεσμος',
-	
+
 	// thousands separator - must contain single byte
 	',' => '.',
 	'0123456789' => '0123456789',
@@ -111,26 +111,26 @@ $translations = array(
 	'Check' => 'Έλεγχος',
 	'Repair' => 'Επιδιόρθωση',
 	'Truncate' => 'Περικοπή',
-	'Tables have been truncated.' => 'Οι πίνακες περικόπτηκαν.',
+	'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 σειρές.'),
+	'Routine has been called, %d row(s) affected.' => array('Η ρουτίνα εκτελέστηκε, επηρεάστηκε %d σειρά.', 'Η ρουτίνα εκτελέστηκε, επηρεάστηκαν %d σειρές.'),
 	'Call' => 'Εκτέλεση',
 	'Parameter name' => 'Όνομα παραμέτρου',
 	'Create procedure' => 'Δημιουργία διαδικασίας',
-	'Create function' => 'Δημιουργία Λειτουργίας',
+	'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.' => 'Το γεγονός τροποποιήθηκε.',
@@ -143,15 +143,15 @@ $translations = array(
 	'Start' => 'Έναρξη',
 	'End' => 'Λήξη',
 	'On completion preserve' => 'Κατά την ολοκλήρωση διατήρησε',
-	
+
 	'Tables' => 'Πίνακες',
 	'Tables and views' => 'Πίνακες και Προβολές',
 	'Table' => 'Πίνακας',
 	'No tables.' => 'Χωρίς πίνακες.',
 	'Alter table' => 'Τροποποίηση πίνακα',
-	'Create table' => 'Δημιουργία  πίνακα',
+	'Create table' => 'Δημιουργία πίνακα',
 	'Table has been dropped.' => 'Ο πίνακας διαγράφηκε.',
-	'Tables have been dropped.' => 'Οι πινακες διαγράφηκαν.',
+	'Tables have been dropped.' => 'Οι πίνακες διαγράφηκαν.',
 	'Tables have been optimized.' => 'Οι πίνακες βελτιστοποιήθηκαν.',
 	'Table has been altered.' => 'Ο πίνακας τροποποιήθηκε.',
 	'Table has been created.' => 'Ο πίνακας δημιουργήθηκε.',
@@ -175,12 +175,12 @@ $translations = array(
 	'Move down' => 'Μετακίνηση προς τα κάτω',
 	'Remove' => 'Αφαίρεση',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Υπέρβαση μέγιστου επιτρεπόμενου αριθμού πεδίων. Παρακαλώ αυξήστε %s.',
-	
+
 	'Partition by' => 'Τμηματοποίηση ανά',
 	'Partitions' => 'Τμήματα',
 	'Partition name' => 'Όνομα Τμήματος',
 	'Values' => 'Τιμές',
-	
+
 	'View' => 'Προβολή',
 	'Materialized view' => 'Υλοποιημένη προβολή',
 	'View has been dropped.' => 'Η προβολή διαγράφηκε.',
@@ -188,14 +188,14 @@ $translations = array(
 	'View has been created.' => 'Η προβολή δημιουργήθηκε.',
 	'Alter view' => 'Τροποποίηση προβολής',
 	'Create view' => 'Δημιουργία προβολής',
-	
+
 	'Indexes' => 'Δείκτες',
 	'Indexes have been altered.' => 'Οι δείκτες τροποποιήθηκαν.',
 	'Alter indexes' => 'Τροποποίηση δεικτών',
 	'Add next' => 'Προσθήκη επόμενου',
 	'Index Type' => 'Τύπος δείκτη',
 	'Column (length)' => 'Στήλη (μήκος)',
-	
+
 	'Foreign keys' => 'Εξαρτημένα κλειδιά',
 	'Foreign key' => 'Εξαρτημένο κλειδί',
 	'Foreign key has been dropped.' => 'Το εξαρτημένο κλειδί διαγράφηκε.',
@@ -210,8 +210,8 @@ $translations = array(
 	'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.' => 'Οι στήλες στη πηγή και το στόχο πρέπει να έχουν τον ίδιο τύπο, πρέπει να υπάρχει δείκτης στη στήλη στόχο και να υπάρχουν εξαρτημένα δεδομένα.',
-	
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Οι στήλες στην πηγή και το στόχο πρέπει να έχουν τον ίδιο τύπο, πρέπει να υπάρχει δείκτης στη στήλη στόχο και να υπάρχουν εξαρτημένα δεδομένα.',
+
 	'Triggers' => 'Εναύσματα',
 	'Add trigger' => 'Προσθήκη εναύσματος',
 	'Trigger has been dropped.' => 'Το έναυσμα διαγράφηκε.',
@@ -222,7 +222,7 @@ $translations = array(
 	'Time' => 'Ώρα',
 	'Event' => 'Γεγονός',
 	'Name' => 'Όνομα',
-	
+
 	'select' => 'επιλογή',
 	'Select' => 'Επιλογή',
 	'Select data' => 'Επιλέξτε δεδομένα',
@@ -234,7 +234,7 @@ $translations = array(
 	'Sort' => 'Ταξινόμηση',
 	'descending' => 'Φθίνουσα',
 	'Limit' => 'Όριο',
-	'Limit rows' => 'Περιοριμός σειρών',
+	'Limit rows' => 'Περιορισμός σειρών',
 	'Text length' => 'Μήκος κειμένου',
 	'Action' => 'Ενέργεια',
 	'Full table scan' => 'Πλήρης σάρωση πινάκων',
@@ -246,23 +246,23 @@ $translations = array(
 	'last' => 'τελευταία',
 	'Load more data' => 'Φόρτωση κι άλλων δεδομένων',
 	'Loading' => 'Φορτώνει',
-	'whole result' => 'όλο το αποτέλεσμα',
+	'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 εγγραφές.'),
+	'%d item(s) have been affected.' => array('Επηρεάστηκε %d εγγραφή.', 'Επηρεάστηκαν %d εγγραφές.'),
 	'New item' => 'Νέα εγγραφή',
 	'original' => 'πρωτότυπο',
 	// label for value '' in enum data type
@@ -274,17 +274,17 @@ $translations = array(
 	'Save and continue edit' => 'Αποθήκευση και συνέχεια επεξεργασίας',
 	'Save and insert next' => 'Αποθήκευση και εισαγωγή επόμενου',
 	'Selected' => 'Επιλεγμένα',
-	'Clone' => 'Κλονοποίηση',
+	'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 απεστάλλησαν.'),
-	
+	'%d e-mail(s) have been sent.' => array('%d e-mail απεστάλη.', '%d e-mail απεστάλησαν.'),
+
 	// data type descriptions
 	'Numbers' => 'Αριθμοί',
 	'Date and time' => 'Ημερομηνία και ώρα',
@@ -294,7 +294,7 @@ $translations = array(
 	'Network' => 'Δίκτυο',
 	'Geometry' => 'Γεωμετρία',
 	'Relations' => 'Συσχετήσεις',
-	
+
 	'Editor' => 'Επεξεργαστής',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => '$5/$3/$1',
@@ -305,11 +305,11 @@ $translations = array(
 	'now' => 'τώρα',
 	'yes' => 'ναι',
 	'no' => 'όχι',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Το αρχείο υπάρχει.',
 	'Please use one of the extensions %s.' => 'Παρακαλώ χρησιμοποιείστε μια από τις επεκτάσεις %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Τροποποίηση σχήματος',
 	'Create schema' => 'Δημιουργία σχήματος',
@@ -318,7 +318,7 @@ $translations = array(
 	'Schema has been altered.' => 'Το σχήμα τροποποιήθηκε.',
 	'Schema' => 'Σχήμα',
 	'Invalid schema.' => 'Άκυρο σχήμα.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Αλληλουχία',
 	'Create sequence' => 'Δημιουργία αλληλουχίας',
@@ -326,11 +326,33 @@ $translations = array(
 	'Sequence has been created.' => 'Η αλληλουχία δημιουργήθηκε.',
 	'Sequence has been altered.' => 'Η αλληλουχία τροποποιήθηκε.',
 	'Alter sequence' => 'Τροποποίηση αλληλουχίας',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Τύποι χρήστη',
 	'Create type' => 'Δημιουργία τύπου',
 	'Type has been dropped.' => 'Ο τύπος διαγράφηκε.',
 	'Type has been created.' => 'Ο τύπος δημιουργήθηκε.',
 	'Alter type' => 'Τροποποίηση τύπου',
+
+	'Drop %s?' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/es.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Login',
 	'Logout successful.' => 'Sesión finalizada con éxito.',
-	'Invalid credentials.' => 'Usuario y/o clave de acceso incorrecta.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Servidor',
 	'Username' => 'Usuario',
 	'Password' => 'Contraseña',
@@ -44,9 +44,9 @@ $translations = array(
 	'Delete' => 'Eliminar',
 	'Database' => 'Base de datos',
 	'Routines' => 'Procedimientos',
-	'Indexes have been altered.' => 'Indices actualizados.',
-	'Indexes' => 'Indices',
-	'Alter indexes' => 'Modificar indices',
+	'Indexes have been altered.' => 'Índices actualizados.',
+	'Indexes' => 'Índices',
+	'Alter indexes' => 'Modificar índices',
 	'Add next' => 'Agregar',
 	'Language' => 'Idioma',
 	'Select' => 'Mostrar',
@@ -77,7 +77,7 @@ $translations = array(
 	'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',
+	'No extension' => 'No hay extensión',
 	'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 caducada, por favor escriba su clave de nuevo.',
@@ -113,7 +113,7 @@ $translations = array(
 	'Routine has been dropped.' => 'Procedimiento eliminado.',
 	'Routine has been altered.' => 'Procedimiento modificado.',
 	'Routine has been created.' => 'Procedimiento creado.',
-	'Alter function' => 'Modificar Función',
+	'Alter function' => 'Modificar función',
 	'Alter procedure' => 'Modificar procedimiento',
 	'Return type' => 'Tipo de valor de vuelta',
 	'Add trigger' => 'Agregar disparador',
@@ -127,7 +127,7 @@ $translations = array(
 	'%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?',
+	'Are you sure?' => '¿Está seguro?',
 	'Privileges' => 'Privilegios',
 	'Create user' => 'Crear Usuario',
 	'User has been dropped.' => 'Usuario eliminado.',
@@ -139,7 +139,7 @@ $translations = array(
 	'Grant' => 'Conceder',
 	'Revoke' => 'Impedir',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST data demasiado grande. Reduzca el tamaño o aumente la directiva de configuración %s.',
-	'Logged as: %s' => 'Logeado como: %s',
+	'Logged as: %s' => 'Logueado como: %s',
 	'Move up' => 'Mover arriba',
 	'Move down' => 'Mover abajo',
 	'Functions' => 'Funciones',
@@ -186,12 +186,12 @@ $translations = array(
 	'original' => 'original',
 	'Tables have been dropped.' => 'Tablas eliminadas.',
 	'%d item(s) have been affected.' => array('%d elemento afectado.', '%d elementos afectados.'),
-	'whole result' => 'resultado completo',
+	'Whole result' => 'Resultado completo',
 	'Clone' => 'Clonar',
 	'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',
+	'Partition name' => 'Nombre de partición',
 	'Values' => 'Valores',
 	'%d row(s) have been imported.' => array('%d registro importado.', '%d registros importados.'),
 	'anywhere' => 'donde sea',
@@ -248,16 +248,16 @@ $translations = array(
 	'System' => 'Motor de base de datos',
 	'Select data' => 'Visualizar contenido',
 	'Show structure' => 'Mostrar estructura',
-	'empty' => 'ningúno',
+	'empty' => 'ninguno',
 	'Network' => 'Red',
 	'Geometry' => 'Geometría',
 	'File exists.' => 'Ese archivo ya existe.',
 	'Attachments' => 'Adjuntos',
-	'%d query(s) executed OK.' => array('%d sentencia sql ejecutada correctamente.', '%d sentencias sql ejecutadas correctamente.'),
+	'%d query(s) executed OK.' => array('%d sentencia SQL ejecutada correctamente.', '%d sentencias SQL ejecutadas correctamente.'),
 	'Show only errors' => 'Mostrar solamente errores',
 	'Refresh' => 'Refrescar',
 	'Invalid schema.' => 'Esquema inválido.',
-	'Please use one of the extensions %s.' => 'Por favor use una de las extensiones %s.',
+	'Please use one of the extensions %s.' => 'Por favor, use una de las extensiones %s.',
 	'now' => 'ahora',
 	'ltr' => 'ltr',
 	'Tables have been copied.' => 'Tablas copiadas.',
@@ -265,4 +265,49 @@ $translations = array(
 	'Permanent link' => 'Enlace permanente',
 	'Edit all' => 'Editar todos',
 	'HH:MM:SS' => 'HH:MM:SS',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/et.inc.php

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

adminer/lang/fa.inc.php

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

adminer/lang/fi.inc.php

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

adminer/lang/fr.inc.php

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

adminer/lang/gl.inc.php

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

adminer/lang/he.inc.php

@@ -0,0 +1,313 @@
+<?php
+$translations = array(
+	'Login' => 'התחברות',
+	'Logout successful.' => 'ההתחברות הצליחה',
+	'Invalid server or credentials.' => null,
+	'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 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.' => 'כשל באבטחת נתונים, שלח טופס שוב',
+	'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 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' => 'אירוע',
+	'%d row(s)' => '%d שורות',
+	'Remove' => 'הסר',
+	'Are you sure?' => 'האם אתה בטוח?',
+	'Privileges' => 'פריווילגיות',
+	'Create user' => 'צור משתמש',
+	'User has been dropped.' => 'המשתמש הושלך',
+	'User has been altered.' => 'המשתמש שונה',
+	'User has been created.' => 'המשתמש נוצר',
+	'Hashed' => 'הצפנה',
+	'Column' => 'עמודה',
+	'Routine' => 'רוטינה',
+	'Grant' => 'הענק',
+	'Revoke' => 'שלול',
+	'%s version: %s through PHP extension %s' => '%s גרסה: %s דרך תוסף PHP %s',
+	'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' => 'לפי זמן נתון',
+	'Save and continue edit' => 'שמור והמשך לערוך',
+	'original' => 'מקורי',
+	'Tables have been truncated.' => 'הטבלה קוצרה',
+	'Tables have been moved.' => 'הטבלה הועברה',
+	'Tables have been dropped.' => 'הטבלה הושלכה',
+	'Tables and views' => 'טבלאות ותצוגות',
+	'Engine' => 'מנוע',
+	'Collation' => 'קולקציה',
+	'Data Length' => 'אורך נתונים',
+	'Index Length' => 'אורך אינדקס',
+	'Data Free' => 'נתונים משוחררים',
+	'Rows' => 'שורות',
+	',' => ',',
+	'0123456789' => '0123456789',
+	'Analyze' => 'נתח',
+	'Optimize' => 'יעל',
+	'Check' => 'בדוק',
+	'Repair' => 'תקן',
+	'Truncate' => 'קצר',
+	'Move to other database' => 'העבר למסד נתונים אחר',
+	'Move' => 'העבר',
+	'%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 s',
+	'$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' => 'קובץ השרת %s',
+	'File does not exist.' => 'הקובץ אינו קיים',
+	'%d in total' => '%d בסך הכל',
+	'Permanent login' => 'התחבר לצמיתות',
+	'Databases have been dropped.' => 'מסד הנתונים הושלך',
+	'Database has 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' => 'מערכת',
+	'Select data' => 'בחר נתונים',
+	'Show structure' => 'הראה מבנה',
+	'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' => 'rtl',
+	'Tables have been copied.' => 'הטבלה הועתקה',
+	'Copy' => 'העתק',
+	'Permanent link' => 'קישור סופי',
+	'Edit all' => 'ערוך הכל',
+	'HH:MM:SS' => 'HH:MM:SS',
+	'Tables have been optimized.' => 'הטבלאות עברו אופטימיזציה',
+	'Materialized view' => 'תצוגת מימוש ',
+	'Vacuum' => 'וואקום',
+	'Selected' => 'נבחרים',
+	'Ctrl+click on a value to modify it.' => 'לחץ ctrl + לחיצת עכבר לערוך ערך זה',
+	'File must be in UTF-8 encoding.' => 'על הקובץ להיות בקידוד utf-8',
+	'Modify' => 'ערוך',
+	'Loading' => 'טוען',
+	'Load more data' => 'טען נתונים נוספים',
+	'ATTACH queries are not supported.' => 'שאילתת ATTACH אינה נתמכת',
+	'%d / ' => '%d / ',
+	'Limit rows' => 'הגבל שורות',
+	'Default value' => 'ערך ברירת מחדל',
+	'Full table scan' => 'סריקה טבלה מלאה',
+	'Too many unsuccessful logins, try again in %d minute(s).' => 'יותר מידי נסיונות כניסה נכשלו, אנא נסה עוד %d דקות',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'תודה שהשתמש ב-adminer אנא שקול <a href="https://www.adminer.org/en/donation/">לתרום</a>.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'סיסמת המאסטר פגה <a href="https://www.adminer.org/en/extension/"%s>התקן תוסף</a> על מנת להפוך את זה לתמידי',
+	'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.' => 'ניתן לעלות קבצים ב-FTP ואז למשוך אותם מהשרת',
+	'Size' => 'גודל',
+	'Compute' => 'חישוב',
+	'You are offline.' => 'הינך לא מקוון',
+	'You have no privileges to update this table.' => 'אין לך ההרשאות המתאימות לעדכן טבלה זו',
+	'Saving' => 'שומר',
+	'yes' => 'כן',
+	'no' => 'לא',
+
+	'Drop %s?' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+);

adminer/lang/hu.inc.php

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

adminer/lang/id.inc.php

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

adminer/lang/it.inc.php

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

adminer/lang/ja.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'ログイン',
 	'Logout successful.' => 'ログアウト',
-	'Invalid credentials.' => '不正なログイン',
+	'Invalid server or credentials.' => null,
 	'Server' => 'サーバ',
 	'Username' => 'ユーザ名',
 	'Password' => 'パスワード',
@@ -178,13 +178,13 @@ $translations = array(
 	'Optimize' => '最適化',
 	'Check' => 'チェック',
 	'Repair' => '修復',
-	'Truncate' => 'Truncate',
+	'Truncate' => '空にする',
 	'Move to other database' => '別のデータベースへ移動',
 	'Move' => '移動',
 	'Save and continue edit' => '保存して継続',
 	'original' => '元',
 	'%d item(s) have been affected.' => '%d を更新しました',
-	'whole result' => '全結果',
+	'Whole result' => '全結果',
 	'Tables have been dropped.' => 'テーブルを削除しました',
 	'Clone' => 'クローン',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => '定義可能な最大フィールド数を越えました。%s を増やしてください。',
@@ -264,4 +264,50 @@ $translations = array(
 	'Permanent link' => 'パーマネントリンク',
 	'Edit all' => 'すべて編集',
 	'HH:MM:SS' => '時:分:秒',
+	'Selected' => '選択済',
+	'Modify' => '修正',
+	'Load more data' => '続きを読み込み',
+	'Loading' => '読み込み中',
+	'Size' => 'サイズ',
+	'Compute' => '算出',
+	'Saving' => '保存中',
+	'yes' => 'はい',
+	'no' => 'いいえ',
+	'Default value' => '既定値',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/ka.inc.php

@@ -0,0 +1,313 @@
+<?php
+$translations = array(
+	'Login' => 'შესვლა',
+	'Logout successful.' => 'გამოხვედით სისტემიდან.',
+	'Invalid server or credentials.' => null,
+	'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' => 'ბაზა',
+	'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.' => 'არც ერთი მხარდაჭერილი გაფართოება არ მოიძებნა (%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' => 'გარე გასაღები',
+	'Change' => 'შეცვლა',
+	'Source' => 'წყარო',
+	'Target' => 'სამიზნე',
+	'Add column' => 'ველის დამატება',
+	'Alter' => 'შეცვლა',
+	'Add foreign key' => 'გარე გასაღები დამატება',
+	'ON DELETE' => 'წაშლისას',
+	'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' => 'ჰეშირებული',
+	'Column' => 'ველი',
+	'Routine' => 'პროცედურა',
+	'Grant' => 'დაშვება',
+	'Revoke' => 'შეზღუდვა',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST ინფორმაცია ძალიან დიდია. შეამცირეთ ზომა ან გაზარდეს POST ინფორმაციის ზომა პარამეტრებიდან %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.' => 'ცხრილი გასუფთავდა.',
+	'Rows' => 'რიგი',
+	',' => ' ',
+	'0123456789' => '0123456789',
+	'Tables have been moved.' => 'ცხრილი გადაადგილდა.',
+	'Move to other database' => 'გადატანა სხვა ბაზაში',
+	'Move' => 'გადატანა',
+	'Engine' => 'ძრავი',
+	'Save and continue edit' => 'შენახვა და ცვლილების გაგრძელება',
+	'original' => 'საწყისი',
+	'%d item(s) have been affected.' => 'შეიცვალა %d ჩანაწერი.',
+	'Whole result' => 'სრული შედეგი',
+	'Tables have been dropped.' => 'ცხრილები წაიშალა.',
+	'Clone' => 'კლონირება',
+	'Partition by' => 'დაყოფა',
+	'Partitions' => 'დანაყოფები',
+	'Partition name' => 'დანაყოფის სახელი',
+	'Values' => 'პარამეტრები',
+	'%d row(s) have been imported.' => 'დაიმპორტდა %d რიგი.',
+	'Import' => 'იმპორტი',
+	'Stop on error' => 'გაჩერება შეცდომისას',
+	'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' => 'ცვლადები',
+	'Relations' => 'ურთიერთობა',
+	'Run file' => 'ფაილის გაშვება',
+	'Clear' => 'გასუფთავება',
+	'Maximum allowed file size is %sB.' => 'ფაილის მაქსიმალური ზომა - %sB.',
+	'Numbers' => 'ციფრები',
+	'Date and time' => 'დრო და თარიღი',
+	'Binary' => 'ორობითი',
+	'Lists' => 'სია',
+	'Editor' => 'რედაქტორი',
+	'E-mail' => 'ელ. ფოსტა',
+	'From' => 'ავტორი:',
+	'Subject' => 'თემა',
+	'Send' => 'გაგზავნა',
+	'%d e-mail(s) have been sent.' => 'გაიგზავნა %d წერილი.',
+	'Webserver file %s' => 'ფაილი %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.' => 'სახეობა შეიქმნა.',
+	'Ctrl+click on a value to modify it.' => 'შესაცვლელად გამოიყენეთ Ctrl+თაგვის ღილაკი.',
+	'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.' => 'არასწორი სქემა.',
+	'Please use one of the extensions %s.' => 'გამოიყენეთ ერთ-ერთი გაფართოება %s.',
+	'now' => 'ახლა',
+	'ltr' => 'ltr',
+	'Tables have been copied.' => 'ცხრილი დაკოპირდა.',
+	'Copy' => 'კოპირება',
+	'Permanent link' => 'მუდმივი ბმული',
+	'Edit all' => 'ყველას შეცვლა',
+	'HH:MM:SS' => 'სთ:წთ:წმ',
+	'Tables have been optimized.' => 'ცხრილებს გაუკეთდა ოპტიმიზაცია.',
+	'Materialized view' => 'მატერიალური ხედი',
+	'Vacuum' => 'ვაკუუმი',
+	'Selected' => 'არჩეული',
+	'File must be in UTF-8 encoding.' => 'ფაილი უნდა იყოს კოდირებაში UTF-8.',
+	'Modify' => 'შეცვლა',
+	'Loading' => 'ჩატვირთვა',
+	'Load more data' => 'მეტი ინფორმაციის ჩატვირთვა',
+	'ATTACH queries are not supported.' => 'ATTACH-მოთხოვნები არაა მხარდაჭერილი.',
+	'%d / ' => '%d / ',
+	'Limit rows' => 'რიგების შეზღუდვა',
+	'Default value' => 'სტანდარტული მნიშვნელობა',
+	'Full table scan' => 'სრული ცხრილის ანალიზი',
+	'Too many unsuccessful logins, try again in %d minute(s).' => 'ძალიან ბევრჯერ შეგეშალათ მომხმარებელი და პაროლი. სცადეთ %d წუთში.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'ძირითად პაროლს ვადა გაუვიდა. <a href="https://www.adminer.org/en/extension/"%s>გამოიყენეთ</a> მეთოდი %s, რათა ის მუდმივი გახადოთ.',
+	'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.' => 'დიდი ფაილი უნდა ატვირტოთ FTP-თი და შემდეგ გაუკეთოთ იმპორტი სერვერიდან.',
+	'Size' => 'ზომა',
+	'Compute' => 'გამოთვლა',
+	'You are offline.' => 'არ გაგივლიათ ავტორიზაცია.',
+	'You have no privileges to update this table.' => 'ამ ცხრილის განახლების უფლება არ გაქვთ.',
+	'Saving' => 'შენახვა',
+	'yes' => 'კი',
+	'no' => 'არა',
+	'Routines' => 'რუტინები',
+	'Target table' => 'მიზნობრივი ცხრილი',
+	'Strings' => 'ველები',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'საწყისი და მიზნობრივი ველები უნდა იყოს ერთიდაიგივე სახეობის, მიზნობრივ ველზე უნდა იყოს ინდექსი და უნდა არსებობდეს შესაბამისი ინფორმაცია.',
+	'Drop %s?' => 'წაიშალოს %s?',
+	'Warnings' => 'გაფრთხილება',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'უპაროლო წვდომა ბაზასთან არაა დაშვებული Adminer-ში, მეტი ინფორმაციისთვის ეწვიეთ <a href="https://www.adminer.org/en/password/"%s>ბმულს</a>.',
+	'DB' => 'ბაზა',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'მადლობას გიხდით Adminer-ით სარგებლობისთვის, გადახედეთ ბმულს <a href="https://www.adminer.org/en/donation/">შემოწირულობა</a>.',
+	'The action will be performed after successful login with the same credentials.' => 'მოქმედება შესრულდება იგივე მომხმარებლით წარმატებული ავტორიზაციის შემდეგ.',
+	'Connecting to privileged ports is not allowed.' => 'პრივილეგირებულ პორტთან წვდომა დაუშვებელია.',
+	'There is a space in the input password which might be the cause.' => 'პაროლში არის გამოტოვება, შეიძლება ეს ქმნის პრობლემას.',
+	'Unknown error.' => 'უცნობი შეცდომა.',
+	'Database does not support password.' => 'ბაზაში არაა მხარდაჭერილი პაროლი.',
+	'Disable %s or enable %s or %s extensions.' => 'გათიშეთ %s ან ჩართეთ %s ან %s გაფართოება.',
+
+	'overwrite' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+);

adminer/lang/ko.inc.php

@@ -1,267 +1,313 @@
 <?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' => '기본값',
+	'$1-$3-$5' => '$1-$3-$5',
+	'%.3f s' => '%.3f 초',
 	'%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' => '이벤트',
+	'%d e-mail(s) have been sent.' => '%d개 메일을 보냈습니다.',
+	'%d in total' => '총 %d개',
+	'%d item(s) have been affected.' => '%d개 항목을 갱신했습니다.',
+	'%d process(es) have been killed.' => '%d개 프로세스를 강제 종료하였습니다.',
+	'%d query(s) executed OK.' => '%d개 쿼리를 잘 실행했습니다.',
+	'%d row(s) have been imported.' => '%d개 행을 가져 왔습니다.',
+	'%d row(s)' => '%d개 행',
 	'%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' => '스키마',
+	'Action' => '실행',
+	'Add column' => '열 추가',
+	'Add foreign key' => '외부 키를 추가',
+	'Add next' => '다음 추가',
+	'Add trigger' => '트리거 추가',
+	'Aggregation' => '집합',
+	'Alter database' => '데이터베이스 변경',
+	'Alter event' => '이벤트 변경',
+	'Alter function' => '함수 변경',
+	'Alter indexes' => '색인 변경',
+	'Alter procedure' => '시저 변경',
 	'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.' => '파일이 이미 있습니다.',
+	'Alter table' => '테이블 변경',
+	'Alter trigger' => '트리거 변경',
+	'Alter type' => '형 변경',
+	'Alter view' => '보기 변경',
+	'Alter' => '변경',
+	'Analyze' => '분석',
+	'anywhere' => '모든',
+	'Are you sure?' => '실행 하시겠습니까?',
+	'At given time' => '지정 시간',
 	'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.' => '테이블을 복사했습니다',
+	'Auto Increment' => '자동 증가',
+	'Binary' => '이진',
+	'Call' => '호출',
+	'Change' => '변경',
+	'Check' => '확인',
+	'Clear' => '삭제',
+	'Clone' => '복제',
+	'collation' => '정렬',
+	'Collation' => '정렬',
+	'Column (length)' => '열 (길이)',
+	'Column name' => '열 이름',
+	'Column' => '열',
+	'Comment' => '주석',
+	'Compute' => '계산하기',
 	'Copy' => '복사',
-	'Permanent link' => '영구 링크',
-	'Edit all' => '모든 편집',
+	'Create database' => '데이터베이스 만들기',
+	'Create event' => '만들기',
+	'Create function' => '함수 만들기',
+	'Create procedure' => '시저 만들기',
+	'Create schema' => '스키마 추가',
+	'Create sequence' => '시퀀스 만들기',
+	'Create table' => '테이블 만들기',
+	'Create trigger' => '트리거 만들기',
+	'Create type' => '사용자 정의 형식 만들기',
+	'Create user' => '사용자 만들기',
+	'Create view' => '뷰 만들기',
+	'Data Free' => '데이터 여유',
+	'Data Length' => '데이터 길이',
+	'Data' => '데이터',
+	'Database has been altered.' => '데이터베이스를 변경했습니다.',
+	'Database has been created.' => '데이터베이스를 만들었습니다.',
+	'Database has been dropped.' => '데이터베이스를 삭제했습니다.',
+	'Database has been renamed.' => '데이터베이스의 이름을 바꾸었습니다.',
+	'Database schema' => '데이터베이스 구조',
+	'database' => '데이터베이스',
+	'Database' => '데이터베이스',
+	'Databases have been dropped.' => '데이터베이스를 삭제했습니다.',
+	'Date and time' => '시간',
+	'Default values' => '기본값',
+	'Delete' => '삭제',
+	'descending' => '역순',
+	'Drop' => '삭제',
+	'E-mail' => '메일',
+	'Edit all' => '모두 편집',
+	'Edit' => '편집',
+	'edit' => '편집',
+	'Editor' => '에디터',
+	'empty' => '비어있음',
+	'End' => '종료',
+	'engine' => '엔진',
+	'Engine' => '엔진',
+	'Error in query' => '쿼리의 오류',
+	'Event has been altered.' => '변경했습니다.',
+	'Event has been created.' => '만들었습니다.',
+	'Event has been dropped.' => '삭제했습니다.',
+	'Event' => '이벤트',
+	'Events' => '이벤트',
+	'Every' => '매 번',
+	'Execute' => '실행',
+	'Export' => '내보내기',
+	'File does not exist.' => '파일이 존재하지 않습니다.',
+	'File exists.' => '파일이 이미 있습니다.',
+	'File upload' => '파일 올리기',
+	'File uploads are disabled.' => '파일 업로드가 잘못되었습니다.',
+	'Foreign key has been altered.' => '외부 키를 변경했습니다.',
+	'Foreign key has been created.' => '외부 키를 만들었습니다.',
+	'Foreign key has been dropped.' => '외부 키를 제거했습니다.',
+	'Foreign key' => '외부 키',
+	'Foreign keys' => '외부 키',
+	'Format' => '형식',
+	'From server' => '서버에서 실행',
+	'From' => '보낸 사람',
+	'Functions' => '함수',
+	'Geometry' => '기하 형',
+	'Grant' => '권한 부여',
+	'Hashed' => 'Hashed',
 	'HH:MM:SS' => '시:분:초',
+	'History' => '이력',
+	'Import' => '가져 오기',
+	'Index Length' => '색인 길이',
+	'Index Type' => '색인 형',
+	'Indexes have been altered.' => '색인을 변경했습니다.',
+	'Indexes' => '색인',
+	'Insert' => '삽입',
+	'Invalid server or credentials.' => null,
+	'Invalid CSRF token. Send the form again.' => '잘못된 CSRF 토큰입니다. 다시 보내주십시오.',
+	'Invalid database.' => '잘못된 데이터베이스입니다.',
+	'Invalid schema.' => '잘못된 스키마입니다.',
+	'Item has been deleted.' => '항목을 삭제했습니다.',
+	'Item has been updated.' => '항목을 갱신했습니다.',
+	'Item%s has been inserted.' => '%s 항목을 삽입했습니다.',
+	'Kill' => '강제 종료',
+	'Language' => '언어',
+	'last' => '마지막',
+	'Length' => '길이',
+	'Limit rows' => '행 제약',
+	'Limit' => '제약',
+	'Lists' => '목록',
+	'Load more data' => '더 많은 데이터 부르기',
+	'Loading' => '부르는 중',
+	'Logged as: %s' => '다음으로 로그인했습니다: %s',
+	'Login' => '로그인',
+	'Logout successful.' => '로그아웃을 성공했습니다.',
+	'Logout' => '로그아웃',
+	'ltr' => 'ltr',
+	'Maximum allowed file size is %sB.' => '파일의 최대 크기 %sB',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => '정의 가능한 최대 필드 수를 초과했습니다. %s(을)를 늘리십시오.',
+	'Modify' => '수정',
+	'Move down' => '아래로',
+	'Move to other database' => '다른 데이터베이스로 이동',
+	'Move up' => '위로',
+	'Move' => '이동',
+	'Name' => '이름',
+	'Network' => '네트워크 형',
+	'New item' => '항목 만들기',
+	'No commands to execute.' => '실행할 수 있는 명령이 없습니다.',
+	'No extension' => '확장이 없습니다.',
+	'No rows.' => '행이 없습니다.',
+	'No tables.' => '테이블이 없습니다.',
+	'None of the supported PHP extensions (%s) are available.' => 'PHP 확장(%s)이 설치되어 있지 않습니다.',
+	'now' => '현재 시간',
+	'Numbers' => '숫자',
+	'On completion preserve' => '완성 후 저장',
+	'ON DELETE' => '지울 때',
+	'ON UPDATE' => '업데이트할 때',
+	'open' => '열',
+	'Optimize' => '최적화',
+	'Options' => '설정',
+	'original' => '원본',
+	'Output' => '출력',
+	'overwrite' => '덮어쓰기',
+	'Page' => '페이지',
+	'Parameter name' => '매개변수 이름',
+	'Partition by' => '파티션',
+	'Partition name' => '파티션 이름',
+	'Partitions' => '파티션',
+	'Password' => '비밀번호',
+	'Permanent link' => '영구적으로 링크',
+	'Permanent login' => '영구적으로 로그인',
+	'Please use one of the extensions %s.' => '확장 %s 중 하나를 사용하십시오.',
+	'Privileges' => '권한',
+	'Process list' => '프로세스 목록',
+	'Query executed OK, %d row(s) affected.' => '쿼리를 잘 실행했습니다. %d행을 변경했습니다.',
+	'Refresh' => '새로 고침',
+	'Relations' => '관계',
+	'Remove' => '제거',
+	'Repair' => '복구',
+	'Return type' => '반환 형식',
+	'Revoke' => '권한 취소',
+	'Routine has been altered.' => '루틴을 변경했습니다.',
+	'Routine has been called, %d row(s) affected.' => '루틴을 호출했습니다. %d 행을 변경했습니다.',
+	'Routine has been created.' => '루틴을 추가했습니다.',
+	'Routine has been dropped.' => '루틴을 제거했습니다.',
+	'Routine' => '루틴',
+	'Routines' => '루틴',
+	'Rows' => '행',
+	'Run file' => '파일을 실행',
+	'Save and continue edit' => '저장하고 계속 편집하기',
+	'Save and insert next' => '저장하고 다음에 추가',
+	'Save' => '저장',
+	'save' => '저장',
+	'Schedule' => '예약',
+	'Schema has been altered.' => '스키마를 변경했습니다.',
+	'Schema has been created.' => '스키마를 추가했습니다.',
+	'Schema has been dropped.' => '스키마를 삭제했습니다.',
+	'Schema' => '스키마',
+	'Search data in tables' => '테이블 내 데이터 검색',
+	'Search' => '검색',
+	'Select data' => '데이터를 선택하십시오.',
+	'Select database' => '데이터베이스를 선택하십시오.',
+	'Select' => '선택',
+	'select' => '선택',
+	'Selected' => '선택됨',
+	'Send' => '보내기',
+	'Sequence has been altered.' => '시퀀스를 변경했습니다.',
+	'Sequence has been created.' => '시퀀스를 추가했습니다.',
+	'Sequence has been dropped.' => '시퀀스를 제거했습니다.',
+	'Sequences' => '시퀀스',
+	'Server' => '서버',
+	'Session expired, please login again.' => '세션이 만료되었습니다. 다시 로그인하십시오.',
+	'Session support must be enabled.' => '세션 지원을 사용해야만 합니다.',
+	'Show only errors' => '오류 만 표시',
+	'Show structure' => '구조 표시',
+	'Size' => '크기',
+	'Sort' => '정렬',
+	'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' => '소스',
+	'SQL command' => 'SQL 명령',
+	'Start' => '시작',
+	'Status' => '상태',
+	'Stop on error' => '오류의 경우 중지',
+	'Strings' => '문자열',
+	'Subject' => '제목',
+	'System' => '데이터베이스 형식',
+	'Table has been altered.' => '테이블을 변경했습니다.',
+	'Table has been created.' => '테이블을 만들었습니다.',
+	'Table has been dropped.' => '테이블을 삭제했습니다.',
+	'Table name' => '테이블 이름',
+	'Table' => '테이블',
+	'Tables and views' => '테이블과 뷰',
+	'Tables have been copied.' => '테이블을 복사했습니다',
+	'Tables have been dropped.' => '테이블을 삭제했습니다.',
+	'Tables have been moved.' => '테이블을 옮겼습니다.',
+	'Tables have been truncated.' => '테이블의 데이터 내용만 지웠습니다.',
+	'Tables' => '테이블',
+	'Target table' => '테이블',
+	'Target' => '타겟',
+	'Text length' => '문자열의 길이',
+	'Time' => '시간',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST 데이터가 너무 큽니다. 데이터 크기를 줄이거나 %s 설정을 늘리십시오.',
+	'Trigger has been altered.' => '트리거를 변경했습니다.',
+	'Trigger has been created.' => '트리거를 추가했습니다.',
+	'Trigger has been dropped.' => '트리거를 제거했습니다.',
+	'Triggers' => '트리거',
+	'Truncate' => '데이터 내용만 지우기',
+	'Type has been created.' => '유형을 추가했습니다.',
+	'Type has been dropped.' => '유형을 삭제했습니다.',
+	'Type' => '형',
+	'Unable to select the table' => '테이블을 선택할 수 없습니다.',
+	'Unable to upload a file.' => '파일을 업로드 할 수 없습니다.',
+	'Use edit link to modify this value.' => '이 값을 수정하려면 편집 링크를 사용하십시오.',
+	'Use' => '사용',
+	'User has been altered.' => '사용자를 변경했습니다.',
+	'User has been created.' => '사용자를 만들었습니다.',
+	'User has been dropped.' => '사용자를 제거했습니다.',
+	'Username' => '사용자이름',
+	'Vacuum' => '청소',
+	'Values' => '값',
+	'Variables' => '변수',
+	'View has been altered.' => '보기를 변경했습니다.',
+	'View has been created.' => '보기를 만들었습니다.',
+	'View has been dropped.' => '보기를 삭제했습니다.',
+	'View' => '보기',
+	'Warnings' => '경고',
+	'Webserver file %s' => '웹서버 파일 %s',
+	'Whole result' => '모든 결과',
+	'yes' => '네',
+	'You are offline.' => '오프라인입니다.',
+	'You can upload a big SQL file via FTP and import it from server.' => '큰 SQL 파일은 FTP를 통하여 업로드하여 서버에서 가져올 수 있습니다.',
+	'You have no privileges to update this table.' => '이 테이블을 업데이트할 권한이 없습니다.',
+
+	'Drop %s?' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'User types' => null,
+	'DB' => null,
+	'Ctrl+click on a value to modify it.' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'ATTACH queries are not supported.' => null,
+	'%d / ' => array(),
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'no' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/lt.inc.php

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

adminer/lang/lv.inc.php

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

adminer/lang/ms.inc.php

@@ -0,0 +1,358 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'Sistem',
+	'Server' => 'Pelayan',
+	'Username' => 'Nama pengguna',
+	'Password' => 'Kata laluan',
+	'Permanent login' => 'Log masuk kekal',
+	'Login' => 'Log masuk',
+	'Logout' => 'Log keluar',
+	'Logged as: %s' => 'Log masuk sebagai: %s',
+	'Logout successful.' => 'Log keluar berjaya.',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Terima kasih kerana menggunakan Adminer, pertimbangkan untuk <a href="https://www.adminer.org/en/donation/">menderma</a>.',
+	'Invalid server or credentials.' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => 'Terlalu banyak percubaan log masuk yang gagal, sila cuba lagi dalam masa %d minit.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Kata laluan utama telah luput. <a href="https://www.adminer.org/en/extension/"%s>Gunakan</a> cara %s untuk mengekalkannya.',
+	'Language' => 'Bahasa',
+	'Invalid CSRF token. Send the form again.' => 'Token CSRF tidak sah. Sila hantar borang sekali lagi.',
+	'If you did not send this request from Adminer then close this page.' => 'Jika anda tidak menghantar permintaan ini dari Adminer sila tutup halaman ini.',
+	'No extension' => 'Tiada sambungan',
+	'None of the supported PHP extensions (%s) are available.' => 'Sambungan PHP yang (%s) disokong tidak wujud.',
+	'Connecting to privileged ports is not allowed.' => 'Penyambungan ke port yang istimewa tidak dibenarkan.',
+	'Session support must be enabled.' => 'Sokongan sesi perlu diaktifkan.',
+	'Session expired, please login again.' => 'Sesi telah luput, sila log masuk kembali.',
+	'%s version: %s through PHP extension %s' => 'Versi %s: %s melalui sambungan PHP %s',
+	'Refresh' => 'Segar kembali',
+
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+
+	'Privileges' => 'Keistimewaan',
+	'Create user' => 'Bina pengguna',
+	'User has been dropped.' => 'Pengguna telah dijatuhkan.',
+	'User has been altered.' => 'Pengguna telah diubah.',
+	'User has been created.' => 'Pengguna telah dibuat.',
+	'Hashed' => 'Hashed',
+	'Column' => 'Kolum',
+	'Routine' => 'Rutin',
+	'Grant' => 'Beri',
+	'Revoke' => 'Batal',
+
+	'Process list' => 'Senarai proses',
+	'%d process(es) have been killed.' => '%d proses telah dihentikan.',
+	'Kill' => 'Henti',
+
+	'Variables' => 'Pembolehubah',
+	'Status' => 'Status',
+
+	'SQL command' => 'Arahan SQL',
+	'%d query(s) executed OK.' => '%d query berjaya dilaksanakan.',
+	'Query executed OK, %d row(s) affected.' => 'Query berjaya dilaksanakan, %d baris terjejas.',
+	'No commands to execute.' => 'Tiada arahan untuk dilaksanakan.',
+	'Error in query' => 'Ralat pada query',
+	'ATTACH queries are not supported.' => 'Query berikut tidak disokong.',
+	'Execute' => 'Laksana',
+	'Stop on error' => 'Berhenti jika ralat',
+	'Show only errors' => 'Paparkan jika ralat',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'History' => 'Sejarah',
+	'Clear' => 'Bersih',
+	'Edit all' => 'Ubah semua',
+
+	'File upload' => 'Muat naik fail',
+	'From server' => 'Dari pelayan',
+	'Webserver file %s' => 'Fail pelayan sesawang %s',
+	'Run file' => 'Jalankan fail',
+	'File does not exist.' => 'Fail tidak wujud.',
+	'File uploads are disabled.' => 'Muat naik fail dihalang.',
+	'Unable to upload a file.' => 'Muat naik fail gagal.',
+	'Maximum allowed file size is %sB.' => 'Saiz fail maksimum yang dibenarkan adalah %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Data POST terlalu besar. Kecilkan data atau tingkatkan tetapan %s.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Anda boleh muat naik fail SQL yang besar melalui FTP dan import melalui pelayan.',
+	'You are offline.' => 'Anda sedang offline.',
+
+	'Export' => 'Eksport',
+	'Output' => 'Pengeluaran',
+	'open' => 'buka',
+	'save' => 'simpan',
+	'Saving' => 'Menyimpan',
+	'Format' => 'Format',
+	'Data' => 'Data',
+
+	'Database' => 'Pangkalan data',
+	'database' => 'pangkalan data',
+	'Use' => 'Guna',
+	'Select database' => 'Pilih pangkalan data',
+	'Invalid database.' => 'Pangkalan data tidak sah.',
+	'Database has been dropped.' => 'Pangkalan data telah dijatuhkan.',
+	'Databases have been dropped.' => 'Pangkalan data telah dijatuhkan.',
+	'Database has been created.' => 'Pangkalan data telah dibuat.',
+	'Database has been renamed.' => 'Pangkalan data telah ditukar nama.',
+	'Database has been altered.' => 'Pangkalan data telah diubah.',
+	'Alter database' => 'Ubah pangkalan data',
+	'Create database' => 'Bina pangkalan data',
+	'Database schema' => 'Skema pangkalan data',
+
+	// link to current database schema layout
+	'Permanent link' => 'Pautan kekal',
+
+	// thousands separator - must contain single byte
+	',' => ',',
+	'0123456789' => '0123456789',
+	'Engine' => 'Enjin',
+	'Collation' => 'Collation',
+	'Data Length' => 'Panjang Data',
+	'Index Length' => 'Panjang Indeks',
+	'Data Free' => 'Data Free',
+	'Rows' => 'Baris',
+	'%d in total' => '%d secara keseluruhan',
+	'Analyze' => 'Menganalisis',
+	'Optimize' => 'Mengoptimum',
+	'Vacuum' => 'Vacuum',
+	'Check' => 'Periksa',
+	'Repair' => 'Baiki',
+	'Truncate' => 'Memangkas',
+	'Tables have been truncated.' => 'Jadual telah dimangkaskan.',
+	'Move to other database' => 'Pindahkan ke pangkalan data yang lain',
+	'Move' => 'Pindah',
+	'Tables have been moved.' => 'Jadual telah dipindahkan.',
+	'Copy' => 'Salin',
+	'Tables have been copied.' => 'Jadual telah disalin.',
+
+	'Routines' => 'Rutin',
+	'Routine has been called, %d row(s) affected.' => 'Rutin telah dipanggil, %d baris terjejas.',
+	'Call' => 'Panggil',
+	'Parameter name' => 'Nama pembolehubah',
+	'Create procedure' => 'Bina prosedur',
+	'Create function' => 'Bina fungsi',
+	'Routine has been dropped.' => 'Rutin telah dijatuhkan.',
+	'Routine has been altered.' => 'Rutin telah diubah.',
+	'Routine has been created.' => 'Rutin telah dibuat.',
+	'Alter function' => 'Ubah fungsi',
+	'Alter procedure' => 'Ubah prosedur',
+	'Return type' => 'Jenis Return',
+
+	'Events' => 'Peristiwa',
+	'Event has been dropped.' => 'Peristiwa telah dijatuhkan.',
+	'Event has been altered.' => 'Peristiwa telah diubah.',
+	'Event has been created.' => 'Peristiwa telah dibuat.',
+	'Alter event' => 'Ubah peristiwa',
+	'Create event' => 'Bina peristiwa',
+	'At given time' => 'Pada masa tersebut',
+	'Every' => 'Setiap',
+	'Schedule' => 'Jadual',
+	'Start' => 'Mula',
+	'End' => 'Habis',
+	'On completion preserve' => 'Dalam melestarikan penyelesaian',
+
+	'Tables' => 'Jadual',
+	'Tables and views' => 'Jadual dan pandangan',
+	'Table' => 'Jadual',
+	'No tables.' => 'Tiada jadual.',
+	'Alter table' => 'Ubah jadual',
+	'Create table' => 'Bina jadual',
+	'Table has been dropped.' => 'Jadual telah dijatuhkan.',
+	'Tables have been dropped.' => 'Jadual telah dijatuhkan.',
+	'Tables have been optimized.' => 'Jadual telah dioptimumkan.',
+	'Table has been altered.' => 'Jadual telah diubah.',
+	'Table has been created.' => 'Jadual telah dibuat.',
+	'Table name' => 'Nama jadual',
+	'Show structure' => 'Paparkan struktur',
+	'engine' => 'enjin',
+	'collation' => 'collation',
+	'Column name' => 'Nama kolum',
+	'Type' => 'Jenis',
+	'Length' => 'Kepanjangan',
+	'Auto Increment' => 'Kenaikan Auto',
+	'Options' => 'Pilihan',
+	'Comment' => 'Komen',
+	'Default value' => 'Nilai lalai',
+	'Default values' => 'Nilai lalai',
+	'Drop' => 'Jatuh',
+	'Drop %s?' => 'Jatuhkan %s?',
+	'Are you sure?' => 'Anda pasti?',
+	'Size' => 'Saiz',
+	'Compute' => 'Kira',
+	'Move up' => 'Gerak ke atas',
+	'Move down' => 'Gerak ke bawah',
+	'Remove' => 'Buang',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Bilangan medan telah melebihi had yang dibenarkan. Sila tingkatkan %s.',
+
+	'Partition by' => 'Partition mengikut',
+	'Partitions' => 'Partition',
+	'Partition name' => 'Nama partition',
+	'Values' => 'Nilai',
+
+	'View' => 'Papar',
+	'Materialized view' => 'Paparan yang menjadi kenyataan',
+	'View has been dropped.' => 'Paparan telah dijatuhkan.',
+	'View has been altered.' => 'Paparan telah diubah.',
+	'View has been created.' => 'Paparan telah dibuat.',
+	'Alter view' => 'Ubah paparan',
+	'Create view' => 'Bina paparan',
+
+	'Indexes' => 'Indeks',
+	'Indexes have been altered.' => 'Indeks telah diubah.',
+	'Alter indexes' => 'Ubah indeks',
+	'Add next' => 'Tambah yang seterusnya',
+	'Index Type' => 'Jenis Indeks',
+	'Column (length)' => 'Kolum (kepanjangan)',
+
+	'Foreign keys' => 'Kunci asing',
+	'Foreign key' => 'Kunci asing',
+	'Foreign key has been dropped.' => 'Kunci asing telah dijatuhkan.',
+	'Foreign key has been altered.' => 'Kunci asing telah diubah.',
+	'Foreign key has been created.' => 'Kunci asing telah dibuat.',
+	'Target table' => 'Jadual sasaran',
+	'Change' => 'Tukar',
+	'Source' => 'Sumber',
+	'Target' => 'Sasaran',
+	'Add column' => 'Tambah kolum',
+	'Alter' => 'Ubah',
+	'Add foreign key' => 'Tambah kunci asing',
+	'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.' => 'Kolum sumber dan sasaran perlu mempunyai jenis data yang sama, indeks diperlukan pada kolum sasaran dan data yang dirujuk wujud.',
+
+	'Triggers' => ' Pencetus',
+	'Add trigger' => 'Tambah pencetus',
+	'Trigger has been dropped.' => 'Pencetus telah dijatuhkan.',
+	'Trigger has been altered.' => 'Pencetus telah diubah.',
+	'Trigger has been created.' => 'Pencetus telah dibuat.',
+	'Alter trigger' => 'Ubah pencetus',
+	'Create trigger' => 'Buat pencetus',
+	'Time' => 'Masa',
+	'Event' => 'Peristiwa',
+	'Name' => 'Nama',
+
+	'select' => 'pilih',
+	'Select' => 'Pilih',
+	'Select data' => 'Pilih data',
+	'Functions' => 'Fungsi',
+	'Aggregation' => 'Pengagregatan',
+	'Search' => 'Cari',
+	'anywhere' => 'di mana-mana',
+	'Search data in tables' => 'Cari data dalam jadual',
+	'Sort' => 'Susun',
+	'descending' => 'menurun',
+	'Limit' => 'Had',
+	'Limit rows' => 'Had baris',
+	'Text length' => 'Kepanjangan teks',
+	'Action' => 'Aksi',
+	'Full table scan' => 'Imbasan penuh jadual',
+	'Unable to select the table' => 'Pemilihan jadual tidak berjaya',
+	'No rows.' => 'Tiada baris.',
+	'%d / ' => '%d / ',
+	'%d row(s)' => '%d baris',
+	'Page' => 'Halaman',
+	'last' => 'akhir',
+	'Load more data' => 'Load lebih data',
+	'Loading' => 'Loading',
+	'Whole result' => 'Keputusan keseluruhan',
+	'%d byte(s)' => array('%d byte', '%d bytes'),
+
+	'Import' => 'Import',
+	'%d row(s) have been imported.' => '%d baris telah diimport.',
+	'File must be in UTF-8 encoding.' => 'Fail mesti dalam pengekodan UTF-8.',
+
+	// in-place editing in select
+	'Modify' => 'Pinda',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+click pada nilai untuk meminda.',
+	'Use edit link to modify this value.' => 'Guna pautan ubah untuk meminda nilai ini.',
+
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'Item%s telah dimasukkan.',
+	'Item has been deleted.' => 'Item telah dipadamkan.',
+	'Item has been updated.' => 'Item telah dikemaskini.',
+	'%d item(s) have been affected.' => '%d item telah terjejas.',
+	'New item' => 'Item baru',
+	'original' => 'asli',
+	// label for value '' in enum data type
+	'empty' => 'kosong',
+	'edit' => 'ubah',
+	'Edit' => 'Ubah',
+	'Insert' => 'Masukkan',
+	'Save' => 'Simpan',
+	'Save and continue edit' => 'Simpan dan sambung ubah',
+	'Save and insert next' => 'Simpan dan masukkan seterusnya',
+	'Selected' => 'Terpilih',
+	'Clone' => 'Klon',
+	'Delete' => 'Padam',
+	'You have no privileges to update this table.' => 'Anda tidak mempunyai keistimewaan untuk mengemaskini jadual ini.',
+
+	'E-mail' => 'Emel',
+	'From' => 'Dari',
+	'Subject' => 'Subjek',
+	'Attachments' => 'Lampiran',
+	'Send' => 'Hantar',
+	'%d e-mail(s) have been sent.' => '%d emel telah dihantar.',
+
+	// data type descriptions
+	'Numbers' => 'Nombor',
+	'Date and time' => 'Tarikh dan masa',
+	'Strings' => 'String',
+	'Binary' => 'Binari',
+	'Lists' => 'Senarai',
+	'Network' => 'Rangkaian',
+	'Geometry' => 'Geometri',
+	'Relations' => 'Hubungan',
+
+	'Editor' => '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' => '[yyyy]-mm-dd',
+	// hint for time format - use language equivalents for hour, minute and second shortcuts
+	'HH:MM:SS' => 'HH:MM:SS',
+	'now' => 'sekarang',
+	'yes' => 'ya',
+	'no' => 'tidak',
+
+	// general SQLite error in create, drop or rename database
+	'File exists.' => 'Fail wujud.',
+	'Please use one of the extensions %s.' => 'Sila guna salah satu sambungan %s.',
+
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'Ubah skema',
+	'Create schema' => 'Buat skema',
+	'Schema has been dropped.' => 'Skema telah dijatuhkan.',
+	'Schema has been created.' => 'Skema telah dibuat.',
+	'Schema has been altered.' => 'Skema telah diubah.',
+	'Schema' => 'Skema',
+	'Invalid schema.' => 'Skema tidak sah.',
+
+	// PostgreSQL sequences support
+	'Sequences' => 'Turutan',
+	'Create sequence' => 'Buat turutan',
+	'Sequence has been dropped.' => 'Turutan telah dijatuhkan.',
+	'Sequence has been created.' => 'Turutan telah dibuat.',
+	'Sequence has been altered.' => 'Turutan telah diubah.',
+	'Alter sequence' => 'Ubah turutan',
+
+	// PostgreSQL user types support
+	'User types' => 'Jenis pengguna',
+	'Create type' => 'Buat jenis',
+	'Type has been dropped.' => 'Jenis telah dijatuhkan.',
+	'Type has been created.' => 'Jenis telah dibuat.',
+	'Alter type' => 'Ubah jenis',
+
+	'overwrite' => null,
+	'DB' => null,
+	'Warnings' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ya',
+	'No' => 'Tidak',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+);

adminer/lang/nl.inc.php

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

adminer/lang/no.inc.php

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

adminer/lang/pl.inc.php

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

adminer/lang/pt-br.inc.php

@@ -2,7 +2,7 @@
 $translations = array(
 	'Login' => 'Entrar',
 	'Logout successful.' => 'Saída bem sucedida.',
-	'Invalid credentials.' => 'Identificação inválida.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Servidor',
 	'Username' => 'Usuário',
 	'Password' => 'Senha',
@@ -47,7 +47,7 @@ $translations = array(
 	'Indexes have been altered.' => 'Os Índices foram alterados.',
 	'Indexes' => 'Índices',
 	'Alter indexes' => 'Alterar índices',
-	'Add next' => 'Adicionar proximo',
+	'Add next' => 'Adicionar próximo',
 	'Language' => 'Idioma',
 	'Select' => 'Selecionar',
 	'New item' => 'Novo Registro',
@@ -66,19 +66,19 @@ $translations = array(
 	'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.',
+	'Unable to select the table' => 'Não é possível selecionar a Tabela',
+	'Invalid CSRF token. Send the form again.' => 'Token CSRF inválido. Enviar o formulário 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.',
+	'File uploads are disabled.' => 'Importação de arquivos desabilitada.',
 	'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.',
+	'None of the supported PHP extensions (%s) are available.' => 'Nenhuma das extensões PHP suportadas (%s) está disponível.',
 	'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',
@@ -169,7 +169,7 @@ $translations = array(
 	'Index Length' => 'Tamanho de índice',
 	'Data Free' => 'Espaço Livre',
 	'Collation' => 'Colação',
-	'Analyze' => 'Analizar',
+	'Analyze' => 'Analisar',
 	'Optimize' => 'Otimizar',
 	'Check' => 'Verificar',
 	'Repair' => 'Reparar',
@@ -186,7 +186,7 @@ $translations = array(
 	'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',
+	'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',
@@ -209,7 +209,7 @@ $translations = array(
 	'Maximum allowed file size is %sB.' => 'Tamanho máximo do arquivo permitido é %sB.',
 	'Numbers' => 'Números',
 	'Date and time' => 'Data e hora',
-	'Strings' => 'Cadena',
+	'Strings' => 'Strings',
 	'Binary' => 'Binário',
 	'Lists' => 'Listas',
 	'Editor' => 'Editor',
@@ -260,4 +260,54 @@ $translations = array(
 	'Please use one of the extensions %s.' => 'Por favor use uma das extensões %s.',
 	'now' => 'agora',
 	'ltr' => 'ltr',
+
+	'Drop %s?' => null,
+	'Tables have been copied.' => null,
+	'Tables have been optimized.' => null,
+	'Materialized view' => null,
+	'Vacuum' => null,
+	'Selected' => null,
+	'Copy' => null,
+	'overwrite' => null,
+	'DB' => null,
+	'Permanent link' => null,
+	'File must be in UTF-8 encoding.' => null,
+	'Modify' => null,
+	'Load more data' => null,
+	'Loading' => null,
+	'ATTACH queries are not supported.' => null,
+	'Warnings' => null,
+	'%d / ' => array(),
+	'Limit rows' => null,
+	'Edit all' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'Default value' => null,
+	'Full table scan' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array(),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => null,
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => null,
+	'The action will be performed after successful login with the same credentials.' => null,
+	'Connecting to privileged ports is not allowed.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'If you did not send this request from Adminer then close this page.' => null,
+	'You can upload a big SQL file via FTP and import it from server.' => null,
+	'Size' => null,
+	'Compute' => null,
+	'You are offline.' => null,
+	'You have no privileges to update this table.' => null,
+	'Saving' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+	'yes' => null,
+	'no' => null,
+	'HH:MM:SS' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/pt.inc.php

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

adminer/lang/ro.inc.php

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

adminer/lang/ru.inc.php

@@ -2,19 +2,19 @@
 $translations = array(
 	'Login' => 'Войти',
 	'Logout successful.' => 'Вы успешно покинули систему.',
-	'Invalid credentials.' => 'Неправильное имя пользователя или пароль.',
+	'Invalid server or credentials.' => null,
 	'Server' => 'Сервер',
 	'Username' => 'Имя пользователя',
 	'Password' => 'Пароль',
 	'Select database' => 'Выбрать базу данных',
-	'Invalid 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' => 'Тип',
@@ -29,7 +29,7 @@ $translations = array(
 	'Database has been altered.' => 'База данных была изменена.',
 	'Alter database' => 'Изменить базу данных',
 	'Create database' => 'Создать базу данных',
-	'SQL command' => 'SQL запрос',
+	'SQL command' => 'SQL-запрос',
 	'Logout' => 'Выйти',
 	'database' => 'база данных',
 	'Use' => 'Выбрать',
@@ -67,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 байтов'),
@@ -90,13 +90,13 @@ $translations = array(
 	'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.' => 'Представление было создано.',
@@ -134,11 +134,11 @@ $translations = array(
 	'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' => 'Переместить вниз',
@@ -181,11 +181,11 @@ $translations = array(
 	'Tables have been moved.' => 'Таблицы были перемещены.',
 	'Move to other database' => 'Переместить в другую базу данных',
 	'Move' => 'Переместить',
-	'Engine' => 'Тип',
+	'Engine' => 'Тип таблиц',
 	'Save and continue edit' => 'Сохранить и продолжить редактирование',
 	'original' => 'исходный',
 	'%d item(s) have been affected.' => array('Была изменена %d запись.', 'Были изменены %d записи.', 'Было изменено %d записей.'),
-	'whole result' => 'весь результат',
+	'Whole result' => 'Весь результат',
 	'Tables have been dropped.' => 'Таблицы были удалены.',
 	'Clone' => 'Клонировать',
 	'Partition by' => 'Разделить по',
@@ -202,20 +202,20 @@ $translations = array(
 	'[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 на вебсервере',
@@ -241,7 +241,7 @@ $translations = array(
 	'Alter type' => 'Изменить тип',
 	'Type has been dropped.' => 'Тип удален.',
 	'Type has been created.' => 'Создан новый тип.',
-	'Ctrl+click on a value to modify it.' => 'Ctrl+кликни по значению, чтобы его изменить.',
+	'Ctrl+click on a value to modify it.' => 'Выполните Ctrl+Щелчок мышью по значению, чтобы его изменить.',
 	'Use edit link to modify this value.' => 'Изменить это значение можно с помощью ссылки «изменить».',
 	'last' => 'последняя',
 	'From server' => 'С сервера',
@@ -265,4 +265,49 @@ $translations = array(
 	'Permanent link' => 'Постоянная ссылка',
 	'Edit all' => 'Редактировать всё',
 	'HH:MM:SS' => 'ЧЧ:ММ:СС',
+	'Tables have been optimized.' => 'Таблицы оптимизированы.',
+	'Materialized view' => 'Материализованное представление',
+	'Vacuum' => 'Вакуум',
+	'Selected' => 'Выбранные',
+	'File must be in UTF-8 encoding.' => 'Файл должен быть в кодировке UTF-8.',
+	'Modify' => 'Изменить',
+	'Loading' => 'Загрузка',
+	'Load more data' => 'Загрузить ещё данные',
+	'ATTACH queries are not supported.' => 'ATTACH-запросы не поддерживаются.',
+	'%d / ' => '%d / ',
+	'Limit rows' => 'Лимит строк',
+	'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/"%s>Implement</a> %s method to make it permanent.' => 'Мастер-пароль истёк. <a href="https://www.adminer.org/en/extension/"%s>Реализуйте</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' => 'нет',
+	'Drop %s?' => 'Удалить %s?',
+	'overwrite' => 'перезаписать',
+	'DB' => 'DB',
+	'Warnings' => 'Предупреждения',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer не поддерживает доступ к базе данных без пароля, <a href="https://www.adminer.org/en/password/"%s>больше информации</a>.',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Спасибо за использование Adminer, рассмотрите возможность <a href="https://www.adminer.org/en/donation/">пожертвования</a>.',
+	'The action will be performed after successful login with the same credentials.' => 'Действие будет выполнено после успешного входа в систему с теми же учетными данными.',
+	'Connecting to privileged ports is not allowed.' => 'Подключение к привилегированным портам не допускается.',
+	'There is a space in the input password which might be the cause.' => 'В введеном пароле есть пробел, это может быть причиною.',
+	'Unknown error.' => 'Неизвестная ошибка.',
+	'Database does not support password.' => 'База данных не поддерживает пароль.',
+
+	'Disable %s or enable %s or %s extensions.' => 'Отключите %s или включите расширения %s или %s.',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Да',
+	'No' => 'Нет',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/sk.inc.php

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

adminer/lang/sl.inc.php

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

adminer/lang/sr.inc.php

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

adminer/lang/sv.inc.php

@@ -0,0 +1,357 @@
+<?php
+$translations = array(
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => 'System',
+	'Server' => 'Server',
+	'Username' => 'Användarnamn',
+	'Password' => 'Lösenord',
+	'Permanent login' => 'Permanent inloggning',
+	'Login' => 'Logga in',
+	'Logout' => 'Logga ut',
+	'Logged as: %s' => 'Inloggad som: %s',
+	'Logout successful.' => 'Du är nu utloggad.',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Tack för att du använder Adminer, vänligen fundera över att <a href="https://www.adminer.org/en/donation/">donera</a>.',
+	'Invalid server or credentials.' => null,
+	'There is a space in the input password which might be the cause.' => 'Det finns ett mellanslag i lösenordet, vilket kan vara anledningen.',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer tillåter inte att ansluta till en databas utan lösenord. <a href="https://www.adminer.org/en/password/"%s>Mer information</a>.',
+	'Database does not support password.' => 'Databasen stödjer inte lösenord.',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('För många misslyckade inloggningar, försök igen om %d minut.', 'För många misslyckade inloggningar, försök igen om %d minuter.'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Huvudlösenordet har löpt ut. <a href="https://www.adminer.org/en/extension/"%s>Implementera</a> %s en metod för att göra det permanent.',
+	'Language' => 'Språk',
+	'Invalid CSRF token. Send the form again.' => 'Ogiltig CSRF-token. Skicka formuläret igen.',
+	'If you did not send this request from Adminer then close this page.' => 'Om du inte skickade en förfrågan från Adminer så kan du stänga den här sidan.',
+	'No extension' => 'Inget tillägg',
+	'None of the supported PHP extensions (%s) are available.' => 'Inga av de PHP-tilläggen som stöds (%s) är tillgängliga.',
+	'Connecting to privileged ports is not allowed.' => 'Anslutning till privilegierade portar är inte tillåtet.',
+	'Disable %s or enable %s or %s extensions.' => 'Stäng av %s eller sätt på %s eller %s tilläggen.',
+	'Session support must be enabled.' => 'Support för sessioner måste vara på.',
+	'Session expired, please login again.' => 'Session har löpt ut, vänligen logga in igen.',
+	'The action will be performed after successful login with the same credentials.' => 'Åtgärden kommer att utföras efter en lyckad inloggning med samma inloggningsuppgifter.',
+	'%s version: %s through PHP extension %s' => '%s version: %s genom PHP-tillägg %s',
+	'Refresh' => 'Ladda om',
+
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+
+	'Privileges' => 'Privilegier',
+	'Create user' => 'Skapa användare',
+	'User has been dropped.' => 'Användare har blivit borttagen.',
+	'User has been altered.' => 'Användare har blivit ändrad.',
+	'User has been created.' => 'Användare har blivit skapad.',
+	'Hashed' => 'Hashad',
+	'Column' => 'Kolumn',
+	'Routine' => 'Rutin',
+	'Grant' => 'Tillåt',
+	'Revoke' => 'Neka',
+
+	'Process list' => 'Processlista',
+	'%d process(es) have been killed.' => array('%d process har avslutats.', '%d processer har avslutats.'),
+	'Kill' => 'Avsluta',
+
+	'Variables' => 'Variabler',
+	'Status' => 'Status',
+
+	'SQL command' => 'SQL-kommando',
+	'%d query(s) executed OK.' => array('%d förfrågan lyckades.', '%d förfrågor lyckades.'),
+	'Query executed OK, %d row(s) affected.' => array('Förfrågan lyckades, %d rad påverkades.', 'Förfrågan lyckades, %d rader påverkades.'),
+	'No commands to execute.' => 'Inga kommandon att köra.',
+	'Error in query' => 'Fel i förfrågan',
+	'Unknown error.' => 'Okänt fel.',
+	'Warnings' => 'Varningar',
+	'ATTACH queries are not supported.' => 'ATTACH-förfrågor stöds inte.',
+	'Execute' => 'Kör',
+	'Stop on error' => 'Stanna på fel',
+	'Show only errors' => 'Visa bara fel',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f s',
+	'History' => 'Historia',
+	'Clear' => 'Rensa',
+	'Edit all' => 'Redigera alla',
+
+	'File upload' => 'Ladda upp fil',
+	'From server' => 'Från server',
+	'Webserver file %s' => 'Serverfil %s',
+	'Run file' => 'Kör fil',
+	'File does not exist.' => 'Filen finns inte.',
+	'File uploads are disabled.' => 'Filuppladdningar är avstängda.',
+	'Unable to upload a file.' => 'Det går inte add ladda upp filen.',
+	'Maximum allowed file size is %sB.' => 'Högsta tillåtna storlek är %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'POST-datan är för stor. Minska det eller höj %s-direktivet.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'Du kan ladda upp en stor SQL-fil via FTP och importera det från servern.',
+	'You are offline.' => 'Du är offline.',
+
+	'Export' => 'Exportera',
+	'Output' => 'Utmatning',
+	'open' => 'Öppna',
+	'save' => 'Spara',
+	'Saving' => 'Sparar',
+	'Format' => 'Format',
+	'Data' => 'Data',
+
+	'Database' => 'Databas',
+	'database' => 'databas',
+	'DB' => 'DB',
+	'Use' => 'Använd',
+	'Select database' => 'Välj databas',
+	'Invalid database.' => 'Ogiltig databas.',
+	'Database has been dropped.' => 'Databasen har tagits bort.',
+	'Databases have been dropped.' => 'Databaserna har tagits bort.',
+	'Database has been created.' => 'Databasen har skapats.',
+	'Database has been renamed.' => 'Databasen har fått sitt namn ändrat.',
+	'Database has been altered.' => 'Databasen har ändrats.',
+	'Alter database' => 'Ändra databas',
+	'Create database' => 'Skapa databas',
+	'Database schema' => 'Databasschema',
+
+	// link to current database schema layout
+	'Permanent link' => 'Permanent länk',
+
+	// thousands separator - must contain single byte
+	',' => ',',
+	'0123456789' => '0123456789',
+	'Engine' => 'Motor',
+	'Collation' => 'Kollationering',
+	'Data Length' => 'Datalängd',
+	'Index Length' => 'Indexlängd',
+	'Data Free' => 'Ledig data',
+	'Rows' => 'Rader',
+	'%d in total' => 'totalt %d',
+	'Analyze' => 'Analysera',
+	'Optimize' => 'Optimera',
+	'Vacuum' => 'Städa',
+	'Check' => 'Kolla',
+	'Repair' => 'Reparera',
+	'Truncate' => 'Avkorta',
+	'Tables have been truncated.' => 'Tabeller har blivit avkortade.',
+	'Move to other database' => 'Flytta till en annan databas',
+	'Move' => 'Flytta',
+	'Tables have been moved.' => 'Tabeller har flyttats.',
+	'Copy' => 'Kopiera',
+	'Tables have been copied.' => 'Tabeller har kopierats.',
+	'overwrite' => 'Skriv över',
+
+	'Routines' => 'Rutiner',
+	'Routine has been called, %d row(s) affected.' => array('Rutin har kallats, %d rad påverkades.', 'Rutin har kallats, %d rader påverkades.'),
+	'Call' => 'Kalla',
+	'Parameter name' => 'Namn på parameter',
+	'Create procedure' => 'Skapa procedur',
+	'Create function' => 'Skapa funktion',
+	'Routine has been dropped.' => 'Rutin har tagits bort.',
+	'Routine has been altered.' => 'Rutin har ändrats.',
+	'Routine has been created.' => 'Rutin har skapats.',
+	'Alter function' => 'Ändra funktion',
+	'Alter procedure' => 'Ändra procedur',
+	'Return type' => 'Återvändningstyp',
+
+	'Events' => 'Event',
+	'Event has been dropped.' => 'Event har tagits bort.',
+	'Event has been altered.' => 'Event har ändrats.',
+	'Event has been created.' => 'Event har skapats.',
+	'Alter event' => 'Ändra event',
+	'Create event' => 'Skapa event',
+	'At given time' => 'Vid en tid',
+	'Every' => 'Varje',
+	'Schedule' => 'Schemalägga',
+	'Start' => 'Start',
+	'End' => 'Slut',
+	'On completion preserve' => 'Bibehåll vid slutet',
+
+	'Tables' => 'Tabeller',
+	'Tables and views' => 'Tabeller och vyer',
+	'Table' => 'Tabell',
+	'No tables.' => 'Inga tabeller.',
+	'Alter table' => 'Ändra tabell',
+	'Create table' => 'Skapa tabell',
+	'Table has been dropped.' => 'Tabell har tagits bort.',
+	'Tables have been dropped.' => 'Tabeller har tagits bort.',
+	'Tables have been optimized.' => 'Tabeller har optimerats.',
+	'Table has been altered.' => 'Tabell har ändrats.',
+	'Table has been created.' => 'Tabell har skapats.',
+	'Table name' => 'Tabellnamn',
+	'Show structure' => 'Visa struktur',
+	'engine' => 'motor',
+	'collation' => 'kollationering',
+	'Column name' => 'Kolumnnamn',
+	'Type' => 'Typ',
+	'Length' => 'Längd',
+	'Auto Increment' => 'Automatisk uppräkning',
+	'Options' => 'Inställningar',
+	'Comment' => 'Kommentar',
+	'Default value' => 'Standardvärde',
+	'Default values' => 'Standardvärden',
+	'Drop' => 'Ta bort',
+	'Drop %s?' => 'Ta bort %s?',
+	'Are you sure?' => 'Är du säker?',
+	'Size' => 'Storlek',
+	'Compute' => 'Beräkna',
+	'Move up' => 'Flytta upp',
+	'Move down' => 'Flytta ner',
+	'Remove' => 'Ta bort',
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Högsta nummer tillåtna fält är överskridet. Vänligen höj %s.',
+
+	'Partition by' => 'Partitionera om',
+	'Partitions' => 'Partitioner',
+	'Partition name' => 'Partition',
+	'Values' => 'Värden',
+
+	'View' => 'Vy',
+	'Materialized view' => 'Materialiserad vy',
+	'View has been dropped.' => 'Vy har tagits bort.',
+	'View has been altered.' => 'Vy har ändrats.',
+	'View has been created.' => 'Vy har skapats.',
+	'Alter view' => 'Ändra vy',
+	'Create view' => 'Skapa vy',
+
+	'Indexes' => 'Index',
+	'Indexes have been altered.' => 'Index har ändrats.',
+	'Alter indexes' => 'Ändra index',
+	'Add next' => 'Lägg till nästa',
+	'Index Type' => 'Indextyp',
+	'Column (length)' => 'Kolumn (längd)',
+
+	'Foreign keys' => 'Främmande nycklar',
+	'Foreign key' => 'Främmande nyckel',
+	'Foreign key has been dropped.' => 'Främmande nyckel har tagits bort.',
+	'Foreign key has been altered.' => 'Främmande nyckel har ändrats.',
+	'Foreign key has been created.' => 'Främmande nyckel har skapats.',
+	'Target table' => 'Måltabell',
+	'Change' => 'Ändra',
+	'Source' => 'Källa',
+	'Target' => 'Mål',
+	'Add column' => 'Lägg till kolumn',
+	'Alter' => 'Ändra',
+	'Add foreign key' => 'Lägg till främmande nyckel',
+	'ON DELETE' => 'VID BORTTAGNING',
+	'ON UPDATE' => 'VID UPPDATERING',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Käll- och mål-tabellen måste ha samma datatyp, ett index på målkolumnerna och refererad data måste finnas.',
+
+	'Triggers' => 'Avtryckare',
+	'Add trigger' => 'Lägg till avtryckare',
+	'Trigger has been dropped.' => 'Avtryckare har tagits bort.',
+	'Trigger has been altered.' => 'Avtryckare har ändrats.',
+	'Trigger has been created.' => 'Avtryckare har skapats.',
+	'Alter trigger' => 'Ändra avtryckare',
+	'Create trigger' => 'Skapa avtryckare',
+	'Time' => 'Tid',
+	'Event' => 'Event',
+	'Name' => 'Namn',
+
+	'select' => 'välj',
+	'Select' => 'Välj',
+	'Select data' => 'Välj data',
+	'Functions' => 'Funktioner',
+	'Aggregation' => 'Aggregation',
+	'Search' => 'Sök',
+	'anywhere' => 'överallt',
+	'Search data in tables' => 'Sök data i tabeller',
+	'Sort' => 'Sortera',
+	'descending' => 'Fallande',
+	'Limit' => 'Begränsning',
+	'Limit rows' => 'Begränsa rader',
+	'Text length' => 'Textlängd',
+	'Action' => 'Åtgärd',
+	'Full table scan' => 'Full tabellskanning',
+	'Unable to select the table' => 'Kunde inte välja tabellen',
+	'No rows.' => 'Inga rader.',
+	'%d / ' => '%d / ',
+	'%d row(s)' => array('%d rad', '%d rader'),
+	'Page' => 'Sida',
+	'last' => 'sist',
+	'Load more data' => 'Ladda mer data',
+	'Loading' => 'Laddar',
+	'Whole result' => 'Hela resultatet',
+	'%d byte(s)' => array('%d byte', '%d bytes'),
+
+	'Import' => 'Importera',
+	'%d row(s) have been imported.' => array('%d rad har importerats.', '%d rader har importerats.'),
+	'File must be in UTF-8 encoding.' => 'Filer måste vara i UTF-8-format.',
+
+	// in-place editing in select
+	'Modify' => 'Ändra',
+	'Ctrl+click on a value to modify it.' => 'Ctrl+klicka på ett värde för att ändra det.',
+	'Use edit link to modify this value.' => 'Använd redigeringslänken för att ändra värdet.',
+
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => 'Sak%s har skapats.',
+	'Item has been deleted.' => 'En sak har tagits bort.',
+	'Item has been updated.' => 'En sak har ändrats.',
+	'%d item(s) have been affected.' => array('%d sak har blivit förändrad.', '%d saker har blivit förändrade.'),
+	'New item' => 'Ny sak',
+	'original' => 'original',
+	// label for value '' in enum data type
+	'empty' => 'tom',
+	'edit' => 'redigera',
+	'Edit' => 'Redigera',
+	'Insert' => 'Infoga',
+	'Save' => 'Spara',
+	'Save and continue edit' => 'Spara och fortsätt att redigera',
+	'Save and insert next' => 'Spara och infoga nästa',
+	'Selected' => 'Vald',
+	'Clone' => 'Klona',
+	'Delete' => 'Ta bort',
+	'You have no privileges to update this table.' => 'Du har inga privilegier för att uppdatera den här tabellen.',
+
+	'E-mail' => 'Email',
+	'From' => 'Från',
+	'Subject' => 'Ämne',
+	'Attachments' => 'Bilagor',
+	'Send' => 'Skicka',
+	'%d e-mail(s) have been sent.' => array('%d email har blivit skickat.', '%d email har blivit skickade.'),
+
+	// data type descriptions
+	'Numbers' => 'Nummer',
+	'Date and time' => 'Datum och tid',
+	'Strings' => 'Strängar',
+	'Binary' => 'Binärt',
+	'Lists' => 'Listor',
+	'Network' => 'Nätverk',
+	'Geometry' => 'Geometri',
+	'Relations' => 'Relationer',
+
+	'Editor' => 'Redigerare',
+	// 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' => 'nu',
+	'yes' => 'ja',
+	'no' => 'nej',
+
+	// general SQLite error in create, drop or rename database
+	'File exists.' => 'Filen finns redan.',
+	'Please use one of the extensions %s.' => 'Vänligen använd en av filändelserna %s.',
+
+	// PostgreSQL and MS SQL schema support
+	'Alter schema' => 'Redigera schema',
+	'Create schema' => 'Skapa schema',
+	'Schema has been dropped.' => 'Schema har tagits bort.',
+	'Schema has been created.' => 'Schema har skapats.',
+	'Schema has been altered.' => 'Schema har ändrats.',
+	'Schema' => 'Schema',
+	'Invalid schema.' => 'Ogiltigt schema.',
+
+	// PostgreSQL sequences support
+	'Sequences' => 'Sekvenser',
+	'Create sequence' => 'Skapa sekvens',
+	'Sequence has been dropped.' => 'Sekvens har tagits bort.',
+	'Sequence has been created.' => 'Sekvens har skapats.',
+	'Sequence has been altered.' => 'Sekvens har ändrats.',
+	'Alter sequence' => 'Ändra sekvens',
+
+	// PostgreSQL user types support
+	'User types' => 'Användartyper',
+	'Create type' => 'Skapa typ',
+	'Type has been dropped.' => 'Typ har, typ, tagits bort.',
+	'Type has been created.' => 'Typ har skapats.',
+	'Alter type' => 'Ändra typ',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Ja',
+	'No' => 'Nej',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
+);

adminer/lang/ta.inc.php

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

adminer/lang/th.inc.php

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

adminer/lang/tr.inc.php

@@ -9,14 +9,20 @@ $translations = array(
 	'Login' => 'Giriş',
 	'Logout' => 'Çıkış',
 	'Logged as: %s' => '%s olarak giriş yapıldı.',
-	'Logout successful.' => 'Başarıyla çıkış yapıldı.',
-	'Invalid credentials.' => 'Geçersiz kimlik.',
+	'Logout successful.' => 'Oturum başarıyla sonlandı.',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Adminer kullandığınız için teşekkür ederiz <a href="https://www.adminer.org/en/donation/">bağış yapmayı düşünün</a>.',
+	'Invalid server or credentials.' => null,
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Çok fazla oturum açma denemesi yapıldı.', '%d Dakika sonra tekrar deneyiniz.'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Ana şifrenin süresi doldu. Kalıcı olması için <a href="https://www.adminer.org/en/extension/"%s>%s medodunu</a> kullanın.',
 	'Language' => 'Dil',
 	'Invalid CSRF token. Send the form again.' => 'Geçersiz (CSRF) jetonu. Formu tekrar yolla.',
+	'If you did not send this request from Adminer then close this page.' => 'Bu isteği Adminer\'den göndermediyseniz bu sayfayı kapatın.',
 	'No extension' => 'Uzantı yok',
 	'None of the supported PHP extensions (%s) are available.' => 'Desteklenen PHP eklentilerinden (%s) hiçbiri mevcut değil.',
+	'Connecting to privileged ports is not allowed.' => 'Ayrıcalıklı bağlantı noktalarına bağlanmaya izin verilmiyor.',
 	'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.',
+	'The action will be performed after successful login with the same credentials.' => 'İşlem, aynı kimlik bilgileriyle başarıyla oturum açıldıktan sonra gerçekleştirilecektir.',
 	'%s version: %s through PHP extension %s' => '%s sürüm: %s, %s PHP eklentisi ile',
 	'Refresh' => 'Tazele',
 
@@ -46,6 +52,8 @@ $translations = array(
 	'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',
+	'Warnings' => 'Uyarılar',
+	'ATTACH queries are not supported.' => 'ATTACH sorguları desteklenmiyor.',
 	'Execute' => 'Çalıştır',
 	'Stop on error' => 'Hata oluşursa dur',
 	'Show only errors' => 'Sadece hataları göster.',
@@ -64,16 +72,20 @@ $translations = array(
 	'Unable to upload a file.' => 'Dosya gönderilemiyor.',
 	'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.',
+	'You can upload a big SQL file via FTP and import it from server.' => 'FTP yoluyla büyük bir SQL dosyası yükleyebilir ve sunucudan içe aktarabilirsiniz.',
+	'You are offline.' => 'Çevrimdışısınız.',
 
 	'Export' => 'Dışarı Aktar',
 	'Output' => 'Çıktı',
 	'open' => 'aç',
 	'save' => 'kaydet',
+	'Saving' => 'Saydediliyor',
 	'Format' => 'Biçim',
 	'Data' => 'Veri',
 
 	'Database' => 'Veri Tabanı',
 	'database' => 'veri tabanı',
+	'DB' => 'DB',
 	'Use' => 'Kullan',
 	'Select database' => 'Veri tabanı seç',
 	'Invalid database.' => 'Geçersiz veri tabanı.',
@@ -95,12 +107,13 @@ $translations = array(
 	'Engine' => 'Motor',
 	'Collation' => 'Karşılaştırma',
 	'Data Length' => 'Veri Uzunluğu',
-	'Index Length' => 'Dizin Uzunluğu',
+	'Index Length' => 'İndex Uzunluğu',
 	'Data Free' => 'Boş Veri',
 	'Rows' => 'Kayıtlar',
 	'%d in total' => 'toplam %d',
 	'Analyze' => 'Çözümle',
-	'Optimize' => 'En uygun hale getir',
+	'Optimize' => 'Optimize Et',
+	'Vacuum' => 'Vakumla',
 	'Check' => 'Denetle',
 	'Repair' => 'Tamir Et',
 	'Truncate' => 'Boşalt',
@@ -158,9 +171,13 @@ $translations = array(
 	'Auto Increment' => 'Otomatik Artır',
 	'Options' => 'Seçenekler',
 	'Comment' => 'Yorum',
+	'Default value' => 'Varsayılan değer',
 	'Default values' => 'Varsayılan değerler',
 	'Drop' => 'Sil',
+	'Drop %s?' => 'Sil %s?',
 	'Are you sure?' => 'Emin misiniz?',
+	'Size' => 'Boyut',
+	'Compute' => 'Hesapla',
 	'Move up' => 'Yukarı taşı',
 	'Move down' => 'Aşağı taşı',
 	'Remove' => 'Sil',
@@ -172,17 +189,18 @@ $translations = array(
 	'Values' => 'Değerler',
 
 	'View' => 'Görünüm',
+	'Materialized view' => 'Materialized Görünüm',
 	'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 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ştirildi.',
-	'Alter indexes' => 'Dizinleri değiştir',
+	'Indexes' => 'İndeksler',
+	'Indexes have been altered.' => 'İndeksler değiştirildi.',
+	'Alter indexes' => 'İndeksleri değiştir',
 	'Add next' => 'Bundan sonra ekle',
-	'Index Type' => 'Dizin Türü',
+	'Index Type' => 'İndex Türü',
 	'Column (length)' => 'Kolon (uzunluğu)',
 
 	'Foreign keys' => 'Dış anahtarlar',
@@ -221,25 +239,29 @@ $translations = array(
 	'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',
+	'descending' => 'Azalan',
+	'Limit' => 'Limit',
+	'Limit rows' => 'Satır Limiti',
+	'Text length' => 'Metin Boyutu',
+	'Action' => 'İşlem',
+	'Full table scan' => 'Tam tablo taraması',
 	'Unable to select the table' => 'Tablo seçilemedi',
 	'No rows.' => 'Kayıt yok.',
+	'%d / ' => '%d / ',
 	'%d row(s)' => array('%d kayıt', '%d adet kayıt'),
 	'Page' => 'Sayfa',
 	'last' => 'son',
 	'Load more data' => 'Daha fazla veri yükle',
 	'Loading' => 'Yükleniyor',
-	'whole result' => 'tüm sonuç',
+	'Whole result' => 'Tüm sonuç',
 	'%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ı.'),
+	'File must be in UTF-8 encoding.' => 'Dosya UTF-8 kodlamasında olmalıdır.',
 
 	// in-place editing in select
+	'Modify' => 'Düzenle',
 	'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.',
 
@@ -258,8 +280,10 @@ $translations = array(
 	'Save' => 'Kaydet',
 	'Save and continue edit' => 'Kaydet ve düzenlemeye devam et',
 	'Save and insert next' => 'Kaydet ve sonrakini ekle',
+	'Selected' => 'Seçildi',
 	'Clone' => 'Kopyala',
 	'Delete' => 'Sil',
+	'You have no privileges to update this table.' => 'Bu tabloyu güncellemek için yetkiniz yok.',
 
 	'E-mail' => 'E-posta',
 	'From' => 'Gönderen',
@@ -316,4 +340,19 @@ $translations = array(
 	'Type has been dropped.' => 'Tür silindi.',
 	'Type has been created.' => 'Tür oluşturuldu.',
 	'Alter type' => 'Türü değiştir',
+
+	'overwrite' => null,
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => null,
+	'There is a space in the input password which might be the cause.' => null,
+	'Unknown error.' => null,
+	'Database does not support password.' => null,
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Evet',
+	'No' => 'Hayır',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/uk.inc.php

@@ -10,7 +10,7 @@ $translations = array(
 	'Logout' => 'Вийти',
 	'Logged as: %s' => 'Ви увійшли як: %s',
 	'Logout successful.' => 'Ви вдало вийшли з системи.',
-	'Invalid credentials.' => 'Неправильні дані входу.',
+	'Invalid server or credentials.' => null,
 	'Language' => 'Мова',
 	'Invalid CSRF token. Send the form again.' => 'Недійсний CSRF токен. Надішліть форму ще раз.',
 	'No extension' => 'Нема розширень',
@@ -19,10 +19,10 @@ $translations = array(
 	'Session expired, please login again.' => 'Сесія закінчилась, будь ласка, увійдіть в систему знову.',
 	'%s version: %s through PHP extension %s' => 'Версія %s: %s з PHP-розширенням %s',
 	'Refresh' => 'Оновити',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'ltr',
-	
+
 	'Privileges' => 'Привілеї',
 	'Create user' => 'Створити користувача',
 	'User has been dropped.' => 'Користувача було видалено.',
@@ -33,14 +33,14 @@ $translations = array(
 	'Routine' => 'Процедура',
 	'Grant' => 'Дозволити',
 	'Revoke' => 'Заборонити',
-	
+
 	'Process list' => 'Перелік процесів',
 	'%d process(es) have been killed.' => array('Було завершено %d процес.', 'Було завершено %d процеси.', 'Було завершёно %d процесів.'),
 	'Kill' => 'Завершити процес',
-	
+
 	'Variables' => 'Змінні',
 	'Status' => 'Статус',
-	
+
 	'SQL command' => 'SQL запит',
 	'%d query(s) executed OK.' => array('%d запит виконано успішно.', '%d запити виконано успішно.', '%d запитів виконано успішно.'),
 	'Query executed OK, %d row(s) affected.' => array('Запит виконано успішно, змінено %d рядок.', 'Запит виконано успішно, змінено %d рядки.', 'Запит виконано успішно, змінено %d рядків.'),
@@ -54,7 +54,7 @@ $translations = array(
 	'History' => 'Історія',
 	'Clear' => 'Очистити',
 	'Edit all' => 'Редагувати все',
-	
+
 	'File upload' => 'Завантажити файл',
 	'From server' => 'З сервера',
 	'Webserver file %s' => 'Файл %s на вебсервері',
@@ -64,14 +64,14 @@ $translations = array(
 	'Unable to upload a file.' => 'Неможливо завантажити файл.',
 	'Maximum allowed file size is %sB.' => 'Максимально допустимий розмір файлу %sБ.',
 	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Занадто великий об\'єм POST-даних. Зменшіть об\'єм або збільшіть параметр директиви %s конфигурації.',
-	
+
 	'Export' => 'Експорт',
 	'Output' => 'Вихідні дані',
 	'open' => 'відкрити',
 	'save' => 'зберегти',
 	'Format' => 'Формат',
 	'Data' => 'Дані',
-	
+
 	'Database' => 'База даних',
 	'database' => 'база даних',
 	'Use' => 'Обрати',
@@ -85,10 +85,10 @@ $translations = array(
 	'Alter database' => 'Змінити базу даних',
 	'Create database' => 'Створити базу даних',
 	'Database schema' => 'Схема бази даних',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Постійне посилання',
-	
+
 	// thousands separator - must contain single byte
 	',' => ' ',
 	'0123456789' => '0123456789',
@@ -110,7 +110,7 @@ $translations = array(
 	'Tables have been moved.' => 'Таблиці було перенесено.',
 	'Copy' => 'копіювати',
 	'Tables have been copied.' => 'Таблиці було зкопійовано.',
-	
+
 	'Routines' => 'Збережені процедури',
 	'Routine has been called, %d row(s) affected.' => array('Була викликана процедура, %d запис було змінено.', 'Була викликана процедура, %d записи було змінено.', 'Була викликана процедура, %d записів було змінено.'),
 	'Call' => 'Викликати',
@@ -123,7 +123,7 @@ $translations = array(
 	'Alter function' => 'Змінити функцію',
 	'Alter procedure' => 'Змінити процедуру',
 	'Return type' => 'Тип, що повернеться',
-	
+
 	'Events' => 'Події',
 	'Event has been dropped.' => 'Подію було видалено.',
 	'Event has been altered.' => 'Подію було змінено.',
@@ -136,7 +136,7 @@ $translations = array(
 	'Start' => 'Початок',
 	'End' => 'Кінець',
 	'On completion preserve' => 'Після завершення зберегти',
-	
+
 	'Tables' => 'Таблиці',
 	'Tables and views' => 'Таблиці і вигляди',
 	'Table' => 'Таблиця',
@@ -165,26 +165,26 @@ $translations = array(
 	'Move down' => 'Пересунути вниз',
 	'Remove' => 'Видалити',
 	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Досягнута максимальна кількість доступних полів. Будь ласка, збільшіть %s.',
-	
+
 	'Partition by' => 'Розділити по',
 	'Partitions' => 'Розділи',
 	'Partition name' => 'Назва розділу',
 	'Values' => 'Значення',
-	
+
 	'View' => 'Вигляд',
 	'View has been dropped.' => 'Вигляд було видалено.',
 	'View has been altered.' => 'Вигляд було змінено.',
 	'View has been created.' => 'Вигляд було створено.',
 	'Alter view' => 'Змінити вигляд',
 	'Create view' => 'Створити вигляд',
-	
+
 	'Indexes' => 'Індекси',
 	'Indexes have been altered.' => 'Індексування було змінено.',
 	'Alter indexes' => 'Змінити індексування',
 	'Add next' => 'Додати ще',
 	'Index Type' => 'Тип індексу',
 	'Column (length)' => 'Стовпець (довжина)',
-	
+
 	'Foreign keys' => 'Зовнішні ключі',
 	'Foreign key' => 'Зовнішній ключ',
 	'Foreign key has been dropped.' => 'Зовнішній ключ було видалено.',
@@ -200,7 +200,7 @@ $translations = array(
 	'ON DELETE' => 'ПРИ ВИДАЛЕННІ',
 	'ON UPDATE' => 'ПРИ ЗМІНІ',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Стовпці повинні мати той самий тип даних, цільові стовпці повинні бути проіндексовані і дані, на які посилаються повинні існувати.',
-	
+
 	'Triggers' => 'Тригери',
 	'Add trigger' => 'Додати тригер',
 	'Trigger has been dropped.' => 'Тригер було видалено.',
@@ -211,7 +211,7 @@ $translations = array(
 	'Time' => 'Час',
 	'Event' => 'Подія',
 	'Name' => 'Назва',
-	
+
 	'select' => 'вибрати',
 	'Select' => 'Вибрати',
 	'Select data' => 'Вибрати дані',
@@ -230,16 +230,16 @@ $translations = array(
 	'%d row(s)' => array('%d рядок', '%d рядки', '%d рядків'),
 	'Page' => 'Сторінка',
 	'last' => 'остання',
-	'whole result' => 'весь результат',
+	'Whole result' => 'Весь результат',
 	'%d byte(s)' => array('%d байт', '%d байта', '%d байтів'),
-	
+
 	'Import' => 'Імпортувати',
 	'%d row(s) have been imported.' => array('%d рядок було імпортовано.', '%d рядки було імпортовано.', '%d рядків було імпортовано.'),
-	
+
 	// in-place editing in select
 	'Ctrl+click on a value to modify it.' => 'Ctrl+клікніть на значенні щоб змінити його.',
 	'Use edit link to modify this value.' => 'Використовуйте посилання щоб змінити це значення.',
-	
+
 	// %s can contain auto-increment value
 	'Item%s has been inserted.' => 'Запис%s було вставлено.',
 	'Item has been deleted.' => 'Запис було видалено.',
@@ -257,24 +257,24 @@ $translations = array(
 	'Save and insert next' => 'Зберегти і вставити знову',
 	'Clone' => 'Клонувати',
 	'Delete' => 'Видалити',
-	
+
 	'E-mail' => 'E-mail',
 	'From' => 'Від',
 	'Subject' => 'Заголовок',
 	'Attachments' => 'Додатки',
 	'Send' => 'Надіслати',
 	'%d e-mail(s) have been sent.' => array('Було надіслано %d повідомлення.', 'Було надіслано %d повідомлення.', 'Було надіслано %d повідомлень.'),
-	
+
 	// data type descriptions
 	'Numbers' => 'Числа',
 	'Date and time' => 'Дата і час',
-	'Strings' => 'Радки',
+	'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',
@@ -285,11 +285,11 @@ $translations = array(
 	'now' => 'зараз',
 	'yes' => 'так',
 	'no' => 'ні',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Файл існує.',
 	'Please use one of the extensions %s.' => 'Будь ласка, використовуйте одне з розширень %s.',
-	
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Змінити схему',
 	'Create schema' => 'Створити схему',
@@ -298,7 +298,7 @@ $translations = array(
 	'Schema has been altered.' => 'Схему було змінено.',
 	'Schema' => 'Схема',
 	'Invalid schema.' => 'Невірна схема.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Послідовності',
 	'Create sequence' => 'Створити послідовність',
@@ -306,11 +306,53 @@ $translations = array(
 	'Sequence has been created.' => 'Послідовність було створено.',
 	'Sequence has been altered.' => 'Послідовність було змінено.',
 	'Alter sequence' => 'Змінити послідовність',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Типи користувачів',
 	'Create type' => 'Створити тип',
 	'Type has been dropped.' => 'Тип було видалено.',
 	'Type has been created.' => 'Тип було створено.',
 	'Alter type' => 'Змінити тип',
+	'Drop %s?' => 'Вилучити %s?',
+	'Materialized view' => 'Матеріалізований вигляд',
+	'Selected' => 'Вибрані',
+	'overwrite' => 'перезаписати',
+	'DB' => 'DB',
+	'File must be in UTF-8 encoding.' => 'Файл повинен бути в кодуванні UTF-8.',
+	'Modify' => 'Змінити',
+	'Load more data' => 'Завантажити ще дані',
+	'Loading' => 'Завантаження',
+	'ATTACH queries are not supported.' => 'ATTACH-запити не підтримуються.',
+	'Warnings' => 'Попередження',
+	'Limit rows' => 'Обмеження рядків',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer не підтримує доступ до бази даних без пароля, <a href="https://www.adminer.org/en/password/"%s>більше інформації</a>.',
+	'Default value' => 'Значення за замовчуванням',
+	'Full table scan' => 'Повне сканування таблиці',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Занадто багато невдалих спроб входу. Спробуйте знову через %d хвилину.', 'Занадто багато невдалих спроб входу. Спробуйте знову через %d хвилини.', 'Занадто багато невдалих спроб входу. Спробуйте знову через %d хвилин.'),
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Дякуємо, що користуєтесь Adminer, подумайте про <a href="https://www.adminer.org/en/donation/">внесок</a>.',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => 'Термін дії майстер пароля минув. <a href="https://www.adminer.org/en/extension/"%s>Реалізуйте</a> метод %s, щоб зробити його постійним.',
+	'The action will be performed after successful login with the same credentials.' => 'Дія буде виконуватися після успішного входу в систему з тими ж обліковими даними.',
+	'Connecting to privileged ports is not allowed.' => 'Підключення до привілейованих портів заборонено.',
+	'There is a space in the input password which might be the cause.' => 'У вхідному паролі є пробіл, який може бути причиною.',
+	'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' => 'Збереження',
+	'Unknown error.' => 'Невідома помилка.',
+	'Database does not support password.' => 'База даних не підтримує пароль.',
+
+	'Vacuum' => null,
+	'%d / ' => array(),
+	'Disable %s or enable %s or %s extensions.' => null,
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => 'Так',
+	'No' => 'Ні',
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/vi.inc.php

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

adminer/lang/xx.inc.php

@@ -8,25 +8,31 @@ $translations = array(
 	'Permanent login' => 'Xx',
 	'Login' => 'Xx',
 	'Logout' => 'Xx',
-	'Logged as: %s' => 'Xx',
+	'Logged as: %s' => 'Xx: %s',
 	'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.',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => 'Xx <a href="https://www.adminer.org/en/donation/">xx</a>.',
+	'Invalid server or credentials.' => 'Xx.',
+	'There is a space in the input password which might be the cause.' => 'Xx.',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Xx, <a href="https://www.adminer.org/en/password/"%s>xx</a>.',
+	'Database does not support password.' => 'Xx.',
+	'Too many unsuccessful logins, try again in %d minute(s).' => array('Xx %d.', 'Xx %d.'),
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => '<a href="https://www.adminer.org/en/extension/"%s>Xx</a> %s 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.',
+	'None of the supported PHP extensions (%s) are available.' => 'Xx (%s).',
+	'Connecting to privileged ports is not allowed.' => 'Xx.',
+	'Disable %s or enable %s or %s extensions.' => 'Xx %s xx %s xx %s xx.',
 	'Session support must be enabled.' => 'Xx.',
 	'Session expired, please login again.' => 'Xx.',
-	'%s version: %s through PHP extension %s' => 'Xx',
+	'The action will be performed after successful login with the same credentials.' => 'Xx.',
+	'%s version: %s through PHP extension %s' => '%s xx: %s xx %s',
 	'Refresh' => 'Xx',
-	
+
 	// text direction - 'ltr' or 'rtl'
 	'ltr' => 'xx',
-	
+
 	'Privileges' => 'Xx',
 	'Create user' => 'Xx',
 	'User has been dropped.' => 'Xx.',
@@ -37,45 +43,43 @@ $translations = array(
 	'Routine' => 'Xx',
 	'Grant' => 'Xx',
 	'Revoke' => 'Xx',
-	
+
 	'Process list' => 'Xx',
-	'%d process(es) have been killed.' => array('Xx.', 'Xx.'),
+	'%d process(es) have been killed.' => array('%d xx.', '%d xx.'),
 	'Kill' => 'Xx',
-	
+
 	'Variables' => 'Xx',
 	'Status' => '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.'),
+	'%d query(s) executed OK.' => array('%d xx.', '%d xx.'),
+	'Query executed OK, %d row(s) affected.' => array('Xx, %d.', 'Xx, %d.'),
 	'No commands to execute.' => 'Xx.',
 	'Error in query' => 'Xx',
+	'Unknown error.' => 'Xx.',
+	'Warnings' => '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',
+	'%.3f s' => '%.3f xx',
 	'History' => 'Xx',
 	'Clear' => 'Xx',
 	'Edit all' => 'Xx',
-	
+
 	'File upload' => 'Xx',
 	'From server' => 'Xx',
-	'Webserver file %s' => 'Xx',
+	'Webserver file %s' => 'Xx %s',
 	'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.',
+	'Maximum allowed file size is %sB.' => 'Xx %sB.',
+	'Too big POST data. Reduce the data or increase the %s configuration directive.' => 'Xx %s.',
 	'You can upload a big SQL file via FTP and import it from server.' => 'Xx.',
 	'You are offline.' => 'Xx.',
-	
+
 	'Export' => 'Xx',
 	'Output' => 'Xx',
 	'open' => 'xx',
@@ -83,9 +87,10 @@ $translations = array(
 	'Saving' => 'Xx',
 	'Format' => 'Xx',
 	'Data' => 'Xx',
-	
+
 	'Database' => 'Xx',
 	'database' => 'xx',
+	'DB' => 'XX',
 	'Use' => 'Xx',
 	'Select database' => 'Xx',
 	'Invalid database.' => 'Xx.',
@@ -97,10 +102,10 @@ $translations = array(
 	'Alter database' => 'Xx',
 	'Create database' => 'Xx',
 	'Database schema' => 'Xx',
-	
+
 	// link to current database schema layout
 	'Permanent link' => 'Xx',
-	
+
 	// thousands separator - must contain single byte
 	',' => 'x',
 	'0123456789' => 'xxxxxxxxxx',
@@ -110,7 +115,7 @@ $translations = array(
 	'Index Length' => 'Xx',
 	'Data Free' => 'Xx',
 	'Rows' => 'Xx',
-	'%d in total' => 'xx',
+	'%d in total' => '%d xx',
 	'Analyze' => 'Xx',
 	'Optimize' => 'Xx',
 	'Vacuum' => 'Xx',
@@ -123,9 +128,10 @@ $translations = array(
 	'Tables have been moved.' => 'Xx.',
 	'Copy' => 'Xx',
 	'Tables have been copied.' => 'Xx.',
-	
+	'overwrite' => 'xx',
+
 	'Routines' => 'Xx',
-	'Routine has been called, %d row(s) affected.' => array('Xx.', 'Xx.'),
+	'Routine has been called, %d row(s) affected.' => array('Xx, %d.', 'Xx, %d.'),
 	'Call' => 'Xx',
 	'Parameter name' => 'Xx',
 	'Create procedure' => 'Xx',
@@ -136,7 +142,7 @@ $translations = array(
 	'Alter function' => 'Xx',
 	'Alter procedure' => 'Xx',
 	'Return type' => 'Xx',
-	
+
 	'Events' => 'Xx',
 	'Event has been dropped.' => 'Xx.',
 	'Event has been altered.' => 'Xx.',
@@ -149,7 +155,7 @@ $translations = array(
 	'Start' => 'Xx',
 	'End' => 'Xx',
 	'On completion preserve' => 'Xx',
-	
+
 	'Tables' => 'Xx',
 	'Tables and views' => 'Xx',
 	'Table' => 'Xx',
@@ -174,19 +180,20 @@ $translations = array(
 	'Default value' => 'Xx',
 	'Default values' => 'Xx',
 	'Drop' => 'Xx',
-	'Are you sure?' => 'Xx',
+	'Drop %s?' => 'Xx %s?',
+	'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.',
-	
+	'Maximum number of allowed fields exceeded. Please increase %s.' => 'Xx %s.',
+
 	'Partition by' => 'Xx',
 	'Partitions' => 'Xx',
 	'Partition name' => 'Xx',
 	'Values' => 'Xx',
-	
+
 	'View' => 'Xx',
 	'Materialized view' => 'Xx',
 	'View has been dropped.' => 'Xx.',
@@ -194,14 +201,14 @@ $translations = array(
 	'View has been created.' => 'Xx.',
 	'Alter view' => 'Xx',
 	'Create view' => 'Xx',
-	
+
 	'Indexes' => 'Xx',
 	'Indexes have been altered.' => 'Xx.',
 	'Alter indexes' => 'Xx',
 	'Add next' => 'Xx',
 	'Index Type' => 'Xx',
 	'Column (length)' => 'Xx',
-	
+
 	'Foreign keys' => 'Xx',
 	'Foreign key' => 'Xx',
 	'Foreign key has been dropped.' => 'Xx.',
@@ -217,7 +224,7 @@ $translations = array(
 	'ON DELETE' => 'Xx',
 	'ON UPDATE' => 'Xx',
 	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => 'Xx.',
-	
+
 	'Triggers' => 'Xx',
 	'Add trigger' => 'Xx',
 	'Trigger has been dropped.' => 'Xx.',
@@ -228,7 +235,7 @@ $translations = array(
 	'Time' => 'Xx',
 	'Event' => 'Xx',
 	'Name' => 'Xx',
-	
+
 	'select' => 'xx',
 	'Select' => 'Xx',
 	'Select data' => 'Xx',
@@ -246,29 +253,29 @@ $translations = array(
 	'Full table scan' => 'Xx',
 	'Unable to select the table' => 'Xx',
 	'No rows.' => 'Xx.',
-	'%d / ' => 'xx',
-	'%d row(s)' => array('xx', 'xx'),
+	'%d / ' => '%d / ',
+	'%d row(s)' => array('%d xx', '%d xx'),
 	'Page' => 'Xx',
 	'last' => 'xx',
 	'Load more data' => 'Xx',
 	'Loading' => 'Xx',
-	'whole result' => 'xx',
-	'%d byte(s)' => array('xx', 'xx'),
-	
+	'Whole result' => 'Xx',
+	'%d byte(s)' => array('%d xx', '%d xx'),
+
 	'Import' => 'Xx',
-	'%d row(s) have been imported.' => array('Xx.', 'Xx.'),
+	'%d row(s) have been imported.' => array('%d xx.', '%d xx.'),
 	'File must be in UTF-8 encoding.' => 'Xx.',
-	
+
 	// in-place editing in select
 	'Modify' => 'Xx',
 	'Ctrl+click on a value to modify it.' => 'Xx.',
 	'Use edit link to modify this value.' => 'Xx.',
-	
+
 	// %s can contain auto-increment value
-	'Item%s has been inserted.' => 'Xx.',
+	'Item%s has been inserted.' => 'Xx%s.',
 	'Item has been deleted.' => 'Xx.',
 	'Item has been updated.' => 'Xx.',
-	'%d item(s) have been affected.' => array('Xx.', 'Xx.'),
+	'%d item(s) have been affected.' => array('%d xx.', '%d xx.'),
 	'New item' => 'Xx',
 	'original' => 'xx',
 	// label for value '' in enum data type
@@ -283,14 +290,14 @@ $translations = array(
 	'Clone' => 'Xx',
 	'Delete' => 'Xx',
 	'You have no privileges to update this table.' => 'Xx.',
-	
+
 	'E-mail' => 'Xx',
 	'From' => 'Xx',
 	'Subject' => 'Xx',
 	'Attachments' => 'Xx',
 	'Send' => 'Xx',
-	'%d e-mail(s) have been sent.' => array('Xx.', 'Xx.'),
-	
+	'%d e-mail(s) have been sent.' => array('%d xx.', '%d xx.'),
+
 	// data type descriptions
 	'Numbers' => 'Xx',
 	'Date and time' => 'Xx',
@@ -300,7 +307,7 @@ $translations = array(
 	'Network' => 'Xx',
 	'Geometry' => 'Xx',
 	'Relations' => 'Xx',
-	
+
 	'Editor' => 'Xx',
 	// date format in Editor: $1 yyyy, $2 yy, $3 mm, $4 m, $5 dd, $6 d
 	'$1-$3-$5' => 'xx',
@@ -311,11 +318,11 @@ $translations = array(
 	'now' => 'xx',
 	'yes' => 'xx',
 	'no' => 'xx',
-	
+
 	// general SQLite error in create, drop or rename database
 	'File exists.' => 'Xx.',
-	'Please use one of the extensions %s.' => 'Xx.',
-	
+	'Please use one of the extensions %s.' => 'Xx %s.',
+
 	// PostgreSQL and MS SQL schema support
 	'Alter schema' => 'Xx',
 	'Create schema' => 'Xx',
@@ -324,7 +331,7 @@ $translations = array(
 	'Schema has been altered.' => 'Xx.',
 	'Schema' => 'Xx',
 	'Invalid schema.' => 'Xx.',
-	
+
 	// PostgreSQL sequences support
 	'Sequences' => 'Xx',
 	'Create sequence' => 'Xx',
@@ -332,11 +339,20 @@ $translations = array(
 	'Sequence has been created.' => 'Xx.',
 	'Sequence has been altered.' => 'Xx.',
 	'Alter sequence' => 'Xx',
-	
+
 	// PostgreSQL user types support
 	'User types' => 'Xx',
 	'Create type' => 'Xx',
 	'Type has been dropped.' => 'Xx.',
 	'Type has been created.' => 'Xx.',
 	'Alter type' => 'Xx',
+
+	// Plugins
+	'Columns' => 'Xx',
+	'Nullable' => 'Xx',
+	'Default' => 'Xx',
+	'Yes' => 'Xx',
+	'No' => 'Xx',
+	'One Time Password' => 'Xx',
+	'Invalid OTP code.' => 'Xx.',
 );

adminer/lang/zh-tw.inc.php

@@ -1,119 +1,231 @@
 <?php
 $translations = array(
-	'Login' => '登入',
-	'Logout successful.' => '成功登出。',
-	'Invalid credentials.' => '無效的憑證。',
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => '資料庫系統',
 	'Server' => '伺服器',
 	'Username' => '帳號',
 	'Password' => '密碼',
+	'Permanent login' => '永久登入',
+	'Login' => '登入',
+	'Logout' => '登出',
+	'Logged as: %s' => '登錄為： %s',
+	'Logout successful.' => '成功登出。',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => '感謝使用Adminer，請考慮為我們<a href="https://www.adminer.org/en/donation/">捐款（英文網頁）</a>.',
+	'Invalid server or credentials.' => null,
+	'There is a space in the input password which might be the cause.' => '您輸入的密碼中有一個空格，這可能是導致問題的原因。',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer預設不支援訪問沒有密碼的資料庫，<a href="https://www.adminer.org/en/password/"%s>詳情見這裡</a>.',
+	'Database does not support password.' => '資料庫不支援密碼。',
+	'Too many unsuccessful logins, try again in %d minute(s).' => '登錄失敗次數過多，請 %d 分鐘後重試。',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => '主密碼已過期。<a href="https://www.adminer.org/en/extension/"%s>請擴展</a> %s 方法讓它永久化。',
+	'Language' => '語言',
+	'Invalid CSRF token. Send the form again.' => '無效的 CSRF token。請重新發送表單。',
+	'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）。',
+	'Connecting to privileged ports is not allowed.' => '不允許連接到特權埠。',
+	'Disable %s or enable %s or %s extensions.' => '禁用 %s 或啟用 %s 或 %s 擴充模組。',
+	'Session support must be enabled.' => 'Session 必須被啟用。',
+	'Session expired, please login again.' => 'Session 已過期，請重新登入。',
+	'The action will be performed after successful login with the same credentials.' => '此操作將在成功使用相同的憑據登錄後執行。',
+	'%s version: %s through PHP extension %s' => '%s 版本：%s 透過 PHP 擴充模組 %s',
+	'Refresh' => '重新載入',
+
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+
+	'Privileges' => '權限',
+	'Create user' => '建立使用者',
+	'User has been dropped.' => '已刪除使用者。',
+	'User has been altered.' => '已修改使用者。',
+	'User has been created.' => '已建立使用者。',
+	'Hashed' => 'Hashed',
+	'Column' => '欄位',
+	'Routine' => '程序',
+	'Grant' => '授權',
+	'Revoke' => '廢除',
+
+	'Process list' => '處理程序列表',
+	'%d process(es) have been killed.' => '%d 個 Process(es) 被終止',
+	'Kill' => '終止',
+
+	'Variables' => '變數',
+	'Status' => '狀態',
+
+	'SQL command' => 'SQL 命令',
+	'%d query(s) executed OK.' => '已順利執行 %d 個查詢。',
+	'Query executed OK, %d row(s) affected.' => '執行查詢 OK，%d 行受影響。',
+	'No commands to execute.' => '沒有命令可執行。',
+	'Error in query' => '查詢發生錯誤',
+	'Unknown error.' => '未知錯誤。',
+	'Warnings' => '警告',
+	'ATTACH queries are not supported.' => '不支援ATTACH查詢。',
+	'Execute' => '執行',
+	'Stop on error' => '出錯時停止',
+	'Show only errors' => '僅顯示錯誤訊息',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f 秒',
+	'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.' => 'POST 資料太大。減少資料或者增加 %s 的設定值。',
+	'You can upload a big SQL file via FTP and import it from server.' => '您可以通過FTP上傳大型SQL檔並從伺服器導入。',
+	'You are offline.' => '您離線了。',
+
+	'Export' => '匯出',
+	'Output' => '輸出',
+	'open' => '打開',
+	'save' => '儲存',
+	'Saving' => '保存中',
+	'Format' => '格式',
+	'Data' => '資料',
+
+	'Database' => '資料庫',
+	'database' => '資料庫',
+	'DB' => '資料庫',
+	'Use' => '使用',
 	'Select database' => '選擇資料庫',
 	'Invalid database.' => '無效的資料庫。',
-	'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.' => '資料庫已刪除。',
+	'Databases have 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 updated.' => '已更新項目。',
-	'Item%s has been inserted.' => '已新增項目%s。',
-	'Edit' => '編輯',
-	'Insert' => '新增',
-	'Save and insert next' => '儲存並新增下一筆',
-	'Delete' => '刪除',
-	'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' => '整理（Vacuum）',
+	'Check' => '檢查',
+	'Repair' => '修復',
+	'Truncate' => '清空',
+	'Tables have been truncated.' => '已清空資料表。',
+	'Move to other database' => '轉移到其它資料庫',
+	'Move' => '轉移',
+	'Tables have been moved.' => '已轉移資料表。',
+	'Copy' => '複製',
+	'Tables have been copied.' => '資料表已經複製',
+	'overwrite' => '覆蓋',
+
 	'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.' => '執行查詢OK，%d行受影響',
-	'Error in query' => '查詢發生錯誤',
-	'Execute' => '執行',
-	'Table' => '資料表',
-	'Foreign keys' => '外來鍵',
-	'Triggers' => '觸發器',
-	'View' => '檢視表',
-	'Unable to select the table' => '無法選擇該資料表',
-	'Invalid CSRF token. Send the form again.' => '無效的 CSRF token。請重新發送表單。',
-	'Comment' => '註解',
-	'Default values' => '預設值',
-	'%d byte(s)' => '%d byte(s)',
-	'No commands to execute.' => '沒有命令可執行。',
-	'Unable to upload a file.' => '無法上傳檔案。',
-	'File upload' => '檔案上傳',
-	'File uploads are disabled.' => '檔案上傳已經被停用。',
-	'Routine has been called, %d row(s) affected.' => '程序已被執行，%d行被影響',
+	'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' => 'Text 長度',
-	'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)' => '列（長度）',
+	'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' => '刪除',
+	'Drop %s?' => '刪除 %s?',
+	'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' => '建立檢視表',
-	'Name' => '名稱',
-	'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 created.' => '已建立子程序。',
-	'Alter function' => '修改函數',
-	'Alter procedure' => '修改過程',
-	'Return type' => '回傳類型',
+
+	'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 DELETE',
+	'ON UPDATE' => 'ON UPDATE',
+	'Source and target columns must have the same data type, there must be an index on the target columns and referenced data must exist.' => '來源列和目標列必須具有相同的資料類型，在目標列上必須有一個索引並且引用的資料必須存在。',
+
+	'Triggers' => '觸發器',
 	'Add trigger' => '建立觸發器',
 	'Trigger has been dropped.' => '已刪除觸發器。',
 	'Trigger has been altered.' => '已修改觸發器。',
@@ -122,146 +234,125 @@ $translations = array(
 	'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' => '函數',
+	'Name' => '名稱',
+
+	'select' => '選擇',
+	'Select' => '選擇',
+	'Select data' => '選擇資料',
+	'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.' => '已清空資料表。',
-	'Tables have been moved.' => '已轉移資料表。',
-	'Tables and views' => '資料表和檢視表',
-	'Engine' => '引擎',
-	'Collation' => '校對',
-	'Data Length' => '資料長度',
-	'Index Length' => '索引長度',
-	'Data Free' => '資料空閒',
-	'Rows' => '行數',
-	',' => ',',
-	'0123456789' => '0123456789',
-	'Analyze' => '分析',
-	'Optimize' => '最佳化',
-	'Check' => '檢查',
-	'Repair' => '修復',
-	'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行。',
+	'Search' => '搜尋',
 	'anywhere' => '任意位置',
+	'Search data in tables' => '在資料庫搜尋',
+	'Sort' => '排序',
+	'descending' => '降冪 (遞減)',
+	'Limit' => '限定',
+	'Limit rows' => '限制行數',
+	'Text length' => 'Text 長度',
+	'Action' => '動作',
+	'Full table scan' => '全資料表掃描',
+	'Unable to select the table' => '無法選擇該資料表',
+	'No rows.' => '沒有資料行。',
+	'%d / ' => '%d / ',
+	'%d row(s)' => '%d 行',
+	'Page' => '頁',
+	'last' => '最後一頁',
+	'Load more data' => '載入更多資料',
+	'Loading' => '載入中',
+	'Whole result' => '所有結果',
+	'%d byte(s)' => '%d byte(s)',
+
 	'Import' => '匯入',
-	'Stop on error' => '出錯時停止',
-	'%.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',
+	'%d row(s) have been imported.' => '已匯入 %d 行。',
+	'File must be in UTF-8 encoding.' => '檔必須使用UTF-8編碼。',
+
+	// in-place editing in select
+	'Modify' => '修改',
+	'Ctrl+click on a value to modify it.' => '按住Ctrl並按一下某個值進行修改。',
+	'Use edit link to modify this value.' => '使用編輯連結來修改。',
+
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => '已新增項目 %s。',
+	'Item has been deleted.' => '該項目已被刪除',
+	'Item has been updated.' => '已更新項目。',
+	'%d item(s) have been affected.' => '%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' => '電子郵件',
+	'From' => '來自',
+	'Subject' => '主旨',
+	'Attachments' => '附件',
+	'Send' => '寄出',
+	'%d e-mail(s) have been sent.' => '已寄出 %d 封郵件。',
+
+	// data type descriptions
 	'Numbers' => '數字',
 	'Date and time' => '日期時間',
 	'Strings' => '字串',
 	'Binary' => '二進位',
 	'Lists' => '列表',
+	'Network' => '網路',
+	'Geometry' => '幾何',
+	'Relations' => '關聯',
+
 	'Editor' => '編輯器',
-	'E-mail' => '電子郵件',
-	'From' => '來自',
-	'Subject' => '主旨',
-	'Send' => '寄出',
-	'%d e-mail(s) have been sent.' => '已寄出 %d 封郵件。',
-	'Webserver file %s' => '網頁伺服器檔案 %s',
-	'File does not exist.' => '檔案不存在',
-	'Item has been deleted.' => '該項目已被刪除',
-	'%d in total' => '總共 %d 個',
-	'Permanent login' => '永久登入',
-	'Table has been dropped.' => '已經刪除資料表。',
-	'Databases have been dropped.' => '資料庫已刪除。',
-	'Search data in tables' => '在資料庫搜尋',
-	'Schema' => '資料表結構',
+	// 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' => '現在',
+	'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' => '建立序列',
-	'Alter sequence' => '修改序列',
 	'Sequence has been dropped.' => '已刪除序列。',
 	'Sequence has been created.' => '已建立序列。',
 	'Sequence has been altered.' => '已修改序列。',
+	'Alter sequence' => '修改序列',
+
+	// PostgreSQL user types support
 	'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' => '資料庫系統',
-	'Select data' => '選擇資料',
-	'Show structure' => '顯示結構',
-	'empty' => '空值',
-	'Network' => '網路',
-	'Geometry' => '幾何',
-	'File exists.' => '檔案已存在。',
-	'Attachments' => '附件',
-	'%d query(s) executed OK.' => '已順利執行 %d 個查詢。',
-	'Show only errors' => '僅顯示錯誤訊息',
-	'Refresh' => '重新載入',
-	'Invalid schema.' => '無效的資料表結構。',
-	'Please use one of the extensions %s.' => '請使用下列其中一個擴充模組 %s。',
-	'now' => '現在',
-	'ltr' => 'ltr',
-	'Tables have been copied.' => '資料表已經複製',
-	'Copy' => '複製',
-	'Permanent link' => '永久連結',
-	'Edit all' => '編輯全部',
-	'HH:MM:SS' => 'HH:MM:SS',
+	'Alter type' => '修改類型',
+
+	// Plugins
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/lang/zh.inc.php

@@ -1,133 +1,38 @@
 <?php
 $translations = array(
-	'Login' => '登录',
-	'Logout successful.' => '注销成功。',
-	'Invalid credentials.' => '无效凭据。',
+	// label for database system selection (MySQL, SQLite, ...)
+	'System' => '系统',
 	'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' => '下一行插入',
+	'Permanent login' => '保持登录',
+	'Login' => '登录',
+	'Logout' => '登出',
+	'Logged as: %s' => '登录用户：%s',
+	'Logout successful.' => '成功登出。',
+	'Thanks for using Adminer, consider <a href="https://www.adminer.org/en/donation/">donating</a>.' => '感谢使用Adminer，请考虑为我们<a href="https://www.adminer.org/en/donation/">捐款（英文页面）</a>.',
+	'Invalid server or credentials.' => null,
+	'There is a space in the input password which might be the cause.' => '您输入的密码中有一个空格，这可能是导致问题的原因。',
+	'Adminer does not support accessing a database without a password, <a href="https://www.adminer.org/en/password/"%s>more information</a>.' => 'Adminer默认不支持访问没有密码的数据库，<a href="https://www.adminer.org/en/password/"%s>详情见这里</a>.',
+	'Database does not support password.' => '数据库不支持密码。',
+	'Too many unsuccessful logins, try again in %d minute(s).' => '登录失败次数过多，请 %d 分钟后重试。',
+	'Master password expired. <a href="https://www.adminer.org/en/extension/"%s>Implement</a> %s method to make it permanent.' => '主密码已过期。<a href="https://www.adminer.org/en/extension/"%s>请扩展</a> %s 方法让它永久化。',
 	'Language' => '语言',
-	'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' => '调用',
+	'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 必须被启用。',
-	'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' => '数据库概要',
-	'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' => '事件',
+	'Connecting to privileged ports is not allowed.' => '不允许连接到特权端口。',
+	'Disable %s or enable %s or %s extensions.' => '禁用 %s 或启用 %s 或 %s 扩展。',
+	'Session support must be enabled.' => '必须启用会话支持。',
+	'Session expired, please login again.' => '会话已过期，请重新登录。',
+	'The action will be performed after successful login with the same credentials.' => '此操作将在成功使用相同的凭据登录后执行。',
 	'%s version: %s through PHP extension %s' => '%s 版本：%s， 使用PHP扩展 %s',
-	'%d row(s)' => '%d 行',
-	'Remove' => '移除',
-	'Are you sure?' => '你确定吗？',
+	'Refresh' => '刷新',
+
+	// text direction - 'ltr' or 'rtl'
+	'ltr' => 'ltr',
+
 	'Privileges' => '权限',
 	'Create user' => '创建用户',
 	'User has been dropped.' => '已删除用户。',
@@ -138,130 +43,315 @@ $translations = array(
 	'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' => '下移',
+
+	'Process list' => '进程列表',
+	'%d process(es) have been killed.' => '%d 个进程被终止',
+	'Kill' => '终止',
+
+	'Variables' => '变量',
+	'Status' => '状态',
+
+	'SQL command' => 'SQL命令',
+	'%d query(s) executed OK.' => '%d 条查询已成功执行。',
+	'Query executed OK, %d row(s) affected.' => '查询执行完毕，%d 行受影响。',
+	'No commands to execute.' => '没有命令被执行。',
+	'Error in query' => '查询出错',
+	'Unknown error.' => '未知错误。',
+	'Warnings' => '警告',
+	'ATTACH queries are not supported.' => '不支持ATTACH查询。',
+	'Execute' => '执行',
+	'Stop on error' => '出错时停止',
+	'Show only errors' => '仅显示错误',
+	// sprintf() format for time of the command
+	'%.3f s' => '%.3f 秒',
+	'History' => '历史',
+	'Clear' => '清除',
+	'Edit all' => '编辑全部',
+
+	'File upload' => '文件上传',
+	'From server' => '来自服务器',
+	'Webserver file %s' => 'Web服务器文件 %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.' => 'POST 数据太大。请减少数据或者增加 %s 配置命令。',
+	'You can upload a big SQL file via FTP and import it from server.' => '您可以通过FTP上传大型SQL文件并从服务器导入。',
+	'You are offline.' => '您离线了。',
+
 	'Export' => '导出',
-	'Tables' => '表',
-	'Data' => '数据',
 	'Output' => '输出',
 	'open' => '打开',
 	'save' => '保存',
+	'Saving' => '保存中',
 	'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.' => '已清空表。',
-	'Tables have been moved.' => '已转移表。',
-	'Tables and views' => '表和视图',
+	'Data' => '数据',
+
+	'Database' => '数据库',
+	'database' => '数据库',
+	'DB' => '数据库',
+	'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' => '行数',
-	',' => ',',
-	'0123456789' => '0123456789',
+	'%d in total' => '共计 %d',
 	'Analyze' => '分析',
 	'Optimize' => '优化',
+	'Vacuum' => '整理（Vacuum）',
 	'Check' => '检查',
 	'Repair' => '修复',
 	'Truncate' => '清空',
+	'Tables have been truncated.' => '已清空表。',
 	'Move to other database' => '转移到其它数据库',
 	'Move' => '转移',
-	'Save and continue edit' => '保存并继续编辑',
-	'original' => '原始',
-	'%d item(s) have been affected.' => '%d 个项目受到影响。',
-	'whole result' => '所有结果',
+	'Tables have been moved.' => '已转移表。',
+	'Copy' => '复制',
+	'Tables have been copied.' => '已复制表。',
+	'overwrite' => '覆盖',
+
+	'Routines' => '子程序',
+	'Routine has been called, %d row(s) affected.' => '子程序被调用，%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.' => '已删除表。',
-	'Clone' => '复制',
+	'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' => '删除',
+	'Drop %s?' => '删除 %s?',
+	'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' => '值',
-	'%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' => '历史',
-	'Variables' => '变量',
+
+	'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 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.' => '源列和目标列必须具有相同的数据类型，在目标列上必须有一个索引并且引用的数据必须存在。',
-	'Relations' => '关联信息',
-	'Run file' => '运行文件',
-	'Clear' => '清除',
-	'Maximum allowed file size is %sB.' => '最多允许的文件大小为 %sB',
+
+	'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)' => '%d 行',
+	'Page' => '页面',
+	'last' => '最后',
+	'Load more data' => '加载更多数据',
+	'Loading' => '加载中',
+	'Whole result' => '所有结果',
+	'%d byte(s)' => '%d 字节',
+
+	'Import' => '导入',
+	'%d row(s) have been imported.' => '%d 行已导入。',
+	'File must be in UTF-8 encoding.' => '文件必须使用UTF-8编码。',
+
+	// in-place editing in select
+	'Modify' => '修改',
+	'Ctrl+click on a value to modify it.' => '按住Ctrl并单击某个值进行修改。',
+	'Use edit link to modify this value.' => '使用编辑链接修改该值。',
+
+	// %s can contain auto-increment value
+	'Item%s has been inserted.' => '已插入项目%s。',
+	'Item has been deleted.' => '已删除项目。',
+	'Item has been updated.' => '已更新项目。',
+	'%d item(s) have been affected.' => '%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' => '电子邮件',
+	'From' => '来自',
+	'Subject' => '主题',
+	'Attachments' => '附件',
+	'Send' => '发送',
+	'%d e-mail(s) have been sent.' => '%d 封邮件已发送。',
+
+	// data type descriptions
 	'Numbers' => '数字',
 	'Date and time' => '日期时间',
 	'Strings' => '字符串',
 	'Binary' => '二进制',
 	'Lists' => '列表',
+	'Network' => '网络',
+	'Geometry' => '几何图形',
+	'Relations' => '关联信息',
+
 	'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' => '模式',
+	// 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' => '现在',
+	'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' => '创建序列',
-	'Alter sequence' => '修改序列',
 	'Sequence has been dropped.' => '已删除序列。',
 	'Sequence has been created.' => '已创建序列。',
 	'Sequence has been altered.' => '已修改序列。',
+	'Alter sequence' => '修改序列',
+
+	// PostgreSQL user types support
 	'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' => '系统',
-	'Select data' => '选择数据',
-	'Show structure' => '显示结构',
-	'empty' => '空',
-	'Network' => '网络',
-	'Geometry' => '几何图形',
-	'File exists.' => '文件已存在。',
-	'Attachments' => '附件',
-	'%d query(s) executed OK.' => '%d 条查询已成功执行。',
-	'Show only errors' => '仅显示错误',
-	'Refresh' => '刷新',
-	'Invalid schema.' => '非法模式。',
-	'Please use one of the extensions %s.' => '请使用这些扩展中的一个：%s。',
-	'now' => '现在',
-	'ltr' => 'ltr',
-	'Tables have been copied.' => '表已复制。',
-	'Copy' => '复制',
-	'Permanent link' => '固定链接',
-	'Edit all' => '编辑全部',
-	'HH:MM:SS' => 'HH:MM:SS',
+	'Alter type' => '修改类型',
+
+	'Columns' => null,
+	'Nullable' => null,
+	'Default' => null,
+	'Yes' => null,
+	'No' => null,
+	'One Time Password' => null,
+	'Invalid OTP code.' => null,
 );

adminer/plugin.php

@@ -8,6 +8,9 @@ function adminer_object() {
 		include_once $filename;
 	}
 	
+	// enable extra drivers just by including them
+	//~ include "../plugins/drivers/simpledb.php";
+	
 	$plugins = array(
 		// specify enabled plugins here
 		new AdminerDatabaseHide(array('information_schema')),
@@ -17,7 +20,7 @@ function adminer_object() {
 		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 AdminerEditCalendar(script_src("../externals/jquery-ui/jquery-1.4.4.js") . script_src("../externals/jquery-ui/ui/jquery.ui.core.js") . script_src("../externals/jquery-ui/ui/jquery.ui.widget.js") . script_src("../externals/jquery-ui/ui/jquery.ui.datepicker.js") . script_src("../externals/jquery-ui/ui/jquery.ui.mouse.js") . script_src("../externals/jquery-ui/ui/jquery.ui.slider.js") . script_src("../externals/jquery-timepicker/jquery-ui-timepicker-addon.js") . "<link rel='stylesheet' href='../externals/jquery-ui/themes/base/jquery.ui.all.css'>\n<style>\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(""),

adminer/privileges.inc.php

@@ -15,7 +15,7 @@ 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";
+echo "<thead><tr><th>" . lang('Username') . "<th>" . lang('Server') . "<th></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";

adminer/procedure.inc.php

@@ -1,17 +1,18 @@
 <?php
-$PROCEDURE = $_GET["procedure"];
+$PROCEDURE = ($_GET["name"] ? $_GET["name"] : $_GET["procedure"]);
 $routine = (isset($_GET["function"]) ? "FUNCTION" : "PROCEDURE");
 $row = $_POST;
 $row["fields"] = (array) $row["fields"];
 
 if ($_POST && !process_fields($row["fields"]) && !$error) {
+	$orig = routine($_GET["procedure"], $routine);
 	$temp_name = "$row[name]_adminer_" . uniqid();
 	drop_create(
-		"DROP $routine " . idf_escape($PROCEDURE),
+		"DROP $routine " . routine_id($PROCEDURE, $orig),
 		create_routine($routine, $row),
-		"DROP $routine " . idf_escape($row["name"]),
+		"DROP $routine " . routine_id($row["name"], $row),
 		create_routine($routine, array("name" => $temp_name) + $row),
-		"DROP $routine " . idf_escape($temp_name),
+		"DROP $routine " . routine_id($temp_name, $row),
 		substr(ME, 0, -1),
 		lang('Routine has been dropped.'),
 		lang('Routine has been altered.'),
@@ -24,7 +25,7 @@ if ($_POST && !process_fields($row["fields"]) && !$error) {
 page_header(($PROCEDURE != "" ? (isset($_GET["function"]) ? lang('Alter function') : lang('Alter procedure')) . ": " . h($PROCEDURE) : (isset($_GET["function"]) ? lang('Create function') : lang('Create procedure'))), $error);
 
 if (!$_POST && $PROCEDURE != "") {
-	$row = routine($PROCEDURE, $routine);
+	$row = routine($_GET["procedure"], $routine);
 	$row["name"] = $PROCEDURE;
 }
 
@@ -34,21 +35,24 @@ $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" autocapitalize="off">
-<?php echo ($routine_languages ? lang('Language') . ": " . html_select("language", $routine_languages, $row["language"]) : ""); ?>
+<p><?php echo lang('Name'); ?>: <input name="name" value="<?php echo h($row["name"]); ?>" data-maxlength="64" autocapitalize="off">
+<?php echo ($routine_languages ? lang('Language') . ": " . html_select("language", $routine_languages, $row["language"]) . "\n" : ""); ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
+<div class="scrollable">
 <table cellspacing="0" class="nowrap">
 <?php
 edit_fields($row["fields"], $collations, $routine);
 if (isset($_GET["function"])) {
 	echo "<tr><td>" . lang('Return type');
-	edit_type("returns", $row["returns"], $collations);
+	edit_type("returns", $row["returns"], $collations, array(), ($jush == "pgsql" ? array("void", "trigger") : array()));
 }
 ?>
 </table>
+<?php echo script("editFields();"); ?>
+</div>
 <p><?php textarea("definition", $row["definition"]); ?>
 <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 ($PROCEDURE != "") { ?><input type="submit" name="drop" value="<?php echo lang('Drop'); ?>"><?php echo confirm(lang('Drop %s?', $PROCEDURE)); ?><?php } ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>

adminer/processlist.inc.php

@@ -1,31 +1,35 @@
 <?php
-if (support("kill") && $_POST && !$error) {
-	$killed = 0;
-	foreach ((array) $_POST["kill"] as $val) {
-		if (kill_process($val)) {
-			$killed++;
+if (support("kill")) {
+	if ($_POST && !$error) {
+		$killed = 0;
+		foreach ((array) $_POST["kill"] as $val) {
+			if (kill_process($val)) {
+				$killed++;
+			}
 		}
+		queries_redirect(ME . "processlist=", lang('%d process(es) have been killed.', $killed), $killed || !$_POST["kill"]);
 	}
-	queries_redirect(ME . "processlist=", lang('%d process(es) have been killed.', $killed), $killed || !$_POST["kill"]);
 }
 
 page_header(lang('Process list'), $error);
 ?>
 
 <form action="" method="post">
-<table cellspacing="0" onclick="tableClick(event);" ondblclick="tableClick(event, true);" class="nowrap checkable">
+<div class="scrollable">
+<table cellspacing="0" class="nowrap checkable">
 <?php
+echo script("mixin(qsl('table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true)});");
 // 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;" : "");
+		echo "<thead><tr lang='en'>" . (support("kill") ? "<th>" : "");
 		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",
+				'oracle' => "REFRN30223",
 			));
 		}
 		echo "</thead>\n";
@@ -37,14 +41,14 @@ foreach (process_list() as $i => $row) {
 			($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('Clone') . '</a>'
-			: nbsp($val)
+			: h($val)
 		);
 	}
 	echo "\n";
 }
 ?>
 </table>
-<script type='text/javascript'>tableCheck();</script>
+</div>
 <p>
 <?php
 if (support("kill")) {
@@ -54,3 +58,4 @@ if (support("kill")) {
 ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">
 </form>
+<?php echo script("tableCheck();"); ?>

adminer/replication.inc.php

@@ -1,30 +0,0 @@
-<?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

@@ -48,19 +48,19 @@ foreach (table_status('', true) as $table => $table_status) {
 }
 
 ?>
-<div id="schema" style="height: <?php echo $top; ?>em;" onselectstart="return false;">
-<script type="text/javascript">
+<div id="schema" style="height: <?php echo $top; ?>em;">
+<script<?php echo nonce(); ?>>
+qs('#schema').onselectstart = function () { return false; };
 var tablePos = {<?php echo implode(",", $table_pos_js) . "\n"; ?>};
-var em = document.getElementById('schema').offsetHeight / <?php echo $top; ?>;
+var em = qs('#schema').offsetHeight / <?php echo $top; ?>;
 document.onmousemove = schemaMousemove;
-document.onmouseup = function (ev) {
-	schemaMouseup(ev, '<?php echo js_escape(DB); ?>');
-};
+document.onmouseup = partialArg(schemaMouseup, '<?php echo js_escape(DB); ?>');
 </script>
 <?php
 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 "<div class='table' style='top: " . $table["pos"][0] . "em; left: " . $table["pos"][1] . "em;'>";
 	echo '<a href="' . h(ME) . 'table=' . urlencode($name) . '"><b>' . h($name) . "</b></a>";
+	echo script("qsl('div').onmousedown = schemaMousedown;");
 	
 	foreach ($table["fields"] as $field) {
 		$val = '<span' . type_class($field["type"]) . ' title="' . h($field["full_type"] . ($field["null"] ? " NULL" : '')) . '">' . h($field["field"]) . '</span>';

adminer/scheme.inc.php

@@ -27,11 +27,11 @@ if (!$row) {
 
 <form action="" method="post">
 <p><input name="name" id="name" value="<?php echo h($row["name"]); ?>" autocapitalize="off">
-<script type='text/javascript'>focus(document.getElementById('name'));</script>
+<?php echo script("focus(qs('#name'));"); ?>
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if ($_GET["ns"] != "") {
-	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . confirm(lang('Drop %s?', $_GET["ns"])) . "\n";
 }
 ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">

adminer/script.inc.php

@@ -4,15 +4,15 @@ header("Content-Type: text/javascript; charset=utf-8");
 if ($_GET["script"] == "db") {
 	$sums = array("Data_length" => 0, "Index_length" => 0, "Data_free" => 0);
 	foreach (table_status() as $name => $table_status) {
-		json_row("Comment-$name", nbsp($table_status["Comment"]));
+		json_row("Comment-$name", h($table_status["Comment"]));
 		if (!is_view($table_status)) {
 			foreach (array("Engine", "Collation") as $key) {
-				json_row("$key-$name", nbsp($table_status[$key]));
+				json_row("$key-$name", h($table_status[$key]));
 			}
 			foreach ($sums + array("Auto_increment" => 0, "Rows" => 0) as $key => $val) {
 				if ($table_status[$key] != "") {
 					$val = format_number($table_status[$key]);
-					json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == ($sql == "pgsql" ? "table" : "InnoDB")
+					json_row("$key-$name", ($key == "Rows" && $val && $table_status["Engine"] == ($jush == "pgsql" ? "table" : "InnoDB")
 						? "~ $val"
 						: $val
 					));

adminer/select.inc.php

@@ -4,15 +4,13 @@ $table_status = table_status1($TABLE);
 $indexes = indexes($TABLE);
 $fields = fields($TABLE);
 $foreign_keys = column_foreign_keys($TABLE);
-$oid = "";
-if ($table_status["Oid"]) {
-	$oid = ($jush == "sqlite" ? "rowid" : "oid");
-	$indexes[] = array("type" => "PRIMARY", "columns" => array($oid));
-}
+$oid = $table_status["Oid"];
 parse_str($_COOKIE["adminer_import"], $adminer_import);
 
 $rights = array(); // privilege => 0
 $columns = array(); // selectable columns
+$search_columns = array(); // searchable columns
+$order_columns = array(); // searchable columns
 $text_length = null;
 foreach ($fields as $key => $field) {
 	$name = $adminer->fieldName($field);
@@ -22,6 +20,12 @@ foreach ($fields as $key => $field) {
 			$text_length = $adminer->selectLengthProcess();
 		}
 	}
+	if (isset($field["privileges"]["where"]) && $name != "") {
+		$search_columns[$key] = html_entity_decode(strip_tags($name), ENT_QUOTES);
+	}
+	if (isset($field["privileges"]["order"]) && $name != "") {
+		$order_columns[$key] = html_entity_decode(strip_tags($name), ENT_QUOTES);
+	}
 	$rights += $field["privileges"];
 }
 
@@ -30,10 +34,6 @@ $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" : ""))
-	. 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");
@@ -49,6 +49,24 @@ if ($_GET["val"] && is_ajax()) {
 	exit;
 }
 
+$primary = $unselected = null;
+foreach ($indexes as $index) {
+	if ($index["type"] == "PRIMARY") {
+		$primary = array_flip($index["columns"]);
+		$unselected = ($select ? $primary : array());
+		foreach ($unselected as $key => $val) {
+			if (in_array(idf_escape($key), $select)) {
+				unset($unselected[$key]);
+			}
+		}
+		break;
+	}
+}
+if ($oid && !$primary) {
+	$primary = $unselected = array($oid => 0);
+	$indexes[] = array("type" => "PRIMARY", "columns" => array($oid));
+}
+
 if ($_POST && !$error) {
 	$where_check = $where;
 	if (!$_POST["all"] && is_array($_POST["check"])) {
@@ -59,25 +77,15 @@ if ($_POST && !$error) {
 		$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") {
-			$primary = array_flip($index["columns"]);
-			$unselected = ($select ? $primary : array());
-			break;
-		}
-	}
-	foreach ((array) $unselected as $key => $val) {
-		if (in_array(idf_escape($key), $select)) {
-			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()) {
+		$from = ($select ? implode(", ", $select) : "*")
+			. convert_fields($columns, $fields, $select)
+			. "\nFROM " . table($TABLE);
+		$group_by = ($group && $is_group ? "\nGROUP BY " . implode(", ", $group) : "") . ($order ? "\nORDER BY " . implode(", ", $order) : "");
+		if (!is_array($_POST["check"]) || $primary) {
 			$query = "SELECT $from$where_check$group_by";
 		} else {
 			$union = array();
@@ -108,7 +116,7 @@ if ($_POST && !$error) {
 				if ($_POST["clone"]) {
 					$query = "INTO " . table($TABLE) . " (" . implode(", ", array_keys($set)) . ")\nSELECT " . implode(", ", $set) . "\nFROM " . table($TABLE);
 				}
-				if ($_POST["all"] || ($unselected === array() && is_array($_POST["check"])) || $is_group) {
+				if ($_POST["all"] || ($primary && is_array($_POST["check"])) || $is_group) {
 					$result = ($_POST["delete"]
 						? $driver->delete($TABLE, $where_check)
 						: ($_POST["clone"]
@@ -124,8 +132,8 @@ if ($_POST && !$error) {
 						$result = ($_POST["delete"]
 							? $driver->delete($TABLE, $where2, 1)
 							: ($_POST["clone"]
-								? queries("INSERT" . limit1($query, $where2))
-								: $driver->update($TABLE, $set, $where2)
+								? queries("INSERT" . limit1($TABLE, $query, $where2))
+								: $driver->update($TABLE, $set, $where2, 1)
 							)
 						);
 						if (!$result) {
@@ -165,7 +173,7 @@ if ($_POST && !$error) {
 						$TABLE,
 						$set,
 						" WHERE " . ($where ? implode(" AND ", $where) . " AND " : "") . where_check($unique_idf, $fields),
-						!($is_group || $unselected === array()),
+						!$is_group && !$primary,
 						" "
 					);
 					if (!$result) {
@@ -184,7 +192,7 @@ if ($_POST && !$error) {
 			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);
+			preg_match_all('~(?>"[^"]*"|[^"\r\n]+)+~', $file, $matches);
 			$affected = count($matches[0]);
 			$driver->begin();
 			$separator = ($_POST["separator"] == "csv" ? "," : ($_POST["separator"] == "tsv" ? "\t" : ";"));
@@ -226,7 +234,7 @@ $set = null;
 if (isset($rights["insert"]) || !support("table")) {
 	$set = "";
 	foreach ((array) $_GET["where"] as $val) {
-		if (count($foreign_keys[$val["col"]]) == 1 && ($val["op"] == "="
+		if ($foreign_keys[$val["col"]] && count($foreign_keys[$val["col"]]) == 1 && ($val["op"] == "="
 			|| (!$val["op"] && !preg_match('~[_%]~', $val["val"])) // LIKE in Editor
 		)) {
 			$set .= "&set" . urlencode("[" . bracket_escape($val["col"]) . "]") . "=" . urlencode($val["val"]);
@@ -245,8 +253,8 @@ if (!$columns && support("table")) {
 	echo '<input type="hidden" name="select" value="' . h($TABLE) . '">';
 	echo "</div>\n";
 	$adminer->selectColumnsPrint($select, $columns);
-	$adminer->selectSearchPrint($where, $columns, $indexes);
-	$adminer->selectOrderPrint($order, $columns, $indexes);
+	$adminer->selectSearchPrint($where, $search_columns, $indexes);
+	$adminer->selectOrderPrint($order, $order_columns, $indexes);
 	$adminer->selectLimitPrint($limit);
 	$adminer->selectLengthPrint($text_length);
 	$adminer->selectActionPrint($indexes);
@@ -259,17 +267,29 @@ if (!$columns && support("table")) {
 	}
 
 	$select2 = $select;
+	$group2 = $group;
 	if (!$select2) {
 		$select2[] = "*";
-		if ($oid) {
-			$select2[] = $oid;
+		$convert_fields = convert_fields($columns, $fields, $select);
+		if ($convert_fields) {
+			$select2[] = substr($convert_fields, 2);
 		}
 	}
-	$convert_fields = convert_fields($columns, $fields, $select);
-	if ($convert_fields) {
-		$select2[] = substr($convert_fields, 2);
+	foreach ($select as $key => $val) {
+		$field = $fields[idf_unescape($val)];
+		if ($field && ($as = convert_field($field))) {
+			$select2[$key] = "$as AS $val";
+		}
 	}
-	$result = $driver->select($TABLE, $select2, $where, $group, $order, $limit, $page, true);
+	if (!$is_group && $unselected) {
+		foreach ($unselected as $key => $val) {
+			$select2[] = idf_escape($key);
+			if ($group2) {
+				$group2[] = idf_escape($key);
+			}
+		}
+	}
+	$result = $driver->select($TABLE, $select2, $where, $group2, $order, $limit, $page, true);
 
 	if (!$result) {
 		echo "<p class='error'>" . error() . "\n";
@@ -288,7 +308,7 @@ if (!$columns && support("table")) {
 		}
 
 		// use count($rows) without LIMIT, COUNT(*) without grouping, FOUND_ROWS otherwise (slowest)
-		if ($_GET["page"] != "last" && +$limit && $group && $is_group && $jush == "sql") {
+		if ($_GET["page"] != "last" && $limit != "" && $group && $is_group && $jush == "sql") {
 			$found_rows = $connection->result(" SELECT FOUND_ROWS()"); // space to allow mysql.trace_mode
 		}
 
@@ -297,14 +317,19 @@ if (!$columns && support("table")) {
 		} else {
 			$backward_keys = $adminer->backwardKeys($TABLE, $table_name);
 
-			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>");
+			echo "<div class='scrollable'>";
+			echo "<table id='table' cellspacing='0' class='nowrap checkable'>";
+			echo script("mixin(qs('#table'), {onclick: tableClick, ondblclick: partialArg(tableClick, true), onkeydown: editingKeydown});");
+			echo "<thead><tr>" . (!$group && $select
+				? ""
+				: "<td><input type='checkbox' id='all-page' class='jsonly'>" . script("qs('#all-page').onclick = partial(formCheck, /check/);", "")
+					. " <a href='" . h($_GET["modify"] ? remove_from_uri("modify") : $_SERVER["REQUEST_URI"] . "&modify=1") . "'>" . lang('Modify') . "</a>");
 			$names = array();
 			$functions = array();
 			reset($select);
 			$rank = 1;
 			foreach ($rows[0] as $key => $val) {
-				if ($key != $oid) {
+				if (!isset($unselected[$key])) {
 					$val = $_GET["columns"][key($select)];
 					$field = $fields[$select ? ($val ? $val["col"] : current($select)) : $key];
 					$name = ($field ? $adminer->fieldName($field, $rank) : ($val["fun"] ? "*" : $key));
@@ -314,13 +339,22 @@ if (!$columns && support("table")) {
 						$column = idf_escape($key);
 						$href = remove_from_uri('(order|desc)[^=]*|page') . '&order%5B0%5D=' . urlencode($key);
 						$desc = "&desc%5B0%5D=1";
-						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 apply_sql_function($val["fun"], $name) . "</a>"; //! columns looking like functions
+						$sortable = isset($field["privileges"]["order"]);
+						echo "<th id='th[" . h(bracket_escape($key)) . "]'>" . script("mixin(qsl('th'), {onmouseover: partial(columnMouse), onmouseout: partial(columnMouse, ' hidden')});", "");
+						if ($sortable) {
+							echo '<a href="' . h($href . ($order[0] == $column || $order[0] == $key || (!$order && $is_group && $group[0] == $column) ? $desc : '')) . '">'; // $order[0] == $key - COUNT(*)
+						}
+						echo apply_sql_function($val["fun"], $name); //! columns looking like functions
+						if ($sortable) {
+							echo "</a>";
+						}
 						echo "<span class='column hidden'>";
-						echo "<a href='" . h($href . $desc) . "' title='" . lang('descending') . "' class='text'> ↓</a>";
-						if (!$val["fun"]) {
-							echo '<a href="#fieldset-search" onclick="selectSearch(\'' . h(js_escape($key)) . '\'); return false;" title="' . lang('Search') . '" class="text jsonly"> =</a>';
+						if ($sortable) {
+							echo "<a href='" . h($href . $desc) . "' title='" . lang('descending') . "' class='text'> ↓</a>";
+						}
+						if (!$val["fun"] && isset($field["privileges"]["where"])) {
+							echo '<a href="#fieldset-search" title="' . lang('Search') . '" class="text jsonly"> =</a>';
+							echo script("qsl('a').onclick = partial(selectSearch, '" . js_escape($key) . "');");
 						}
 						echo "</span>";
 					}
@@ -352,25 +386,29 @@ if (!$columns && support("table")) {
 				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
+						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) {
+					if (($jush == "sql" || $jush == "pgsql") && preg_match('~char|text|enum|set~', $fields[$key]["type"]) && 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) . ")") . ")";
+						$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));
+					$unique_idf .= "&" . ($val !== null ? urlencode("where[" . bracket_escape($key) . "]") . "=" . urlencode($val === false ? "f" : $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>"));
+				echo "<tr" . odd() . ">" . (!$group && $select ? "" : "<td>"
+					. checkbox("check[]", substr($unique_idf, 1), in_array(substr($unique_idf, 1), (array) $_POST["check"]))
+					. ($is_group || information_schema(DB) ? "" : " <a href='" . h(ME . "edit=" . urlencode($TABLE) . $unique_idf) . "' class='edit'>" . lang('edit') . "</a>")
+				);
 
 				foreach ($row as $key => $val) {
 					if (isset($names[$key])) {
 						$field = $fields[$key];
+						$val = $driver->value($val, $field);
 						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
 						}
@@ -386,9 +424,9 @@ if (!$columns && support("table")) {
 									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
+									$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);
+										$link = preg_replace('~([?&]ns=)[^&]+~', '\1' . urlencode($foreign_key["ns"]), $link);
 									}
 									if (count($foreign_key["source"]) == 1) {
 										break;
@@ -414,12 +452,16 @@ if (!$columns && support("table")) {
 						$value = $_POST["val"][$unique_idf][bracket_escape($key)];
 						$editable = !is_array($row[$key]) && is_utf8($val) && $rows[$n][$key] == $row[$key] && !$functions[$key];
 						$text = preg_match('~text|lob~', $field["type"]);
+						echo "<td id='$id'";
 						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]'>");
+							echo ">" . ($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";
+							$long = strpos($val, "<i>…</i>");
+							echo " data-text='" . ($long ? 2 : ($text ? 1 : 0)) . "'"
+								. ($editable ? "" : " data-warning='" . h(lang('Use edit link to modify this value.')) . "'")
+								. ">$val</td>"
+							;
 						}
 					}
 				}
@@ -435,105 +477,125 @@ if (!$columns && support("table")) {
 				exit;
 			}
 			echo "</table>\n";
+			echo "</div>\n";
 		}
 
-		if (($rows || $page) && !is_ajax()) {
-			$exact_count = true;
-			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;
+		if (!is_ajax()) {
+			if ($rows || $page) {
+				$exact_count = true;
+				if ($_GET["page"] != "last") {
+					if ($limit == "" || (count($rows) < $limit && ($rows || !$page))) {
+						$found_rows = ($page ? $page * $limit : 0) + 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;
+						}
 					}
 				}
-			}
 
-			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)
-				);
-				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>"
-						);
-					}
+				$pagination = ($limit != "" && ($found_rows === false || $found_rows > $limit || $page));
+				if ($pagination) {
 					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>'
+						? '<p><a href="' . h(remove_from_uri("page") . "&page=" . ($page + 1)) . '" class="loadmore">' . lang('Load more data') . '</a>'
+							. script("qsl('a').onclick = partial(selectLoadMore, " . (+$limit) . ", '" . lang('Loading') . "…');", "")
 						: ''
 					);
-				} 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 "\n";
 				}
 			}
+			
+			echo "<div class='footer'><div>\n";
+			if ($rows || $page) {
+				if ($pagination) {
+					// 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 "<fieldset>";
+					if ($jush != "simpledb") {
+						echo "<legend><a href='" . h(remove_from_uri("page")) . "'>" . lang('Page') . "</a></legend>";
+						echo script("qsl('a').onclick = function () { pageClick(this.href, +prompt('" . lang('Page') . "', '" . ($page + 1) . "')); return false; };");
+						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>"
+							);
+						}
+					} else {
+						echo "<legend>" . lang('Page') . "</legend>";
+						echo pagination(0, $page) . ($page > 1 ? " …" : "");
+						echo ($page ? pagination($page, $page) : "");
+						echo ($max_page > $page ? pagination($page + 1, $page) . ($max_page > $page + 1 ? " …" : "") : "");
+					}
+					echo "</fieldset>\n";
+				}
+				
+				echo "<fieldset>";
+				echo "<legend>" . lang('Whole result') . "</legend>";
+				$display_rows = ($exact_count ? "" : "~ ") . $found_rows;
+				echo checkbox("all", 1, 0, ($found_rows !== false ? ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) : ""), "var checked = formChecked(this, /check/); selectCount('selected', this.checked ? '$display_rows' : checked); selectCount('selected2', this.checked || !checked ? '$display_rows' : checked);") . "\n";
+				echo "</fieldset>\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()) {
-				?>
+				if ($adminer->selectCommandPrint()) {
+					?>
 <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'); ?>"<?php echo confirm(); ?>>
+<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') . " <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";
+
+				$format = $adminer->dumpFormat();
+				foreach ((array) $_GET["columns"] as $column) {
+					if ($column["fun"]) {
+						unset($format['sql']);
+						break;
+					}
+				}
+				if ($format) {
+					print_fieldset("export", lang('Export') . " <span id='selected2'></span>");
+					echo html_select("format", $format, $adminer_import["format"]);
+					$output = $adminer->dumpOutput();
+					echo ($output ? " " . html_select("output", $output, $adminer_import["output"]) : "");
+					echo " <input type='submit' name='export' value='" . lang('Export') . "'>\n";
+					echo "</div></fieldset>\n";
+				}
+
+				$adminer->selectEmailPrint(array_filter($email_fields, 'strlen'), $columns);
 			}
 
-			echo (!$group && $select ? "" : "<script type='text/javascript'>tableCheck();</script>\n");
+			echo "</div></div>\n";
+
+			if ($adminer->selectImportPrint()) {
+				echo "<div>";
+				echo "<a href='#import'>" . lang('Import') . "</a>";
+				echo script("qsl('a').onclick = partial(toggle, 'import');", "");
+				echo "<span id='import' class='hidden'>: ";
+				echo "<input type='file' name='csv_file'> ";
+				echo html_select("separator", array("csv" => "CSV,", "csv;" => "CSV;", "tsv" => "TSV"), $adminer_import["format"]);
+				echo " <input type='submit' name='import' value='" . lang('Import') . "'>";
+				echo "</span>";
+				echo "</div>";
+			}
+
+			echo "<input type='hidden' name='token' value='$token'>\n";
+			echo "</form>\n";
+			echo (!$group && $select ? "" : script("tableCheck();"));
 		}
-
-		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 "</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

@@ -28,7 +28,7 @@ if (!$row) {
 <input type="submit" value="<?php echo lang('Save'); ?>">
 <?php
 if ($SEQUENCE != "") {
-	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'" . confirm() . ">\n";
+	echo "<input type='submit' name='drop' value='" . lang('Drop') . "'>" . confirm(lang('Drop %s?', $SEQUENCE)) . "\n";
 }
 ?>
 <input type="hidden" name="token" value="<?php echo $token; ?>">

adminer/sql.inc.php

@@ -21,9 +21,10 @@ if (!$error && $_POST) {
 	if (!isset($_GET["import"])) {
 		$query = $_POST["query"];
 	} elseif ($_POST["webfile"]) {
-		$fp = @fopen((file_exists("adminer.sql")
-			? "adminer.sql"
-			: "compress.zlib://adminer.sql.gz"
+		$sql_file_path = $adminer->importServerPath();
+		$fp = @fopen((file_exists($sql_file_path)
+			? $sql_file_path
+			: "compress.zlib://$sql_file_path.gz"
 		), "rb");
 		$query = ($fp ? fread($fp, 1e6) : false);
 	} else {
@@ -52,10 +53,13 @@ if (!$error && $_POST) {
 		$connection2 = connect(); // connection for exploring indexes and EXPLAIN (to not replace FOUND_ROWS()) //! PDO - silent error
 		if (is_object($connection2) && DB != "") {
 			$connection2->select_db(DB);
+			if ($_GET["ns"] != "") {
+				set_schema($_GET["ns"], $connection2);
+			}
 		}
 		$commands = 0;
 		$errors = array();
-		$parse = '[\'"' . ($jush == "sql" ? '`#' : ($jush == "sqlite" ? '`[' : ($jush == "mssql" ? '[' : ''))) . ']|/\\*|-- |$' . ($jush == "pgsql" ? '|\\$[^$]*\\$' : '');
+		$parse = '[\'"' . ($jush == "sql" ? '`#' : ($jush == "sqlite" ? '`[' : ($jush == "mssql" ? '[' : ''))) . ']|/\*|-- |$' . ($jush == "pgsql" ? '|\$[^$]*\$' : '');
 		$total_start = microtime(true);
 		parse_str($_COOKIE["adminer_export"], $adminer_export);
 		$dump_format = $adminer->dumpFormat();
@@ -77,13 +81,13 @@ if (!$error && $_POST) {
 					$offset = $pos + strlen($found);
 
 					if ($found && rtrim($found) != $delimiter) { // find matching quote or comment end
-						while (preg_match('(' . ($found == '/*' ? '\\*/' : ($found == '[' ? ']' : (preg_match('~^-- |^#~', $found) ? "\n" : preg_quote($found) . "|\\\\."))) . '|$)s', $query, $match, PREG_OFFSET_CAPTURE, $offset)) { //! respect sql_mode NO_BACKSLASH_ESCAPES
+						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);
 							} else {
 								$offset = $match[0][1] + strlen($s);
-								if ($s[0] != "\\") {
+								if (!isset($s[0]) || $s[0] != "\\") {
 									break;
 								}
 							}
@@ -116,9 +120,6 @@ if (!$error && $_POST) {
 
 							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 : "");
@@ -128,41 +129,54 @@ if (!$error && $_POST) {
 										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();
+									$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
+									;
+									$affected = $connection->affected_rows; // getting warnigns overwrites this
+									$warnings = ($_POST["only_errors"] ? "" : $driver->warnings());
+									$warnings_id = "warnings-$commands";
+									if ($warnings) {
+										$time .= ", <a href='#$warnings_id'>" . lang('Warnings') . "</a>" . script("qsl('a').onclick = partial(toggle, '$warnings_id');", "");
 									}
-									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";
+									$explain = null;
+									$explain_id = "explain-$commands";
+									if (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;
+											if ($connection2 && preg_match("~^($space|\\()*+SELECT\\b~i", $q) && ($explain = explain($connection2, $q))) {
+												echo ", <a href='#$explain_id'>Explain</a>" . script("qsl('a').onclick = partial(toggle, '$explain_id');", "");
+											}
+											$id = "export-$commands";
+											echo ", <a href='#$id'>" . lang('Export') . "</a>" . script("qsl('a').onclick = partial(toggle, '$id');", "") . "<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"
+												. "</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.', $affected) . "$time\n";
+										}
+									}
+									echo ($warnings ? "<div id='$warnings_id' class='hidden'>\n$warnings</div>\n" : "");
+									if ($explain) {
+										echo "<div id='$explain_id' class='hidden'>\n";
+										select($explain, $connection2, $orgtables);
+										echo "</div>\n";
 									}
 								}
 
@@ -208,26 +222,30 @@ if (!isset($_GET["import"])) {
 	}
 	echo "<p>";
 	textarea("query", $q, 20);
-	echo ($_POST ? "" : "<script type='text/javascript'>focus(document.getElementsByTagName('textarea')[0]);</script>\n");
+	echo script(($_POST ? "" : "qs('textarea').focus();\n") . "qs('#form').onsubmit = partial(sqlSubmit, qs('#form'), '" . js_escape(remove_from_uri("sql|limit|error_stops|only_errors|history")) . "');");
 	echo "<p>$execute\n";
 	echo lang('Limit rows') . ": <input type='number' name='limit' class='size' value='" . h($_POST ? $_POST["limit"] : $_GET["limit"]) . "'>\n";
 	
 } else {
 	echo "<fieldset><legend>" . lang('File upload') . "</legend><div>";
+	$gz = (extension_loaded("zlib") ? "[.gz]" : "");
 	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
+		? "SQL$gz (&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";
+	$importServerPath = $adminer->importServerPath();
+	if ($importServerPath) {
+		echo "<fieldset><legend>" . lang('From server') . "</legend><div>";
+		echo lang('Webserver file %s', "<code>" . h($importServerPath) . "$gz</code>");
+		echo ' <input type="submit" name="webfile" value="' . lang('Run file') . '">';
+		echo "</div></fieldset>\n";
+	}
 	echo "<p>";
 }
 
-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 checkbox("error_stops", 1, ($_POST ? $_POST["error_stops"] : isset($_GET["import"]) || $_GET["error_stops"]), lang('Stop on error')) . "\n";
+echo checkbox("only_errors", 1, ($_POST ? $_POST["only_errors"] : isset($_GET["import"]) || $_GET["only_errors"]), lang('Show only errors')) . "\n";
 echo "<input type='hidden' name='token' value='$token'>\n";
 
 if (!isset($_GET["import"]) && $history) {

adminer/sqlite.php

@@ -1,8 +1,11 @@
 <?php
 function adminer_object() {
 	include_once "../plugins/plugin.php";
-	include_once "../plugins/login-sqlite.php";
-	return new AdminerPlugin(array(new AdminerLoginSqlite));
+	include_once "../plugins/login-password-less.php";
+	return new AdminerPlugin(array(
+		// TODO: inline the result of password_hash() so that the password is not visible in source codes
+		new AdminerLoginPasswordLess(password_hash("YOUR_PASSWORD_HERE", PASSWORD_DEFAULT)),
+	));
 }
 
 include "./index.php";

adminer/static/default.css

@@ -1,5 +1,5 @@
 /** @author Ondrej Valka, http://valka.info */
-body { color: #000; background: #fff; font: 90%/1.25 Verdana, Arial, Helvetica, sans-serif; margin: 0; }
+body { color: #000; background: #fff; font: 90%/1.25 Verdana, Arial, Helvetica, sans-serif; margin: 0; width: -moz-fit-content; width: fit-content; }
 a { color: blue; text-decoration: none; }
 a:visited { color: navy; }
 a:link:hover, a:visited:hover { color: red; text-decoration: underline; }
@@ -10,11 +10,11 @@ h2 { font-size: 150%; margin: 0 0 20px -18px; padding: .8em 1em; border-bottom:
 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; }
+table { margin: 1em 20px 0 0; border-collapse: collapse; font-size: 90%; }
+td, th { border: 1px solid #999; padding: .2em .3em; }
 th { background: #eee; text-align: left; }
 thead th { text-align: center; padding: .2em .5em; }
-thead td, thead th { background: #ddf; }
+thead td, thead th { background: #ddf; } /* position: sticky; causes Firefox to lose borders */
 fieldset { display: inline; vertical-align: top; padding: .5em .8em; margin: .8em .5em 0 0; border: 1px solid #999; }
 p { margin: .8em 20px 0 0; }
 img { vertical-align: middle; border: 0; }
@@ -23,7 +23,7 @@ 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, select { vertical-align: middle; }
 input.default { box-shadow: 1px 1px 1px #777; }
 input.required { box-shadow: 1px 1px 1px red; }
 input.maxlength { box-shadow: 1px 1px 1px red; }
@@ -32,11 +32,12 @@ input.wayoff { left: -1000px; position: absolute; }
 .version { color: #777; font-size: 67%; }
 .js .hidden, .nojs .jsonly { display: none; }
 .js .column { position: absolute; background: #ddf; padding: .27em 1ex .3em 0; margin-top: -.27em; }
-.nowrap td, .nowrap th, td.nowrap { white-space: pre; }
+.nowrap td, .nowrap th, td.nowrap, p.nowrap { white-space: pre; }
 .wrap td { white-space: normal; }
 .error { color: red; background: #fee; }
 .error b { background: #fff; font-weight: normal; }
 .message { color: green; background: #efe; }
+.message table { color: #000; background: #fff; }
 .error, .message { padding: .5em .8em; margin: 1em 20px 0 0; }
 .char { color: #007F00; }
 .date { color: #7F007F; }
@@ -57,15 +58,18 @@ input.wayoff { left: -1000px; position: absolute; }
 .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; }
+.footer { position: sticky; bottom: 0; margin-right: -20px; border-top: 20px solid rgba(255, 255, 255, .7); border-image: linear-gradient(rgba(255, 255, 255, .2), #fff) 100% 0; }
+.footer > div { background: #fff; padding: 0 0 .5em; }
+.footer fieldset { margin-top: 0; }
 .links a { white-space: nowrap; margin-right: 20px; }
 .logout { margin-top: .5em; position: absolute; top: 0; right: 0; }
 .loadmore { margin-left: 1ex; }
+/* .edit used in designs */
 #menu { position: absolute; margin: 10px 0 0; padding: 0 0 30px 0; top: 2em; left: 0; width: 19em; }
-#menu p, #tables { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
-#tables li{ list-style: none; }
+#menu p, #logins, #tables { padding: .8em 1em; margin: 0; border-bottom: 1px solid #ccc; }
+#logins li, #tables li { list-style: none; }
 #dbs { overflow: hidden; }
-#logins, #tables { white-space: nowrap; overflow: auto; }
+#logins, #tables { white-space: nowrap; overflow: hidden; }
 #logins a, #tables a, #tables span { background: #fff; }
 #content { margin: 2em 0 0 21em; padding: 10px 20px 20px 0; }
 #lang { position: absolute; top: 0; left: 0; line-height: 1.8em; padding: .3em 1em; }
@@ -86,7 +90,7 @@ input.wayoff { left: -1000px; position: absolute; }
 .rtl input.wayoff { left: auto; right: -1000px; }
 .rtl #lang, .rtl #menu { left: auto; right: 0; }
 
-@media all and (max-device-width: 880px) {
+@media all and (max-width: 880px) {
 	.pages { left: auto; }
 	#menu { position: static; width: auto; }
 	#content { margin-left: 10px; }

adminer/static/editing.js

@@ -2,18 +2,29 @@
 
 /** Load syntax highlighting
 * @param string first three characters of database system version
+* @param [boolean]
 */
-function bodyLoad(version) {
+function bodyLoad(version, maria) {
 	if (window.jush) {
-		jush.create_links = ' target="_blank" rel="noreferrer"';
+		jush.create_links = ' target="_blank" rel="noreferrer noopener"';
 		if (version) {
 			for (var key in jush.urls) {
 				var obj = jush.urls;
 				if (typeof obj[key] != 'string') {
 					obj = obj[key];
 					key = 0;
+					if (maria) {
+						for (var i = 1; i < obj.length; i++) {
+							obj[i] = obj[i]
+								.replace(/\.html/, '/')
+								.replace(/-type-syntax/, '-data-types')
+								.replace(/numeric-(data-types)/, '$1-$&')
+								.replace(/#statvar_.*/, '#$$1')
+							;
+						}
+					}
 				}
-				obj[key] = obj[key]
+				obj[key] = (maria ? obj[key].replace(/dev\.mysql\.com\/doc\/mysql\/en\//, 'mariadb.com/kb/en/library/') : obj[key]) // MariaDB
 					.replace(/\/doc\/mysql/, '/doc/refman/' + version) // MySQL
 					.replace(/\/docs\/current/, '/docs/' + version) // PostgreSQL
 				;
@@ -23,7 +34,7 @@ function bodyLoad(version) {
 			jush.custom_links = jushLinks;
 		}
 		jush.highlight_tag('code', 0);
-		var tags = document.getElementsByTagName('textarea');
+		var tags = qsa('textarea');
 		for (var i = 0; i < tags.length; i++) {
 			if (/(^|\s)jush-/.test(tags[i].className)) {
 				var pre = jush.textarea(tags[i]);
@@ -60,6 +71,28 @@ function typePassword(el, disable) {
 	}
 }
 
+/** Install toggle handler
+* @param [HTMLElement]
+*/
+function messagesPrint(el) {
+	var els = qsa('.toggle', el);
+	for (var i = 0; i < els.length; i++) {
+		els[i].onclick = partial(toggle, els[i].getAttribute('href').substr(1));
+	}
+}
+
+
+
+/** Hide or show some login rows for selected driver	
+* @param HTMLSelectElement	
+*/	
+function loginDriver(driver) {	
+	var trs = parentTag(driver, 'table').rows;	
+	var disabled = /sqlite/.test(selectValue(driver));	
+	alterClass(trs[1], 'hidden', disabled);	// 1 - row with server
+	trs[1].getElementsByTagName('input')[0].disabled = disabled;	
+}
+
 
 
 var dbCtrl;
@@ -67,45 +100,46 @@ var dbPrevious = {};
 
 /** Check if database should be opened to a new window
 * @param MouseEvent
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function dbMouseDown(event, el) {
+function dbMouseDown(event) {
 	dbCtrl = isCtrl(event);
-	if (dbPrevious[el.name] == undefined) {
-		dbPrevious[el.name] = el.value;
+	if (dbPrevious[this.name] == undefined) {
+		dbPrevious[this.name] = this.value;
 	}
 }
 
 /** Load database after selecting it
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function dbChange(el) {
+function dbChange() {
 	if (dbCtrl) {
-		el.form.target = '_blank';
+		this.form.target = '_blank';
 	}
-	el.form.submit();
-	el.form.target = '';
-	if (dbCtrl && dbPrevious[el.name] != undefined) {
-		el.value = dbPrevious[el.name];
-		dbPrevious[el.name] = undefined;
+	this.form.submit();
+	this.form.target = '';
+	if (dbCtrl && dbPrevious[this.name] != undefined) {
+		this.value = dbPrevious[this.name];
+		dbPrevious[this.name] = undefined;
 	}
 }
 
 
 
 /** Check whether the query will be executed with index
-* @param HTMLFormElement
+* @this HTMLElement
 */
-function selectFieldChange(form) {
+function selectFieldChange() {
+	var form = this.form;
 	var ok = (function () {
-		var inputs = form.getElementsByTagName('input');
+		var inputs = qsa('input', form);
 		for (var i=0; i < inputs.length; i++) {
 			if (inputs[i].value && /^fulltext/.test(inputs[i].name)) {
 				return true;
 			}
 		}
 		var ok = form.limit.value;
-		var selects = form.getElementsByTagName('select');
+		var selects = qsa('select', form);
 		var group = false;
 		var columns = {};
 		for (var i=0; i < selects.length; i++) {
@@ -171,15 +205,88 @@ function idfEscape(s) {
 	return s.replace(/`/, '``');
 }
 
-/** Detect foreign key
-* @param HTMLInputElement
+
+
+/** Set up event handlers for edit_fields().
 */
-function editingNameChange(field) {
-	var name = field.name.substr(0, field.name.length - 7);
-	var type = formField(field.form, name + '[type]');
+function editFields() {
+	var els = qsa('[name$="[field]"]');
+	for (var i = 0; i < els.length; i++) {
+		els[i].oninput = function () {
+			editingNameChange.call(this);
+			if (!this.defaultValue) {
+				editingAddRow.call(this);
+			}
+		}
+	}
+	els = qsa('[name$="[length]"]');
+	for (var i = 0; i < els.length; i++) {
+		mixin(els[i], {onfocus: editingLengthFocus, oninput: editingLengthChange});
+	}
+	els = qsa('[name$="[type]"]');
+	for (var i = 0; i < els.length; i++) {
+		mixin(els[i], {
+			onfocus: function () { lastType = selectValue(this); },
+			onchange: editingTypeChange,
+			onmouseover: function (event) { helpMouseover.call(this, event, getTarget(event).value, 1) },
+			onmouseout: helpMouseout
+		});
+	}
+}
+
+/** Handle clicks on fields editing
+* @param MouseEvent
+* @return boolean false to cancel action
+*/
+function editingClick(event) {
+	var el = getTarget(event);
+	if (!isTag(el, 'input')) {
+		el = parentTag(el, 'label');
+		el = el && qs('input', el);
+	}
+	if (el) {
+		var name = el.name;
+		if (/^add\[/.test(name)) {
+			editingAddRow.call(el, 1);
+		} else if (/^up\[/.test(name)) {
+			editingMoveRow.call(el, 1);
+		} else if (/^down\[/.test(name)) {
+			editingMoveRow.call(el);
+		} else if (/^drop_col\[/.test(name)) {
+			editingRemoveRow.call(el, 'fields\$1[field]');
+		} else {
+			if (name == 'auto_increment_col') {
+				var field = el.form['fields[' + el.value + '][field]'];
+				if (!field.value) {
+					field.value = 'id';
+					field.oninput();
+				}
+			}
+			return;
+		}
+		return false;
+	}
+}
+
+/** Handle input on fields editing
+* @param InputEvent
+*/
+function editingInput(event) {
+	var el = getTarget(event);
+	if (/\[default\]$/.test(el.name)) {
+		 el.previousSibling.checked = true;
+	}
+}
+
+/** Detect foreign key
+* @this HTMLInputElement
+*/
+function editingNameChange() {
+	var name = this.name.substr(0, this.name.length - 7);
+	var type = formField(this.form, name + '[type]');
 	var opts = type.options;
 	var candidate; // don't select anything with ambiguous match (like column `id`)
-	var val = field.value;
+	var val = this.value;
 	for (var i = opts.length; i--; ) {
 		var match = /(.+)`(.+)/.exec(opts[i].value);
 		if (!match) { // common type
@@ -209,23 +316,23 @@ function editingNameChange(field) {
 }
 
 /** Add table row for next field
-* @param HTMLInputElement
-* @param boolean
-* @return boolean
+* @param [boolean]
+* @return boolean false
+* @this HTMLInputElement
 */
-function editingAddRow(button, focus) {
-	var match = /(\d+)(\.\d+)?/.exec(button.name);
+function editingAddRow(focus) {
+	var match = /(\d+)(\.\d+)?/.exec(this.name);
 	var x = match[0] + (match[2] ? added.substr(match[2].length) : added) + '1';
-	var row = parentTag(button, 'tr');
+	var row = parentTag(this, 'tr');
 	var row2 = cloneNode(row);
-	var tags = row.getElementsByTagName('select');
-	var tags2 = row2.getElementsByTagName('select');
+	var tags = qsa('select', row);
+	var tags2 = qsa('select', row2);
 	for (var i=0; i < tags.length; i++) {
 		tags2[i].name = tags[i].name.replace(/[0-9.]+/, x);
 		tags2[i].selectedIndex = tags[i].selectedIndex;
 	}
-	tags = row.getElementsByTagName('input');
-	tags2 = row2.getElementsByTagName('input');
+	tags = qsa('input', row);
+	tags2 = qsa('input', row2);
 	var input = tags2[0]; // IE loose tags2 after insertBefore()
 	for (var i=0; i < tags.length; i++) {
 		if (tags[i].name == 'auto_increment_col') {
@@ -240,59 +347,52 @@ function editingAddRow(button, focus) {
 			tags2[i].checked = false;
 		}
 	}
-	tags[0].onchange = function () {
-		editingNameChange(tags[0]);
-	};
-	tags[0].onkeyup = function () {
-	};
+	tags[0].oninput = editingNameChange;
 	row.parentNode.insertBefore(row2, row.nextSibling);
 	if (focus) {
-		input.onchange = function () {
-			editingNameChange(input);
-		};
-		input.onkeyup = function () {
-		};
+		input.oninput = editingNameChange;
 		input.focus();
 	}
 	added += '0';
 	rowCount++;
-	return true;
+	return false;
 }
 
 /** Remove table row for field
-* @param HTMLInputElement
-* @param string
-* @return boolean
+* @param string regular expression replacement
+* @return boolean false
+* @this HTMLInputElement
 */
-function editingRemoveRow(button, name) {
-	var field = formField(button.form, button.name.replace(/[^\[]+(.+)/, name));
+function editingRemoveRow(name) {
+	var field = formField(this.form, this.name.replace(/[^\[]+(.+)/, name));
 	field.parentNode.removeChild(field);
-	parentTag(button, 'tr').style.display = 'none';
-	return true;
+	parentTag(this, 'tr').style.display = 'none';
+	return false;
 }
 
 /** Move table row for field
-* @param HTMLInputElement
-* @param boolean direction to move row, true for up or false for down
-* @return boolean
+* @param [boolean]
+* @return boolean false for success
+* @this HTMLInputElement
 */
-function editingMoveRow(button, dir){
-	var row = parentTag(button, 'tr');
+function editingMoveRow(up){
+	var row = parentTag(this, 'tr');
 	if (!('nextElementSibling' in row)) {
-		return false;
+		return true;
 	}
-	row.parentNode.insertBefore(row, dir
+	row.parentNode.insertBefore(row, up
 		? row.previousElementSibling
 		: row.nextElementSibling ? row.nextElementSibling.nextElementSibling : row.parentNode.firstChild);
-	return true;
+	return false;
 }
 
 var lastType = '';
 
 /** Clear length and hide collation or unsigned
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function editingTypeChange(type) {
+function editingTypeChange() {
+	var type = this;
 	var name = type.name.substr(0, type.name.length - 6);
 	var text = selectValue(type);
 	for (var i=0; i < type.form.elements.length; i++) {
@@ -304,7 +404,7 @@ function editingTypeChange(type) {
 			)) {
 				el.value = '';
 			}
-			el.onchange.apply(el);
+			el.oninput.apply(el);
 		}
 		if (lastType == 'timestamp' && el.name == name + '[has_default]' && /timestamp/i.test(formField(type.form, name + '[default]').value)) {
 			el.checked = false;
@@ -313,7 +413,7 @@ function editingTypeChange(type) {
 			alterClass(el, 'hidden', !/(char|text|enum|set)$/.test(text));
 		}
 		if (el.name == name + '[unsigned]') {
-			alterClass(el, 'hidden', !/((^|[^o])int|float|double|decimal)$/.test(text));
+			alterClass(el, 'hidden', !/(^|[^o])int(?!er)|numeric|real|float|double|decimal|money/.test(text));
 		}
 		if (el.name == name + '[on_update]') {
 			alterClass(el, 'hidden', !/timestamp|datetime/.test(text)); // MySQL supports datetime since 5.6.5
@@ -326,37 +426,55 @@ function editingTypeChange(type) {
 }
 
 /** Mark length as required
-* @param HTMLInputElement
+* @this HTMLInputElement
 */
-function editingLengthChange(el) {
-	alterClass(el, 'required', !el.value.length && /var(char|binary)$/.test(selectValue(el.parentNode.previousSibling.firstChild)));
+function editingLengthChange() {
+	alterClass(this, 'required', !this.value.length && /var(char|binary)$/.test(selectValue(this.parentNode.previousSibling.firstChild)));
 }
 
 /** Edit enum or set
-* @param HTMLInputElement
+* @this HTMLInputElement
 */
-function editingLengthFocus(field) {
-	var td = field.parentNode;
+function editingLengthFocus() {
+	var td = this.parentNode;
 	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); //! doesn't handle 'a'',''b' correctly
+		var edit = qs('#enum-edit');
+		edit.value = enumValues(this.value);
 		td.appendChild(edit);
-		field.style.display = 'none';
+		this.style.display = 'none';
 		edit.style.display = 'inline';
 		edit.focus();
 	}
 }
 
-/** Finish editing of enum or set
-* @param HTMLTextAreaElement
+/** Get enum values
+* @param string
+* @return string values separated by newlines
 */
-function editingLengthBlur(edit) {
-	var field = edit.parentNode.firstChild;
-	var val = edit.value;
-	field.value = (/^'[^\n]+'$/.test(val) ? val : "'" + val.replace(/\n+$/, '').replace(/'/g, "''").replace(/\n/g, "','") + "'");
+function enumValues(s) {
+	var re = /(^|,)\s*'(([^\\']|\\.|'')*)'\s*/g;
+	var result = [];
+	var offset = 0;
+	var match;
+	while (match = re.exec(s)) {
+		if (offset != match.index) {
+			break;
+		}
+		result.push(match[2].replace(/'(')|\\(.)/g, '$1$2'));
+		offset += match[0].length;
+	}
+	return (offset == s.length ? result.join('\n') : s);
+}
+
+/** Finish editing of enum or set
+* @this HTMLTextAreaElement
+*/
+function editingLengthBlur() {
+	var field = this.parentNode.firstChild;
+	var val = this.value;
+	field.value = (/^'[^\n]+'$/.test(val) ? val : val && "'" + val.replace(/\n+$/, '').replace(/'/g, "''").replace(/\\/g, '\\\\').replace(/\n/g, "','") + "'");
 	field.style.display = 'inline';
-	edit.style.display = 'none';
+	this.style.display = 'none';
 }
 
 /** Show or hide selected table column
@@ -364,86 +482,108 @@ function editingLengthBlur(edit) {
 * @param number
 */
 function columnShow(checked, column) {
-	var trs = document.getElementById('edit-fields').getElementsByTagName('tr');
+	var trs = qsa('tr', qs('#edit-fields'));
 	for (var i=0; i < trs.length; i++) {
-		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);
+		alterClass(qsa('td', trs[i])[column], 'hidden', !checked);
 	}
 }
 
 /** Display partition options
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function partitionByChange(el) {
-	var partitionTable = /RANGE|LIST/.test(selectValue(el));
-	alterClass(el.form['partitions'], 'hidden', partitionTable || !el.selectedIndex);
-	alterClass(document.getElementById('partition-table'), 'hidden', !partitionTable);
+function partitionByChange() {
+	var partitionTable = /RANGE|LIST/.test(selectValue(this));
+	alterClass(this.form['partitions'], 'hidden', partitionTable || !this.selectedIndex);
+	alterClass(qs('#partition-table'), 'hidden', !partitionTable);
 	helpClose();
 }
 
 /** Add next partition row
-* @param HTMLInputElement
+* @this HTMLInputElement
 */
-function partitionNameChange(el) {
-	var row = cloneNode(parentTag(el, 'tr'));
+function partitionNameChange() {
+	var row = cloneNode(parentTag(this, 'tr'));
 	row.firstChild.firstChild.value = '';
-	parentTag(el, 'table').appendChild(row);
-	el.onchange = function () {};
+	parentTag(this, 'table').appendChild(row);
+	this.oninput = function () {};
+}
+
+/** Show or hide comment fields
+* @param HTMLInputElement
+* @param [boolean] whether to focus Comment if checked
+*/
+function editingCommentsClick(el, focus) {
+	var comment = el.form['Comment'];
+	columnShow(el.checked, 6);
+	alterClass(comment, 'hidden', !el.checked);
+	if (focus && el.checked) {
+		comment.focus();
+	}
+}
+
+
+
+/** Uncheck 'all' checkbox
+* @param MouseEvent
+* @this HTMLTableElement
+*/
+function dumpClick(event) {
+	var el = parentTag(getTarget(event), 'label');
+	if (el) {
+		el = qs('input', el);
+		var match = /(.+)\[\]$/.exec(el.name);
+		if (match) {
+			checkboxClick.call(el, event);
+			formUncheck('check-' + match[1]);
+		}
+	}
 }
 
 
 
 /** Add row for foreign key
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function foreignAddRow(field) {
-	field.onchange = function () { };
-	var row = cloneNode(parentTag(field, 'tr'));
-	var selects = row.getElementsByTagName('select');
+function foreignAddRow() {
+	var row = cloneNode(parentTag(this, 'tr'));
+	this.onchange = function () { };
+	var selects = qsa('select', row);
 	for (var i=0; i < selects.length; i++) {
 		selects[i].name = selects[i].name.replace(/\]/, '1$&');
 		selects[i].selectedIndex = 0;
 	}
-	parentTag(field, 'table').appendChild(row);
+	parentTag(this, 'table').appendChild(row);
 }
 
 
 
 /** Add row for indexes
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function indexesAddRow(field) {
-	field.onchange = function () { };
-	var row = cloneNode(parentTag(field, 'tr'));
-	var selects = row.getElementsByTagName('select');
+function indexesAddRow() {
+	var row = cloneNode(parentTag(this, 'tr'));
+	this.onchange = function () { };
+	var selects = qsa('select', row);
 	for (var i=0; i < selects.length; i++) {
 		selects[i].name = selects[i].name.replace(/indexes\[\d+/, '$&1');
 		selects[i].selectedIndex = 0;
 	}
-	var inputs = row.getElementsByTagName('input');
+	var inputs = qsa('input', row);
 	for (var i=0; i < inputs.length; i++) {
 		inputs[i].name = inputs[i].name.replace(/indexes\[\d+/, '$&1');
 		inputs[i].value = '';
 	}
-	parentTag(field, 'table').appendChild(row);
+	parentTag(this, 'table').appendChild(row);
 }
 
 /** Change column in index
-* @param HTMLSelectElement
 * @param string name prefix
+* @this HTMLSelectElement
 */
-function indexesChangeColumn(field, prefix) {
+function indexesChangeColumn(prefix) {
 	var names = [];
 	for (var tag in { 'select': 1, 'input': 1 }) {
-		var columns = parentTag(field, 'td').getElementsByTagName(tag);
+		var columns = qsa(tag, parentTag(this, 'td'));
 		for (var i=0; i < columns.length; i++) {
 			if (/\[columns\]/.test(columns[i].name)) {
 				var value = selectValue(columns[i]);
@@ -453,17 +593,15 @@ function indexesChangeColumn(field, prefix) {
 			}
 		}
 	}
-	field.form[field.name.replace(/\].*/, '][name]')].value = prefix + names.join('_');
+	this.form[this.name.replace(/\].*/, '][name]')].value = prefix + names.join('_');
 }
 
 /** Add column for index
-* @param HTMLSelectElement
 * @param string name prefix
+* @this HTMLSelectElement
 */
-function indexesAddColumn(field, prefix) {
-	field.onchange = function () {
-		indexesChangeColumn(field, prefix);
-	};
+function indexesAddColumn(prefix) {
+	var field = this;
 	var select = field.form[field.name.replace(/\].*/, '][type]')];
 	if (!select.selectedIndex) {
 		while (selectValue(select) != "INDEX" && select.selectedIndex < select.options.length) {
@@ -472,13 +610,14 @@ function indexesAddColumn(field, prefix) {
 		select.onchange();
 	}
 	var column = cloneNode(field.parentNode);
-	var selects = column.getElementsByTagName('select');
+	var selects = qsa('select', column);
 	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');
+	field.onchange = partial(indexesChangeColumn, prefix);
+	var inputs = qsa('input', column);
 	for (var i = 0; i < inputs.length; i++) {
 		var input = inputs[i];
 		input.name = input.name.replace(/\]\[\d+/, '$&1');
@@ -492,6 +631,23 @@ function indexesAddColumn(field, prefix) {
 
 
 
+/** Updates the form action
+* @param HTMLFormElement
+* @param string
+*/
+function sqlSubmit(form, root) {
+	if (encodeURIComponent(form['query'].value).length < 2e3) {
+		form.action = root
+			+ '&sql=' + encodeURIComponent(form['query'].value)
+			+ (form['limit'].value ? '&limit=' + +form['limit'].value : '')
+			+ (form['error_stops'].checked ? '&error_stops=1' : '')
+			+ (form['only_errors'].checked ? '&only_errors=1' : '')
+		;
+	}
+}
+
+
+
 /** Handle changing trigger time or event
 * @param RegExp
 * @param string
@@ -502,7 +658,7 @@ function triggerChange(tableRe, table, form) {
 	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');
+	alterClass(form['Of'], 'hidden', !/ OF/.test(formEvent));
 }
 
 
@@ -510,48 +666,47 @@ function triggerChange(tableRe, table, form) {
 var that, x, y; // em and tablePos defined in schema.inc.php
 
 /** Get mouse position
-* @param HTMLElement
 * @param MouseEvent
+* @this HTMLElement
 */
-function schemaMousedown(el, event) {
+function schemaMousedown(event) {
 	if ((event.which ? event.which : event.button) == 1) {
-		that = el;
-		x = event.clientX - el.offsetLeft;
-		y = event.clientY - el.offsetTop;
+		that = this;
+		x = event.clientX - this.offsetLeft;
+		y = event.clientY - this.offsetTop;
 	}
 }
 
 /** Move object
 * @param MouseEvent
 */
-function schemaMousemove(ev) {
+function schemaMousemove(event) {
 	if (that !== undefined) {
-		ev = ev || event;
-		var left = (ev.clientX - x) / em;
-		var top = (ev.clientY - y) / em;
-		var divs = that.getElementsByTagName('div');
+		var left = (event.clientX - x) / em;
+		var top = (event.clientY - y) / em;
+		var divs = qsa('div', that);
 		var lineSet = { };
 		for (var i=0; i < divs.length; i++) {
 			if (divs[i].className == 'references') {
-				var div2 = document.getElementById((/^refs/.test(divs[i].id) ? 'refd' : 'refs') + divs[i].id.substr(4));
+				var div2 = qs('[id="' + (/^refs/.test(divs[i].id) ? 'refd' : 'refs') + divs[i].id.substr(4) + '"]');
 				var ref = (tablePos[divs[i].title] ? tablePos[divs[i].title] : [ div2.parentNode.offsetTop / em, 0 ]);
 				var left1 = -1;
 				var id = divs[i].id.replace(/^ref.(.+)-.+/, '$1');
 				if (divs[i].parentNode != div2.parentNode) {
 					left1 = Math.min(0, ref[1] - left) - 1;
 					divs[i].style.left = left1 + 'em';
-					divs[i].getElementsByTagName('div')[0].style.width = -left1 + 'em';
+					divs[i].querySelector('div').style.width = -left1 + 'em';
 					var left2 = Math.min(0, left - ref[1]) - 1;
 					div2.style.left = left2 + 'em';
-					div2.getElementsByTagName('div')[0].style.width = -left2 + 'em';
+					div2.querySelector('div').style.width = -left2 + 'em';
 				}
 				if (!lineSet[id]) {
-					var line = document.getElementById(divs[i].id.replace(/^....(.+)-.+$/, 'refl$1'));
+					var line = qs('[id="' + divs[i].id.replace(/^....(.+)-.+$/, 'refl$1') + '"]');
 					var top1 = top + divs[i].offsetTop / em;
 					var top2 = top + div2.offsetTop / em;
 					if (divs[i].parentNode != div2.parentNode) {
 						top2 += ref[0] - top;
-						line.getElementsByTagName('div')[0].style.height = Math.abs(top1 - top2) + 'em';
+						line.querySelector('div').style.height = Math.abs(top1 - top2) + 'em';
 					}
 					line.style.left = (left + left1) + 'em';
 					line.style.top = Math.min(top1, top2) + 'em';
@@ -568,17 +723,16 @@ function schemaMousemove(ev) {
 * @param MouseEvent
 * @param string
 */
-function schemaMouseup(ev, db) {
+function schemaMouseup(event, db) {
 	if (that !== undefined) {
-		ev = ev || event;
-		tablePos[that.firstChild.firstChild.firstChild.data] = [ (ev.clientY - y) / em, (ev.clientX - x) / em ];
+		tablePos[that.firstChild.firstChild.firstChild.data] = [ (event.clientY - y) / em, (event.clientX - x) / em ];
 		that = undefined;
 		var s = '';
 		for (var key in tablePos) {
 			s += '_' + key + ':' + Math.round(tablePos[key][0] * 10000) / 10000 + 'x' + Math.round(tablePos[key][1] * 10000) / 10000;
 		}
 		s = encodeURIComponent(s.substr(1));
-		var link = document.getElementById('schema-link');
+		var link = qs('#schema-link');
 		link.href = link.href.replace(/[^=]+$/, '') + s;
 		cookie('adminer_schema-' + db + '=' + s, 30); //! special chars in db
 	}
@@ -589,18 +743,18 @@ function schemaMouseup(ev, 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)
+* @this HTMLElement
 */
-function helpMouseover(el, event, text, side) {
+function helpMouseover(event, text, side) {
 	var target = getTarget(event);
 	if (!text) {
 		helpClose();
-	} else if (window.jush && (!helpIgnore || el != target)) {
+	} else if (window.jush && (!helpIgnore || this != target)) {
 		helpOpen = 1;
-		var help = document.getElementById('help');
+		var help = qs('#help');
 		help.innerHTML = text;
 		jush.highlight_tag([ help ]);
 		alterClass(help, 'hidden');
@@ -612,12 +766,12 @@ function helpMouseover(el, event, text, side) {
 }
 
 /** Close help after timeout
-* @param HTMLElement
 * @param MouseEvent
+* @this HTMLElement
 */
-function helpMouseout(el, event) {
+function helpMouseout(event) {
 	helpOpen = 0;
-	helpIgnore = (el != getTarget(event));
+	helpIgnore = (this != getTarget(event));
 	setTimeout(function () {
 		if (!helpOpen) {
 			helpClose();
@@ -628,5 +782,5 @@ function helpMouseout(el, event) {
 /** Close help
 */
 function helpClose() {
-	alterClass(document.getElementById('help'), 'hidden', true);
+	alterClass(qs('#help'), 'hidden', true);
 }

adminer/static/functions.js

@@ -1,4 +1,67 @@
 
+/** Get first element by selector
+* @param string
+* @param [HTMLElement] defaults to document
+* @return HTMLElement
+*/
+function qs(selector, context) {
+	return (context || document).querySelector(selector);
+}
+
+/** Get last element by selector
+* @param string
+* @param [HTMLElement] defaults to document
+* @return HTMLElement
+*/
+function qsl(selector, context) {
+	var els = qsa(selector, context);
+	return els[els.length - 1];
+}
+
+/** Get all elements by selector
+* @param string
+* @param [HTMLElement] defaults to document
+* @return NodeList
+*/
+function qsa(selector, context) {
+	return (context || document).querySelectorAll(selector);
+}
+
+/** Return a function calling fn with the next arguments
+* @param function
+* @param ...
+* @return function with preserved this
+*/
+function partial(fn) {
+	var args = Array.apply(null, arguments).slice(1);
+	return function () {
+		return fn.apply(this, args);
+	};
+}
+
+/** Return a function calling fn with the first parameter and then the next arguments
+* @param function
+* @param ...
+* @return function with preserved this
+*/
+function partialArg(fn) {
+	var args = Array.apply(null, arguments);
+	return function (arg) {
+		args[0] = arg;
+		return fn.apply(this, args);
+	};
+}
+
+/** Assign values from source to target
+* @param Object
+* @param Object
+*/
+function mixin(target, source) {
+	for (var key in source) {
+		target[key] = source[key];
+	}
+}
+
 /** Add or remove CSS class
 * @param HTMLElement
 * @param string
@@ -12,12 +75,12 @@ function alterClass(el, className, enable) {
 
 /** Toggle visibility
 * @param string
-* @return boolean
+* @return boolean false
 */
 function toggle(id) {
-	var el = document.getElementById(id);
+	var el = qs('#' + id);
 	el.className = (el.className == 'hidden' ? '' : 'hidden');
-	return true;
+	return false;
 }
 
 /** Set permanent cookie
@@ -33,8 +96,10 @@ function cookie(assign, days) {
 
 /** Verify current Adminer version
 * @param string
+* @param string own URL base
+* @param string
 */
-function verifyVersion(current) {
+function verifyVersion(current, url, token) {
 	cookie('adminer_version=0', 1);
 	var iframe = document.createElement('iframe');
 	iframe.src = 'https://www.adminer.org/version/?current=' + current;
@@ -50,11 +115,13 @@ function verifyVersion(current) {
 				var match = /version=(.+)/.exec(event.data);
 				if (match) {
 					cookie('adminer_version=' + match[1], 1);
+					ajax(url + 'script=version', function () {
+					}, event.data + '&token=' + token);
 				}
 			}
 		}, false);
 	}
-	document.getElementById('version').appendChild(iframe);
+	qs('#version').appendChild(iframe);
 }
 
 /** Get value of select
@@ -70,20 +137,20 @@ function selectValue(select) {
 }
 
 /** Verify if element has a specified tag name
- * @param HTMLElement
- * @param string regular expression
- * @return bool
- */
+* @param HTMLElement
+* @param string regular expression
+* @return bool
+*/
 function isTag(el, tag) {
 	var re = new RegExp('^(' + tag + ')$', 'i');
-	return re.test(el.tagName);
+	return el && re.test(el.tagName);
 }
 
 /** Get parent node with specified tag name
- * @param HTMLElement
- * @param string regular expression
- * @return HTMLElement
- */
+* @param HTMLElement
+* @param string regular expression
+* @return HTMLElement
+*/
 function parentTag(el, tag) {
 	while (el && !isTag(el, tag)) {
 		el = el.parentNode;
@@ -105,27 +172,31 @@ function trCheck(el) {
 /** Fill number of selected items
 * @param string
 * @param string
+* @uses thousandsSeparator
 */
 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');
+	setHtml(id, (count === '' ? '' : '(' + (count + '').replace(/\B(?=(\d{3})+$)/g, thousandsSeparator) + ')'));
+	var el = qs('#' + id);
+	if (el) {
+		var inputs = qsa('input', el.parentNode.parentNode);
+		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
-* @param HTMLInputElement
 * @param RegExp
+* @this HTMLInputElement
 */
-function formCheck(el, name) {
-	var elems = el.form.elements;
+function formCheck(name) {
+	var elems = this.form.elements;
 	for (var i=0; i < elems.length; i++) {
 		if (name.test(elems[i].name)) {
-			elems[i].checked = el.checked;
+			elems[i].checked = this.checked;
 			trCheck(elems[i]);
 		}
 	}
@@ -134,14 +205,9 @@ function formCheck(el, name) {
 /** Check all rows in <table class="checkable">
 */
 function tableCheck() {
-	var tables = document.getElementsByTagName('table');
-	for (var i=0; i < tables.length; i++) {
-		if (/(^|\s)checkable(\s|$)/.test(tables[i].className)) {
-			var trs = tables[i].getElementsByTagName('tr');
-			for (var j=0; j < trs.length; j++) {
-				trCheck(trs[j].firstChild.firstChild);
-			}
-		}
+	var inputs = qsa('table.checkable td:first-child input');
+	for (var i=0; i < inputs.length; i++) {
+		trCheck(inputs[i]);
 	}
 }
 
@@ -149,7 +215,7 @@ function tableCheck() {
 * @param string
 */
 function formUncheck(id) {
-	var el = document.getElementById(id);
+	var el = qs('#' + id);
 	el.checked = false;
 	trCheck(el);
 }
@@ -175,6 +241,13 @@ function formChecked(el, name) {
 * @param [boolean] force click
 */
 function tableClick(event, click) {
+	var td = parentTag(getTarget(event), 'td');
+	var text;
+	if (td && (text = td.getAttribute('data-text'))) {
+		if (selectClick.call(td, event, +text, td.getAttribute('data-warning'))) {
+			return;
+		}
+	}
 	click = (click || !window.getSelection || getSelection().isCollapsed);
 	var el = getTarget(event);
 	while (!isTag(el, 'tr')) {
@@ -182,7 +255,7 @@ function tableClick(event, click) {
 			if (el.type != 'checkbox') {
 				return;
 			}
-			checkboxClick(event, el);
+			checkboxClick.call(el, event);
 			click = false;
 		}
 		el = el.parentNode;
@@ -195,31 +268,38 @@ function tableClick(event, click) {
 		el.checked = !el.checked;
 		el.onclick && el.onclick();
 	}
+	if (el.name == 'check[]') {
+		el.form['all'].checked = false;
+		formUncheck('all-page');
+	}
+	if (/^(tables|views)\[\]$/.test(el.name)) {
+		formUncheck('check-all');
+	}
 	trCheck(el);
 }
 
 var lastChecked;
 
 /** Shift-click on checkbox for multiple selection.
- * @param MouseEvent
- * @param HTMLInputElement
- */
-function checkboxClick(event, el) {
-	if (!el.name) {
+* @param MouseEvent
+* @this HTMLInputElement
+*/
+function checkboxClick(event) {
+	if (!this.name) {
 		return;
 	}
-	if (event.shiftKey && (!lastChecked || lastChecked.name == el.name)) {
+	if (event.shiftKey && (!lastChecked || lastChecked.name == this.name)) {
 		var checked = (lastChecked ? lastChecked.checked : true);
-		var inputs = parentTag(el, 'table').getElementsByTagName('input');
+		var inputs = qsa('input', parentTag(this, 'table'));
 		var checking = !lastChecked;
 		for (var i=0; i < inputs.length; i++) {
 			var input = inputs[i];
-			if (input.name === el.name) {
+			if (input.name === this.name) {
 				if (checking) {
 					input.checked = checked;
 					trCheck(input);
 				}
-				if (input === el || input === lastChecked) {
+				if (input === this || input === lastChecked) {
 					if (checking) {
 						break;
 					}
@@ -228,19 +308,19 @@ function checkboxClick(event, el) {
 			}
 		}
 	} else {
-		lastChecked = el;
+		lastChecked = this;
 	}
 }
 
 /** Set HTML code of an element
 * @param string
-* @param string undefined to set parentNode to &nbsp;
+* @param string undefined to set parentNode to empty string
 */
 function setHtml(id, html) {
-	var el = document.getElementById(id);
+	var el = qs('[id="' + id.replace(/[\\"]/g, '\\$&') + '"]'); // database name is used as ID
 	if (el) {
 		if (html == null) {
-			el.parentNode.innerHTML = '&nbsp;';
+			el.parentNode.innerHTML = '';
 		} else {
 			el.innerHTML = html;
 		}
@@ -262,52 +342,49 @@ function nodePosition(el) {
 /** Go to the specified page
 * @param string
 * @param string
-* @param [MouseEvent]
 */
-function pageClick(href, page, event) {
+function pageClick(href, page) {
 	if (!isNaN(page) && page) {
-		href += (page != 1 ? '&page=' + (page - 1) : '');
-		location.href = href;
+		location.href = href + (page != 1 ? '&page=' + (page - 1) : '');
 	}
 }
 
 
 
 /** Display items in menu
-* @param HTMLElement
 * @param MouseEvent
+* @this HTMLElement
 */
-function menuOver(el, event) {
+function menuOver(event) {
 	var a = getTarget(event);
 	if (isTag(a, 'a|span') && a.offsetLeft + a.offsetWidth > a.parentNode.offsetWidth - 15) { // 15 - ellipsis
-		el.style.overflow = 'visible';
+		this.style.overflow = 'visible';
 	}
 }
 
 /** Hide items in menu
-* @param HTMLElement
+* @this HTMLElement
 */
-function menuOut(el) {
-	el.style.overflow = 'auto';
+function menuOut() {
+	this.style.overflow = 'hidden';
 }
 
 
 
 /** Add row in select fieldset
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function selectAddRow(field) {
-	field.onchange = function () {
-		selectFieldChange(field.form);
-	};
-	field.onchange();
+function selectAddRow() {
+	var field = this;
 	var row = cloneNode(field.parentNode);
-	var selects = row.getElementsByTagName('select');
+	field.onchange = selectFieldChange;
+	field.onchange();
+	var selects = qsa('select', row);
 	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');
+	var inputs = qsa('input', row);
 	for (var i=0; i < inputs.length; i++) {
 		inputs[i].name = inputs[i].name.replace(/[a-z]\[\d+/, '$&1');
 		inputs[i].className = '';
@@ -321,33 +398,33 @@ function selectAddRow(field) {
 }
 
 /** Prevent onsearch handler on Enter
-* @param HTMLInputElement
 * @param KeyboardEvent
+* @this HTMLInputElement
 */
-function selectSearchKeydown(el, event) {
+function selectSearchKeydown(event) {
 	if (event.keyCode == 13 || event.keyCode == 10) {
-		el.onsearch = function () {
+		this.onsearch = function () {
 		};
 	}
 }
 
 /** Clear column name after resetting search
-* @param HTMLInputElement
+* @this HTMLInputElement
 */
-function selectSearchSearch(el) {
-	if (!el.value) {
-		el.parentNode.firstChild.selectedIndex = 0;
+function selectSearchSearch() {
+	if (!this.value) {
+		this.parentNode.firstChild.selectedIndex = 0;
 	}
 }
 
 
 
 /** Toggles column context menu
- * @param HTMLElement
- * @param [string] extra class name
- */
-function columnMouse(el, className) {
-	var spans = el.getElementsByTagName('span');
+* @param [string] extra class name
+* @this HTMLElement
+*/
+function columnMouse(className) {
+	var spans = qsa('span', this);
 	for (var i=0; i < spans.length; i++) {
 		if (/column/.test(spans[i].className)) {
 			spans[i].className = 'column' + (className || '');
@@ -358,15 +435,17 @@ function columnMouse(el, className) {
 
 
 /** Fill column in search field
- * @param string
- */
+* @param string
+* @return boolean false
+*/
 function selectSearch(name) {
-	var el = document.getElementById('fieldset-search');
+	var el = qs('#fieldset-search');
 	el.className = '';
-	var divs = el.getElementsByTagName('div');
+	var divs = qsa('div', el);
 	for (var i=0; i < divs.length; i++) {
 		var div = divs[i];
-		if (isTag(div.firstChild, 'select') && selectValue(div.firstChild) == name) {
+		var el = qs('[name$="[col]"]', div);
+		if (el && selectValue(el) == name) {
 			break;
 		}
 	}
@@ -374,7 +453,8 @@ function selectSearch(name) {
 		div.firstChild.value = name;
 		div.firstChild.onchange();
 	}
-	div.lastChild.focus();
+	qs('[name$="[val]"]', div).focus();
+	return false;
 }
 
 
@@ -402,6 +482,7 @@ function getTarget(event) {
 * @return boolean
 */
 function bodyKeydown(event, button) {
+	eventStop(event);
 	var target = getTarget(event);
 	if (target.jushTextarea) {
 		target = target.jushTextarea;
@@ -411,6 +492,9 @@ function bodyKeydown(event, button) {
 		if (button) {
 			target.form[button].click();
 		} else {
+			if (target.form.onsubmit) {
+				target.form.onsubmit();
+			}
 			target.form.submit();
 		}
 		target.focus();
@@ -450,56 +534,58 @@ function editingKeydown(event) {
 		return false;
 	}
 	if (event.shiftKey && !bodyKeydown(event, 'insert')) {
-		eventStop(event);
 		return false;
 	}
 	return true;
 }
 
 /** Disable maxlength for functions
-* @param HTMLSelectElement
+* @this HTMLSelectElement
 */
-function functionChange(select) {
-	var input = select.form[select.name.replace(/^function/, 'fields')];
-	if (selectValue(select)) {
-		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);
+function functionChange() {
+	var input = this.form[this.name.replace(/^function/, 'fields')];
+	if (input) { // undefined with the set data type
+		if (selectValue(this)) {
+			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);
+			}
 		}
+		oninput({target: input});
 	}
-	oninput({target: input});
 	helpClose();
 }
 
-/** Call this.onchange() if value changes
-* @this HTMLInputElement
+/** Skip 'original' when typing
+* @param number
+* @this HTMLTableCellElement
 */
-function keyupChange() {
-	if (this.value != this.getAttribute('value')) {
-		this.onchange();
-		this.setAttribute('value', this.value);
+function skipOriginal(first) {
+	var fnSelect = this.previousSibling.firstChild;
+	if (fnSelect.selectedIndex < first) {
+		fnSelect.selectedIndex = first;
 	}
 }
 
 /** Add new field in schema-less edit
-* @param HTMLInputElement
+* @this HTMLInputElement
 */
-function fieldChange(field) {
-	var row = cloneNode(parentTag(field, 'tr'));
-	var inputs = row.getElementsByTagName('input');
+function fieldChange() {
+	var row = cloneNode(parentTag(this, 'tr'));
+	var inputs = qsa('input', row);
 	for (var i = 0; i < inputs.length; i++) {
 		inputs[i].value = '';
 	}
 	// keep value in <select> (function)
-	parentTag(field, 'table').appendChild(row);
-	field.onchange = function () { };
+	parentTag(this, 'table').appendChild(row);
+	this.oninput = function () { };
 }
 
 
@@ -510,11 +596,12 @@ function fieldChange(field) {
 * @param [string]
 * @param [string]
 * @return XMLHttpRequest or false in case of an error
+* @uses offlineMessage
 */
 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');
+		var ajaxStatus = qs('#ajaxstatus');
 		if (message) {
 			ajaxStatus.innerHTML = '<div class="message">' + message + '</div>';
 			ajaxStatus.className = ajaxStatus.className.replace(/ hidden/g, '');
@@ -543,11 +630,11 @@ function ajax(url, callback, data, message) {
 
 /** Use setHtml(key, value) for JSON response
 * @param string
-* @return XMLHttpRequest or false in case of an error
+* @return boolean false for success
 */
 function ajaxSetHtml(url) {
-	return ajax(url, function (request) {
-		var data = eval('(' + request.responseText + ')');
+	return !ajax(url, function (request) {
+		var data = window.JSON ? JSON.parse(request.responseText) : eval('(' + request.responseText + ')');
 		for (var key in data) {
 			setHtml(key, data[key]);
 		}
@@ -575,7 +662,7 @@ function ajaxForm(form, message, button) {
 		}
 	}
 	data = data.join('&');
-	
+
 	var url = form.action;
 	if (!/post/i.test(form.method)) {
 		url = url.replace(/\?.*/, '') + '?' + data;
@@ -584,26 +671,30 @@ function ajaxForm(form, message, button) {
 	return ajax(url, function (request) {
 		setHtml('ajaxstatus', request.responseText);
 		if (window.jush) {
-			jush.highlight_tag(document.getElementById('ajaxstatus').getElementsByTagName('code'), 0);
+			jush.highlight_tag(qsa('code', qs('#ajaxstatus')), 0);
 		}
+		messagesPrint(qs('#ajaxstatus'));
 	}, 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
+* @param [string] warning to display
+* @return boolean
+* @this HTMLElement
 */
-function selectClick(td, event, text, warning) {
+function selectClick(event, text, warning) {
+	var td = this;
 	var target = getTarget(event);
 	if (!isCtrl(event) || isTag(td.firstChild, 'input|textarea') || isTag(target, 'a')) {
 		return;
 	}
 	if (warning) {
-		return alert(warning);
+		alert(warning);
+		return true;
 	}
 	var original = td.innerHTML;
 	text = text || /\n/.test(original);
@@ -618,7 +709,7 @@ function selectClick(td, event, text, warning) {
 		}
 	};
 	var pos = event.rangeOffset;
-	var value = td.firstChild.alt || td.textContent || td.innerText;
+	var value = (td.firstChild && td.firstChild.alt) || td.textContent || td.innerText;
 	input.style.width = Math.max(td.clientWidth - 14, 20) + 'px'; // 14 = 2 * (td.border + td.padding + input.border)
 	if (text) {
 		var rows = 1;
@@ -627,7 +718,7 @@ function selectClick(td, event, text, warning) {
 		});
 		input.rows = rows;
 	}
-	if (value == '\u00A0' || td.getElementsByTagName('i').length) { // &nbsp; or i - NULL
+	if (qsa('i', td).length) { // <i> - NULL
 		value = '';
 	}
 	if (document.selection) {
@@ -659,26 +750,28 @@ function selectClick(td, event, text, warning) {
 		range.moveEnd('character', -input.value.length + pos);
 		range.select();
 	}
+	return true;
 }
 
 
 
 /** Load and display next page in select
-* @param HTMLLinkElement
 * @param number
 * @param string
-* @return boolean
+* @return boolean false for success
+* @this HTMLLinkElement
 */
-function selectLoadMore(a, limit, loading) {
+function selectLoadMore(limit, loading) {
+	var a = this;
 	var title = a.innerHTML;
 	var href = a.href;
 	a.innerHTML = loading;
 	if (href) {
 		a.removeAttribute('href');
-		return ajax(href, function (request) {
+		return !ajax(href, function (request) {
 			var tbody = document.createElement('tbody');
 			tbody.innerHTML = request.responseText;
-			document.getElementById('table').appendChild(tbody);
+			qs('#table').appendChild(tbody);
 			if (tbody.children.length < limit) {
 				a.parentNode.removeChild(a);
 			} else {
@@ -711,7 +804,7 @@ function eventStop(event) {
 */
 function setupSubmitHighlight(parent) {
 	for (var key in { input: 1, select: 1, textarea: 1 }) {
-		var inputs = parent.getElementsByTagName(key);
+		var inputs = qsa(key, parent);
 		for (var i = 0; i < inputs.length; i++) {
 			setupSubmitHighlightInput(inputs[i])
 		}
@@ -756,7 +849,10 @@ function findDefaultSubmit(el) {
 	if (el.jushTextarea) {
 		el = el.jushTextarea;
 	}
-	var inputs = el.form.getElementsByTagName('input');
+	if (!el.form) {
+		return null;
+	}
+	var inputs = qsa('input', el.form);
 	for (var i = 0; i < inputs.length; i++) {
 		var input = inputs[i];
 		if (input.type == 'submit' && !input.style.zIndex) {
@@ -795,6 +891,17 @@ function focus(el) {
 */
 function cloneNode(el) {
 	var el2 = el.cloneNode(true);
+	var selector = 'input, select';
+	var origEls = qsa(selector, el);
+	var cloneEls = qsa(selector, el2);
+	for (var i=0; i < origEls.length; i++) {
+		var origEl = origEls[i];
+		for (var key in origEl) {
+			if (/^on/.test(key) && origEl[key]) {
+				cloneEls[i][key] = origEl[key];
+			}
+		}
+	}
 	setupSubmitHighlight(el2);
 	return el2;
 }

adminer/table.inc.php

@@ -5,13 +5,14 @@ if (!$fields) {
 	$error = error();
 }
 $table_status = table_status1($TABLE, true);
+$name = $adminer->tableName($table_status);
 
-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) ? $table_status['Engine'] == 'materialized view' ? lang('Materialized view') : lang('View') : lang('Table')) . ": " . ($name != "" ? $name : h($TABLE)), $error);
 
 $adminer->selectLinks($table_status);
 $comment = $table_status["Comment"];
 if ($comment != "") {
-	echo "<p>" . lang('Comment') . ": " . h($comment) . "\n";
+	echo "<p class='nowrap'>" . lang('Comment') . ": " . h($comment) . "\n";
 }
 
 if ($fields) {
@@ -33,7 +34,7 @@ if (!is_view($table_status)) {
 		$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') . "<td>&nbsp;</thead>\n";
+			echo "<thead><tr><th>" . lang('Source') . "<td>" . lang('Target') . "<td>" . lang('ON DELETE') . "<td>" . lang('ON UPDATE') . "<td></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>";
@@ -42,8 +43,8 @@ if (!is_view($table_status)) {
 					. "</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>" . h($foreign_key["on_delete"]) . "\n";
+				echo "<td>" . h($foreign_key["on_update"]) . "\n";
 				echo '<td><a href="' . h(ME . 'foreign=' . urlencode($TABLE) . '&name=' . urlencode($name)) . '">' . lang('Alter') . '</a>';
 			}
 			echo "</table>\n";