diff --git a/ChangeLog b/ChangeLog
index 00c5a7e28..69b6f188a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
   privileges, thanks to Herman van Rink - helmo
 + patch #2356575 [display] Sortable database columns,
   thanks to Bryce Thornton - brycethornton
+- patch #2486825 [lang] Wrong string in setup script hints,
+  thanks to Isaac Bennetch - ibennetch
 
 3.1.2.0 (not yet released)
 - bug #1253252 [display] Can't NULL a column with relation defined 
diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php
index 7b71cd4b3..011b442e6 100644
--- a/lang/afrikaans-utf-8.inc.php
+++ b/lang/afrikaans-utf-8.inc.php
@@ -1231,9 +1231,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1470,4 +1468,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php
index 1f8576bc1..528f38a3c 100644
--- a/lang/albanian-utf-8.inc.php
+++ b/lang/albanian-utf-8.inc.php
@@ -1230,9 +1230,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1469,4 +1467,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php
index 898f2d631..3c5a70928 100644
--- a/lang/arabic-utf-8.inc.php
+++ b/lang/arabic-utf-8.inc.php
@@ -1232,9 +1232,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1471,4 +1469,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php
index a0b81a329..84f6d76d7 100644
--- a/lang/azerbaijani-utf-8.inc.php
+++ b/lang/azerbaijani-utf-8.inc.php
@@ -1227,9 +1227,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1466,4 +1464,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php
index f7c916e45..5b7404a5b 100644
--- a/lang/bangla-utf-8.inc.php
+++ b/lang/bangla-utf-8.inc.php
@@ -1206,9 +1206,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1445,4 +1443,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php
index 06df5c0b6..8d78d2d35 100644
--- a/lang/basque-utf-8.inc.php
+++ b/lang/basque-utf-8.inc.php
@@ -1224,9 +1224,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1463,4 +1461,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php
index d8318d595..3e4dff42d 100644
--- a/lang/belarusian_cyrillic-utf-8.inc.php
+++ b/lang/belarusian_cyrillic-utf-8.inc.php
@@ -1206,9 +1206,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1445,4 +1443,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php
index d7f3ab656..fd825d6e9 100644
--- a/lang/belarusian_latin-utf-8.inc.php
+++ b/lang/belarusian_latin-utf-8.inc.php
@@ -1214,9 +1214,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1453,4 +1451,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php
index 6ce472b8c..3cda5e280 100644
--- a/lang/bosnian-utf-8.inc.php
+++ b/lang/bosnian-utf-8.inc.php
@@ -1230,9 +1230,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1469,4 +1467,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php
index 3ca6fe0b6..b5ee67b91 100644
--- a/lang/brazilian_portuguese-utf-8.inc.php
+++ b/lang/brazilian_portuguese-utf-8.inc.php
@@ -1204,9 +1204,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1443,4 +1441,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php
index 45a047064..4aa294f8b 100644
--- a/lang/bulgarian-utf-8.inc.php
+++ b/lang/bulgarian-utf-8.inc.php
@@ -1227,9 +1227,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1466,4 +1464,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php
index be609a6ce..50656f202 100644
--- a/lang/catalan-utf-8.inc.php
+++ b/lang/catalan-utf-8.inc.php
@@ -1035,7 +1035,6 @@ $strSetupServers_hide_db_desc = 'Amagar les bases de dades que compleixin una ex
 $strSetupServers_hide_db_name = 'Amagar bases de dades';
 $strSetupServers_history_desc = 'Deixa en blanc per desactivar el suport d\'historial de consultes SQL, predeterminat: [kbd]pma_history[/kbd]';
 $strSetupServers_history_name = 'Taula d\'historial de consultes SQL';
-$strSetupServers_host_desc = '';
 $strSetupServers_host_name = 'Nom del servidor';
 $strSetupServers_LogoutURL_name = 'URL de desconnexió';
 $strSetupServers_nopassword_desc = 'Intentar connectar sense contrasenya';
@@ -1070,7 +1069,6 @@ $strSetupServers_user_desc = 'Deixa en blanc si no utilitzes l\'autenticació co
 $strSetupServers_user_name = 'Usuari per autenticació config';
 $strSetupServers_verbose_check_desc = 'Desactiva si saps que les teves taules pma_* estàn actualitzades a la darrera versió. Aixó evita problemes de comprobacions de compatibilitat i així aumenta el rendiment';
 $strSetupServers_verbose_check_name = 'Comprobació explicativa';
-$strSetupServers_verbose_desc = 'Nom de l\'equip ón s\'executa el servidor MySQL';
 $strSetupServers_verbose_name = 'Nom explicatiu d\'aquest servidor';
 $strSetupSetValue = 'Establir valor: %s';
 $strSetupShowAll_desc = 'Si a un usuari se l\'hauria de mostrar el botó "mostrar tots (els registres)"';
@@ -1443,4 +1441,6 @@ $strZip = '"comprimit amb zip"';
 
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
 
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php
index 02f4db6c0..0ac6b3e4b 100644
--- a/lang/chinese_simplified-utf-8.inc.php
+++ b/lang/chinese_simplified-utf-8.inc.php
@@ -1232,9 +1232,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1471,4 +1469,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php
index cb4bedd47..5e7a334de 100644
--- a/lang/chinese_traditional-utf-8.inc.php
+++ b/lang/chinese_traditional-utf-8.inc.php
@@ -1211,9 +1211,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1450,4 +1448,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php
index 32db49ba9..3911929c0 100644
--- a/lang/croatian-utf-8.inc.php
+++ b/lang/croatian-utf-8.inc.php
@@ -1208,9 +1208,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1447,4 +1445,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php
index 887828880..d2d3ecb7b 100644
--- a/lang/czech-utf-8.inc.php
+++ b/lang/czech-utf-8.inc.php
@@ -1357,7 +1357,6 @@ $strSetupServers_hide_db_desc = 'Hide databases matching regular expression (PCR
 $strSetupServers_hide_db_name = 'Hide databases';  //to translate
 $strSetupServers_history_desc = 'Leave blank for no SQL query history support, default: [kbd]pma_history[/kbd]';  //to translate
 $strSetupServers_history_name = 'SQL query history table';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
 $strSetupServers_LogoutURL_name = 'Logout URL';  //to translate
 $strSetupServers_nopassword_desc = 'Try to connect without password';  //to translate
@@ -1390,7 +1389,6 @@ $strSetupServers_table_info_desc = 'Table to describe the display fields, leave
 $strSetupServers_table_info_name = 'Display fields table';  //to translate
 $strSetupServers_user_desc = 'Leave empty if not using config auth';  //to translate
 $strSetupServers_user_name = 'User for config auth';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_check_desc = 'Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance';  //to translate
 $strSetupServers_verbose_check_name = 'Verbose check';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
@@ -1449,4 +1447,6 @@ $strSetupZipDumpImportWarning = '[a@?page=form&formset=features#tab_Import_e
 $strSetupZipDump_name = 'ZIP';  //to translate
 $strShowKeys = 'Only show keys';  //to translate
 
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php
index a71060b13..83b951f2d 100644
--- a/lang/danish-utf-8.inc.php
+++ b/lang/danish-utf-8.inc.php
@@ -1206,9 +1206,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1445,4 +1443,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php
index 2b6778c7c..734412ed6 100644
--- a/lang/dutch-utf-8.inc.php
+++ b/lang/dutch-utf-8.inc.php
@@ -1046,7 +1046,6 @@ $strSetupServers_hide_db_desc = 'Verberg databases die aan de hier opgegeven reg
 $strSetupServers_hide_db_name = 'Verberg databases';
 $strSetupServers_history_desc = 'Laat dit veld leeg om geen SQL-historie te ondersteunen, standaard: [kbd]pma_history[/kbd]';
 $strSetupServers_history_name = 'SQL-query historie tabel';
-$strSetupServers_host_desc = '';
 $strSetupServers_host_name = 'Server machinenaam';
 $strSetupServers_LogoutURL_name = 'Uitlog URL';
 $strSetupServers_nopassword_desc = 'Probeer te verbinden zonder wachtwoord';
@@ -1081,7 +1080,6 @@ $strSetupServers_user_desc = 'Laat dit veld leeg indien u geen gebruik maakt van
 $strSetupServers_user_name = ' authenticatie';
 $strSetupServers_verbose_check_desc = 'Schakel dit uit wanneer u zeker weet dat uw pma_* tabellen up-to-date zijn. Dit voorkomt compatibiliteitscontroles en verbeterd daarmee de prestaties.';
 $strSetupServers_verbose_check_name = 'Uitgebreide controle';
-$strSetupServers_verbose_desc = 'Machinenaam waarop de MySQL server is geïnstalleerd';
 $strSetupServers_verbose_name = 'Uitgebreide naam voor deze server';
 $strSetupSetValue = 'Zet waarde op: %s';
 $strSetupShowAll_desc = 'Of er een "Toon alle (rijen)" knop moet worden getoond.';
@@ -1451,4 +1449,6 @@ $strYes = 'Ja';
 $strZeroRemovesTheLimit = 'Opmerking: Het instellen van deze waarden op 0 (nul) verwijdert de limiet.';
 $strZip = '"Gezipt"';
 
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php
index 570496efa..d41af7418 100644
--- a/lang/english-utf-8.inc.php
+++ b/lang/english-utf-8.inc.php
@@ -132,6 +132,26 @@ $strCardinality = 'Cardinality';
 $strCaseInsensitive = 'case-insensitive';
 $strCaseSensitive = 'case-sensitive';
 $strCentralEuropean = 'Central European';
+$strChange = 'Change';
+$strChangeCopyModeCopy = '... keep the old one.';
+$strChangeCopyMode = 'Create a new user with the same privileges and ...';
+$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.';
+$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.';
+$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.';
+$strChangeCopyUser = 'Change Login Information / Copy User';
+$strChangeDisplay = 'Choose field to display';
+$strChangePassword = 'Change password';
+$strCharset = 'Charset';
+$strCharsetOfFile = 'Character set of the file:';
+$strCharsetsAndCollations = 'Character Sets and Collations';
+$strCharsets = 'Charsets';
+$strCheckAll = 'Check All';
+$strCheck = 'Check';
+$strCheckOverhead = 'Check tables having overhead';
+$strCheckPrivs = 'Check Privileges';
+$strCheckPrivsLong = 'Check privileges for database "%s".';
+$strCheckTable = 'Check table';
+$strChoosePage = 'Please choose a page to edit';
 $strColComFeat = 'Displaying Column Comments';
 $strCollation = 'Collation';
 $strColumnNames = 'Column names';
@@ -180,26 +200,6 @@ $strCustomColor = 'Custom color';
 $strCyrillic = 'Cyrillic';
 $strCzech = 'Czech';
 $strCzechSlovak = 'Czech-Slovak';
-$strChangeCopyModeCopy = '... keep the old one.';
-$strChangeCopyMode = 'Create a new user with the same privileges and ...';
-$strChangeCopyModeDeleteAndReload = ' ... delete the old one from the user tables and reload the privileges afterwards.';
-$strChangeCopyModeJustDelete = ' ... delete the old one from the user tables.';
-$strChangeCopyModeRevoke = ' ... revoke all active privileges from the old one and delete it afterwards.';
-$strChangeCopyUser = 'Change Login Information / Copy User';
-$strChangeDisplay = 'Choose field to display';
-$strChange = 'Change';
-$strChangePassword = 'Change password';
-$strCharset = 'Charset';
-$strCharsetOfFile = 'Character set of the file:';
-$strCharsetsAndCollations = 'Character Sets and Collations';
-$strCharsets = 'Charsets';
-$strCheckAll = 'Check All';
-$strCheck = 'Check';
-$strCheckOverhead = 'Check tables having overhead';
-$strCheckPrivs = 'Check Privileges';
-$strCheckPrivsLong = 'Check privileges for database "%s".';
-$strCheckTable = 'Check table';
-$strChoosePage = 'Please choose a page to edit';
 
 $strDanish = 'Danish';
 $strDatabase = 'Database';
@@ -433,6 +433,7 @@ $strKorean = 'Korean';
 $strLandscape = 'Landscape';
 $strLanguage = 'Language';
 $strLanguageUnknown = 'Unknown language: %1$s.';
+$strLatchedPages = 'Latched pages';
 $strLatexCaption = 'Table caption';
 $strLatexContent = 'Content of table __TABLE__';
 $strLatexContinuedCaption = 'Continued table caption';
@@ -441,7 +442,6 @@ $strLatexIncludeCaption = 'Include table caption';
 $strLatexLabel = 'Label key';
 $strLaTeX = 'LaTeX';
 $strLatexStructure = 'Structure of table __TABLE__';
-$strLatchedPages = 'Latched pages';
 $strLatvian = 'Latvian';
 $strLDI = 'CSV using LOAD DATA';
 $strLDILocal = 'Use LOCAL keyword';
@@ -498,9 +498,9 @@ $strMyISAMRepairThreadsDesc = 'If this value is greater than 1, MyISAM table ind
 $strMyISAMRepairThreads = 'Repair threads';
 $strMyISAMSortBufferSizeDesc = 'The buffer that is allocated when sorting MyISAM indexes during a REPAIR TABLE or when creating indexes with CREATE INDEX or ALTER TABLE.';
 $strMyISAMSortBufferSize = 'Sort buffer size';
+$strMySQLCharset = 'MySQL charset';
 $strMysqlClientVersion = 'MySQL client version';
 $strMySQLConnectionCollation = 'MySQL connection collation';
-$strMySQLCharset = 'MySQL charset';
 $strMysqlLibDiffersServerVersion = 'Your PHP MySQL library version %s differs from your MySQL server version %s. This may cause unpredictable behavior.';
 $strMySQLSaid = 'MySQL said: ';
 $strMySQLShowProcess = 'Show processes';
@@ -567,19 +567,19 @@ $strPartitionDefinition = 'PARTITION definition';
 $strPartitioned = 'partitioned';
 $strPartitionMaintenance = 'Partition maintenance';
 $strPartition = 'Partition %s';
+$strPasswordChanged = 'The password for %s was changed successfully.';
 $strPasswordEmpty = 'The password is empty!';
 $strPasswordHashing = 'Password Hashing';
-$strPasswordChanged = 'The password for %s was changed successfully.';
 $strPasswordNotSame = 'The passwords aren\'t the same!';
 $strPassword = 'Password';
+$strPBXTCheckpointFrequency = 'Checkpoint frequency';
+$strPBXTCheckpointFrequencyDesc = 'The amount of data written to the transaction log before a checkpoint is performed. The default value is 24MB.';
 $strPBXTDataFileGrowSize = 'Data file grow size';
 $strPBXTDataFileGrowSizeDesc = 'The grow size of the handle data (.xtd) files.';
 $strPBXTDataLogThreshold = 'Data log threshold';
 $strPBXTDataLogThresholdDesc = 'The maximum size of a data log file. The default value is 64MB. PBXT can create a maximum of 32000 data logs, which are used by all tables. So the value of this variable can be increased to increase the total amount of data that can be stored in the database.';
 $strPBXTGarbageThresholdDesc = 'The percentage of garbage in a data log file before it is compacted. This is a value between 1 and 99. The default is 50.';
 $strPBXTGarbageThreshold = 'Garbage threshold';
-$strPBXTCheckpointFrequencyDesc = 'The amount of data written to the transaction log before a checkpoint is performed. The default value is 24MB.';
-$strPBXTCheckpointFrequency = 'Checkpoint frequency';
 $strPBXTIndexCacheSizeDesc = 'This is the amount of memory allocated to the index cache. Default value is 32MB. The memory allocated here is used only for caching index pages.';
 $strPBXTIndexCacheSize = 'Index cache size';
 $strPBXTLogBufferSizeDesc = 'The size of the buffer used when writing a data log. The default is 256MB. The engine allocates one buffer per thread, but only if the thread is required to write a data log.';
@@ -638,8 +638,8 @@ $strPrivDescDelete = 'Allows deleting data.';
 $strPrivDescDropDb = 'Allows dropping databases and tables.';
 $strPrivDescDropTbl = 'Allows dropping tables.';
 $strPrivDescEvent = 'Allows to set up events for the event scheduler';
-$strPrivDescExecute = 'Allows running stored procedures; has no effect in this MySQL version.';
 $strPrivDescExecute5 = 'Allows executing stored routines.';
+$strPrivDescExecute = 'Allows running stored procedures; has no effect in this MySQL version.';
 $strPrivDescFile = 'Allows importing data from and exporting data into files.';
 $strPrivDescGrant = 'Allows adding users and privileges without reloading the privilege tables.';
 $strPrivDescIndex = 'Allows creating and dropping indexes.';
@@ -787,8 +787,8 @@ $strSetupAllowArbitraryServer_desc = 'If enabled user can enter any MySQL server
 $strSetupAllowArbitraryServerMsg = 'This [a@?page=form&formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.';
 $strSetupAllowArbitraryServer_name = 'Allow login to any MySQL server';
 $strSetupAllowUserDropDatabase_name = 'Show "Drop database" link to normal users';
-$strSetupblowfish_secret_desc = 'Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication';
 $strSetupBlowfishSecretCharsMsg = 'Key should contain letters, numbers [em]and[/em] special characters';
+$strSetupblowfish_secret_desc = 'Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication';
 $strSetupBlowfishSecretLengthMsg = 'Key is too short, it should have at least 8 characters';
 $strSetupBlowfishSecretMsg = 'You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.';
 $strSetupblowfish_secret_name = 'Blowfish secret';
@@ -801,6 +801,13 @@ $strSetupBZipDump_name = 'Bzip2';
 $strSetupBZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.';
 $strSetupCannotLoadConfig = 'Cannot load or save configuration';
 $strSetupCannotLoadConfigMsg = 'Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.';
+$strSetupCharEditing_desc = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields';
+$strSetupCharEditing_name = 'CHAR fields editing';
+$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas';
+$strSetupCharTextareaCols_name = 'CHAR textarea columns';
+$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas';
+$strSetupCharTextareaRows_name = 'CHAR textarea rows';
+$strSetupCheckConfigurationPermissions_name = 'Check config file permissions';
 $strSetupClear = 'Clear';
 $strSetupCompressOnFly_desc = 'Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature';
 $strSetupCompressOnFly_name = 'Compress on the fly';
@@ -842,12 +849,12 @@ $strSetuperror_nan_p = 'Not a positive number';
 $strSetupExecTimeLimit_desc = 'Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)';
 $strSetupExecTimeLimit_name = 'Maximum execution time';
 $strSetupExport_asfile_name = 'Save as file';
+$strSetupExport_charset_name = 'Character set of the file';
 $strSetupExport_compression_name = 'Compression';
 $strSetupExport_file_template_database_name = 'Database name template';
 $strSetupExport_file_template_server_name = 'Server name template';
 $strSetupExport_file_template_table_name = 'Table name template';
 $strSetupExport_format_name = 'Format';
-$strSetupExport_charset_name = 'Character set of the file';
 $strSetupExport_onserver_name = 'Save on server';
 $strSetupExport_onserver_overwrite_name = 'Overwrite existing file(s)';
 $strSetupExport_remember_file_template_name = 'Remember file name template';
@@ -910,13 +917,6 @@ $strSetupGZipDump_desc = 'Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] c
 $strSetupGZipDump_name = 'GZip';
 $strSetupGZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.';
 $strSetupHomepageLink = 'phpMyAdmin homepage';
-$strSetupCharEditing_desc = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields';
-$strSetupCharEditing_name = 'CHAR fields editing';
-$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas';
-$strSetupCharTextareaCols_name = 'CHAR textarea columns';
-$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas';
-$strSetupCharTextareaRows_name = 'CHAR textarea rows';
-$strSetupCheckConfigurationPermissions_name = 'Check config file permissions';
 $strSetupIconvExtraParams_name = 'Extra parameters for iconv';
 $strSetupIgnoreErrors = 'Ignore errors';
 $strSetupIgnoreMultiSubmitErrors_desc = 'If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed';
@@ -964,10 +964,10 @@ $strSetupLoginCookieStore_name = 'Login cookie store';
 $strSetupLoginCookieValidity_desc = 'Define how long (in seconds) a login cookie is valid';
 $strSetupLoginCookieValidityMsg = '[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.';
 $strSetupLoginCookieValidity_name = 'Login cookie validity';
-$strSetupMaxDbList_desc = 'Maximum number of databases displayed in left frame and database list';
-$strSetupMaxDbList_name = 'Maximum databases';
 $strSetupMaxCharactersInDisplayedSQL_desc = 'Maximum number of characters used when a SQL query is displayed';
 $strSetupMaxCharactersInDisplayedSQL_name = 'Maximum displayed SQL length';
+$strSetupMaxDbList_desc = 'Maximum number of databases displayed in left frame and database list';
+$strSetupMaxDbList_name = 'Maximum databases';
 $strSetupMaxRows_desc = 'Number of rows displayed when browsing a result set. If the result set contains more rows, "Previous" and "Next" links will be shown.';
 $strSetupMaxRows_name = 'Maximum number of rows to display';
 $strSetupMaxTableList_desc = 'Maximum number of tables displayed in table list';
@@ -1041,7 +1041,7 @@ $strSetupServers_hide_db_desc = 'Hide databases matching regular expression (PCR
 $strSetupServers_hide_db_name = 'Hide databases';
 $strSetupServers_history_desc = 'Leave blank for no SQL query history support, default: [kbd]pma_history[/kbd]';
 $strSetupServers_history_name = 'SQL query history table';
-$strSetupServers_host_desc = '';
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';
 $strSetupServers_host_name = 'Server hostname';
 $strSetupServers_LogoutURL_name = 'Logout URL';
 $strSetupServers_nopassword_desc = 'Try to connect without password';
@@ -1074,20 +1074,20 @@ $strSetupServers_table_info_desc = 'Table to describe the display fields, leave
 $strSetupServers_table_info_name = 'Display fields table';
 $strSetupServers_user_desc = 'Leave empty if not using config auth';
 $strSetupServers_user_name = 'User for config auth';
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';
 $strSetupServers_verbose_check_desc = 'Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance';
 $strSetupServers_verbose_check_name = 'Verbose check';
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';
 $strSetupServers_verbose_name = 'Verbose name of this server';
 $strSetupSetValue = 'Set value: %s';
 $strSetupShowAll_desc = 'Whether a user should be displayed a "show all (records)" button';
 $strSetupShowAll_name = 'Allow to display all the rows';
+$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly';
+$strSetupShowChgPassword_name = 'Show password change form';
 $strSetupShowCreateDb_name = 'Show create database form';
 $strSetupShowForm = 'Show form';
 $strSetupShowFunctionFields_desc = 'Display the function fields in edit/insert mode';
 $strSetupShowFunctionFields_name = 'Show function fields';
 $strSetupShowHiddenMessages = 'Show hidden messages (#MSG_COUNT)';
-$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly';
-$strSetupShowChgPassword_name = 'Show password change form';
 $strSetupShowPhpInfo_desc = 'Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output';
 $strSetupShowPhpInfo_name = 'Show phpinfo() link';
 $strSetupShowServerInfo_name = 'Show detailed MySQL server information';
@@ -1237,8 +1237,8 @@ $strShowStatusReset = 'Reset';
 $strShowStatusRpl_statusDescr = 'The status of failsafe replication (not yet implemented).';
 $strShowStatusSelect_full_joinDescr = 'The number of joins that do not use indexes. If this value is not 0, you should carefully check the indexes of your tables.';
 $strShowStatusSelect_full_range_joinDescr = 'The number of joins that used a range search on a reference table.';
-$strShowStatusSelect_rangeDescr = 'The number of joins that used ranges on the first table. (It\'s normally not critical even if this is big.)';
 $strShowStatusSelect_range_checkDescr = 'The number of joins without keys that check for key usage after each row. (If this is not 0, you should carefully check the indexes of your tables.)';
+$strShowStatusSelect_rangeDescr = 'The number of joins that used ranges on the first table. (It\'s normally not critical even if this is big.)';
 $strShowStatusSelect_scanDescr = 'The number of joins that did a full scan of the first table.';
 $strShowStatusSlave_open_temp_tablesDescr = 'The number of temporary tables currently open by the slave SQL thread.';
 $strShowStatusSlave_retried_transactionsDescr = 'Total (since startup) number of times the replication slave SQL thread has retried transactions.';
@@ -1284,9 +1284,9 @@ $strSQPBugInvalidIdentifer = 'Invalid Identifer';
 $strSQPBugUnclosedQuote = 'Unclosed quote';
 $strSQPBugUnknownPunctuation = 'Unknown Punctuation String';
 $strStandInStructureForView = 'Stand-in structure for view';
+$strStatCheckTime = 'Last check';
 $strStatCreateTime = 'Creation';
 $strStatement = 'Statements';
-$strStatCheckTime = 'Last check';
 $strStatisticsOverrun = 'On a busy server, the byte counters may overrun, so those statistics as reported by the MySQL server may be incorrect.';
 $strStatUpdateTime = 'Last update';
 $strStatus = 'Status';
diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php
index 7ef0e05af..7a52a7fa4 100644
--- a/lang/estonian-utf-8.inc.php
+++ b/lang/estonian-utf-8.inc.php
@@ -1212,9 +1212,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1451,4 +1449,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php
index 7e2aaeea8..1cd4ef868 100644
--- a/lang/finnish-utf-8.inc.php
+++ b/lang/finnish-utf-8.inc.php
@@ -1042,7 +1042,6 @@ $strSetupServers_hide_db_desc = 'Piilota tietokannat, jotka vastaavat säännöl
 $strSetupServers_hide_db_name = 'Piilota tietokannat';
 $strSetupServers_history_desc = 'Jätä tyhjäksi, jos et halua SQL-kyselyhistorian tukea; oletusarvo: [kbd]pma_history[/kbd]';
 $strSetupServers_history_name = 'SQL-kyselyhistorian taulu';
-$strSetupServers_host_desc = '';
 $strSetupServers_host_name = 'Palvelimen verkkonimi';
 $strSetupServers_LogoutURL_name = 'Uloskirjautumisen verkko-osoite';
 $strSetupServers_nopassword_desc = 'Yritä yhdistää ilman salasanaa';
@@ -1077,7 +1076,6 @@ $strSetupServers_user_desc = 'Jätä tyhjäksi, jos et käytä config-todennusta
 $strSetupServers_user_name = 'Config-todennuksen käyttäjä';
 $strSetupServers_verbose_check_desc = 'Poista käytöstä, mikäli tiedät pma_*-taulujesi olevan ajan tasalla. Tämä estää yhteensopivuustarkistukset ja lisää siten suorituskykyä.';
 $strSetupServers_verbose_check_name = 'Yksityiskohtainen tarkistus';
-$strSetupServers_verbose_desc = 'MySQL-palvelimen verkkonimi';
 $strSetupServers_verbose_name = 'Tämän palvelimen yksityiskohtainen nimi';
 $strSetupSetValue = 'Aseta arvo: %s';
 $strSetupShowAll_desc = 'Pitääkö käyttäjälle näyttää "Näytä kaikki (tietueet)" -painike';
@@ -1446,4 +1444,6 @@ $strYes = 'Kyllä';
 $strZeroRemovesTheLimit = 'Huom: Näiden valintojen asettaminen nollaksi (0) poistaa rajoituksen.';
 $strZip = '"zip-pakattu"';
 
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php
index 0edc2712a..f8bd83d01 100644
--- a/lang/french-utf-8.inc.php
+++ b/lang/french-utf-8.inc.php
@@ -1038,7 +1038,7 @@ $strSetupServers_hide_db_desc = 'Masquer les bases dont le nom correspond à l\'
 $strSetupServers_hide_db_name = 'Masquer les bases de données';
 $strSetupServers_history_desc = 'Laisser vider pour désactiver, par défaut : [kbd]pma_history[/kbd]';
 $strSetupServers_history_name = 'Tables pour historique des requêtes SQL';
-$strSetupServers_host_desc = '';
+$strSetupServers_host_desc = 'Le nom du serveur sur lequel MySQL est en exécution.';
 $strSetupServers_host_name = 'Nom du serveur';
 $strSetupServers_LogoutURL_name = 'URL pour quitter';
 $strSetupServers_nopassword_desc = 'Essayer de se connecter sans mot de passe';
@@ -1073,7 +1073,7 @@ $strSetupServers_user_desc = 'Laisser vide si vous n\'utilisez pas la méthode d
 $strSetupServers_user_name = 'Utilisateur pour méthode "config"';
 $strSetupServers_verbose_check_desc = 'Désactiver si vous savez que vos tables pma_* sont à jour. Ceci contourne une vérification et améliore la performance';
 $strSetupServers_verbose_check_name = 'Vérification détaillée';
-$strSetupServers_verbose_desc = 'Nom du serveur où MySQL tourne';
+$strSetupServers_verbose_desc = 'Une description conviviale de ce serveur. Laisser vide pour utiliser à la place le nom du serveur.';
 $strSetupServers_verbose_name = 'Nom à afficher pour ce serveur';
 $strSetupSetValue = 'Assigner la valeur: %s';
 $strSetupShowAll_desc = '...via le bouton "Tout afficher"';
diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php
index 4d0b23e10..2a53ddf08 100644
--- a/lang/galician-utf-8.inc.php
+++ b/lang/galician-utf-8.inc.php
@@ -1205,9 +1205,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1444,4 +1442,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php
index 8b55ac176..c06d2283f 100644
--- a/lang/georgian-utf-8.inc.php
+++ b/lang/georgian-utf-8.inc.php
@@ -1232,9 +1232,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1471,4 +1469,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php
index 4a0114d80..780ae9536 100644
--- a/lang/german-utf-8.inc.php
+++ b/lang/german-utf-8.inc.php
@@ -1212,9 +1212,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1451,4 +1449,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php
index c8f6a785b..df80d26d4 100644
--- a/lang/greek-utf-8.inc.php
+++ b/lang/greek-utf-8.inc.php
@@ -1229,9 +1229,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1468,4 +1466,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php
index 7aae0f5fe..94bf983d3 100644
--- a/lang/hebrew-utf-8.inc.php
+++ b/lang/hebrew-utf-8.inc.php
@@ -1224,9 +1224,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1463,4 +1461,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php
index 85ab447a6..e980b1b33 100644
--- a/lang/hindi-utf-8.inc.php
+++ b/lang/hindi-utf-8.inc.php
@@ -1232,9 +1232,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1471,4 +1469,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php
index 6f5552409..406b35ed0 100644
--- a/lang/hungarian-utf-8.inc.php
+++ b/lang/hungarian-utf-8.inc.php
@@ -1043,7 +1043,6 @@ $strSetupServers_hide_db_desc = 'A (PCRE) reguláris kifejezéssel megegyező ad
 $strSetupServers_hide_db_name = 'Adatbázisok elrejtése';
 $strSetupServers_history_desc = 'Hagyja üresen, ha nincs szükség az SQL-lekérdezések előzményeinek támogatására, alapértelmezés: [kbd]pma_history[/kbd]';
 $strSetupServers_history_name = 'SQL-lekérdezések előzményeinek táblája';
-$strSetupServers_host_desc = '';
 $strSetupServers_host_name = 'A szerver állomásneve';
 $strSetupServers_LogoutURL_name = 'Kijelentkezési URL';
 $strSetupServers_nopassword_desc = 'A csatlakozás jelszó nélküli megkísérlése';
@@ -1078,7 +1077,6 @@ $strSetupServers_user_desc = 'Hagyja üresen, ha nem a konfigurációs hitelesí
 $strSetupServers_user_name = 'A konfigurációs hitelesítés felhasználóneve';
 $strSetupServers_verbose_check_desc = 'Tiltsa le, ha tudja, hogy a pma_* táblák naprakészek. Ez megelőzi a kompatibilitási ellenőrzéseket, s ezáltal növeli a teljesítményt';
 $strSetupServers_verbose_check_name = 'Részletes ellenőrzés';
-$strSetupServers_verbose_desc = 'Az állomás neve, ahol a MySQL szerver fut';
 $strSetupServers_verbose_name = 'A szerver részletes neve';
 $strSetupSetValue = 'Adja meg az értéket: %s';
 $strSetupShowAll_desc = 'Meg kell-e jeleníteni egy felhasználó számára az "az összes (rekord) megjelenítése" gombot';
@@ -1448,4 +1446,6 @@ $strZeroRemovesTheLimit = 'Megjegyzés: Ezen beállítások 0-ra (nulla) állít
 $strZip = '"zip tömörítés"';
 
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php
index fdfef5ecd..490a765e5 100644
--- a/lang/indonesian-utf-8.inc.php
+++ b/lang/indonesian-utf-8.inc.php
@@ -1222,9 +1222,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1461,4 +1459,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php
index cdb3f66b6..a831b3c41 100644
--- a/lang/italian-utf-8.inc.php
+++ b/lang/italian-utf-8.inc.php
@@ -1366,7 +1366,6 @@ $strSetupServers_hide_db_desc = 'Hide databases matching regular expression (PCR
 $strSetupServers_hide_db_name = 'Hide databases';  //to translate
 $strSetupServers_history_desc = 'Leave blank for no SQL query history support, default: [kbd]pma_history[/kbd]';  //to translate
 $strSetupServers_history_name = 'SQL query history table';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
 $strSetupServers_LogoutURL_name = 'Logout URL';  //to translate
 $strSetupServers_nopassword_desc = 'Try to connect without password';  //to translate
@@ -1401,7 +1400,6 @@ $strSetupServers_user_desc = 'Leave empty if not using config auth';  //to trans
 $strSetupServers_user_name = 'User for config auth';  //to translate
 $strSetupServers_verbose_check_desc = 'Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance';  //to translate
 $strSetupServers_verbose_check_name = 'Verbose check';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
 $strSetupShowAll_desc = 'Whether a user should be displayed a "show all (records)" button';  //to translate
 $strSetupShowAll_name = 'Allow to display all the rows';  //to translate
@@ -1450,4 +1448,6 @@ $strSetupZipDumpImportWarning = '[a@?page=form&formset=features#tab_Import_e
 $strSetupZipDump_name = 'ZIP';  //to translate
 
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php
index 8d40f2502..7d5e95446 100644
--- a/lang/japanese-utf-8.inc.php
+++ b/lang/japanese-utf-8.inc.php
@@ -1212,9 +1212,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1451,4 +1449,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php
index 119aa9140..b5a2a843e 100644
--- a/lang/korean-utf-8.inc.php
+++ b/lang/korean-utf-8.inc.php
@@ -1227,9 +1227,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1466,4 +1464,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php
index c3bd00d32..cc3d3c3cb 100644
--- a/lang/latvian-utf-8.inc.php
+++ b/lang/latvian-utf-8.inc.php
@@ -1229,9 +1229,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1468,4 +1466,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php
index 18853717a..f043ba1cc 100644
--- a/lang/lithuanian-utf-8.inc.php
+++ b/lang/lithuanian-utf-8.inc.php
@@ -1222,9 +1222,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1461,4 +1459,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php
index a56ca1e03..feb7d5c00 100644
--- a/lang/macedonian_cyrillic-utf-8.inc.php
+++ b/lang/macedonian_cyrillic-utf-8.inc.php
@@ -1207,9 +1207,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1446,4 +1444,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php
index 4f993e7c0..7ca36cb5e 100644
--- a/lang/malay-utf-8.inc.php
+++ b/lang/malay-utf-8.inc.php
@@ -1244,9 +1244,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1483,4 +1481,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php
index cd5ebc80a..6313bd712 100644
--- a/lang/mongolian-utf-8.inc.php
+++ b/lang/mongolian-utf-8.inc.php
@@ -1227,9 +1227,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1466,4 +1464,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php
index 135ff3859..dfb7bf518 100644
--- a/lang/norwegian-utf-8.inc.php
+++ b/lang/norwegian-utf-8.inc.php
@@ -896,9 +896,7 @@ $strSetupForm_Export_defaults_desc = 'Endre standard eksportinnstillinger';
 $strSetupForm_Query_window = 'Spørringsvindu';
 $strSetupForm_Query_window_desc = 'Endre spørringsvinduinnstillinger';
 $strSetupServers_verbose_name = 'Fult navn for denne tjeneren';
-$strSetupServers_verbose_desc = 'Vertsnavn hvor MySQL tjeneren kjører';
 $strSetupServers_host_name = 'Tjenervertsnavn';
-$strSetupServers_host_desc = '';
 $strSetupServers_port_name = 'Tjenerport';
 $strSetupServers_port_desc = 'Porten som MySQL tjeneren lytter på, la stå tom for standard verdi';
 $strSetupServers_socket_name = 'Tjenersokkel';
@@ -1443,4 +1441,6 @@ $strZeroRemovesTheLimit = 'Merk: Ved å sette disse til 0 (null) fjernes begrens
 $strZip = 'Komprimert (zip)';
 
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php
index 1d53150d7..181d89a4d 100644
--- a/lang/persian-utf-8.inc.php
+++ b/lang/persian-utf-8.inc.php
@@ -1258,9 +1258,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1497,4 +1495,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php
index 91507c7e1..c48f717ec 100644
--- a/lang/polish-utf-8.inc.php
+++ b/lang/polish-utf-8.inc.php
@@ -1205,9 +1205,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Nazwa hosta serwera';
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Port serwera';
 $strSetupServers_port_desc = 'Port na którym nasłuchuje serwer MySQL, pole puste oznacza wartość domyślną';
 $strSetupServers_socket_name = 'Gniazdo serwer';
@@ -1439,4 +1437,6 @@ $strSetupExport_file_template_table_name = 'Table name template';  //to translat
 $strSetupExport_file_template_database_name = 'Database name template';  //to translate
 $strSetupExport_file_template_server_name = 'Server name template';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php
index 8ff5e3481..964fe633b 100644
--- a/lang/portuguese-utf-8.inc.php
+++ b/lang/portuguese-utf-8.inc.php
@@ -1233,9 +1233,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1472,4 +1470,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php
index 7ae251086..a0d4da7ae 100644
--- a/lang/romanian-utf-8.inc.php
+++ b/lang/romanian-utf-8.inc.php
@@ -1208,9 +1208,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1447,4 +1445,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php
index ea5b85afe..b10a9136d 100644
--- a/lang/russian-utf-8.inc.php
+++ b/lang/russian-utf-8.inc.php
@@ -1217,9 +1217,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1456,4 +1454,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php
index 0984c1da3..aa01330f0 100644
--- a/lang/serbian_cyrillic-utf-8.inc.php
+++ b/lang/serbian_cyrillic-utf-8.inc.php
@@ -1206,9 +1206,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1445,4 +1443,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php
index c0c522832..fc4664a2d 100644
--- a/lang/serbian_latin-utf-8.inc.php
+++ b/lang/serbian_latin-utf-8.inc.php
@@ -1206,9 +1206,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1445,4 +1443,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php
index 7a32211a1..43e15e617 100644
--- a/lang/sinhala-utf-8.inc.php
+++ b/lang/sinhala-utf-8.inc.php
@@ -1209,9 +1209,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1448,4 +1446,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php
index c480efaeb..e1aafbf67 100644
--- a/lang/slovak-utf-8.inc.php
+++ b/lang/slovak-utf-8.inc.php
@@ -1207,9 +1207,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1446,4 +1444,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php
index b5a3220c0..41b2a097f 100644
--- a/lang/slovenian-utf-8.inc.php
+++ b/lang/slovenian-utf-8.inc.php
@@ -1226,9 +1226,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1465,4 +1463,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php
index 38a1140d5..2ca4f5ecc 100644
--- a/lang/spanish-utf-8.inc.php
+++ b/lang/spanish-utf-8.inc.php
@@ -1202,9 +1202,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1441,4 +1439,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php
index 9d34107ce..1a5ac5c4d 100644
--- a/lang/swedish-utf-8.inc.php
+++ b/lang/swedish-utf-8.inc.php
@@ -1038,7 +1038,6 @@ $strSetupServers_hide_db_desc = 'Dölj databaser som matchar reguljärt uttryck
 $strSetupServers_hide_db_name = 'Dölj databaser';
 $strSetupServers_history_desc = 'Lämna tomt för inget stöd för SQL-frågehistorik, standard: [kbd]pma_history[/kbd]';
 $strSetupServers_history_name = 'Tabell för SQL-frågehistorik';
-$strSetupServers_host_desc = 'Serverns värdnamn eller IP-adress, t.ex. localhost';
 $strSetupServers_host_name = 'Serverns värdnamn';
 $strSetupServers_LogoutURL_name = 'Utloggning URL';
 $strSetupServers_nopassword_desc = 'Försök ansluta utan lösenord';
@@ -1073,7 +1072,6 @@ $strSetupServers_user_desc = 'Lämna tomt om inte autentisering config används'
 $strSetupServers_user_name = 'Användare för autentisering config';
 $strSetupServers_verbose_check_desc = 'Inaktivera ifall du vet att dina tabeller pma_* är aktuella. Detta förhindrar kompabilitetskontroller och ökar därmed prestanda';
 $strSetupServers_verbose_check_name = 'Utförlig kontroll';
-$strSetupServers_verbose_desc = 'Värdnamn där MySQL-servern körs';
 $strSetupServers_verbose_name = 'Beskrivande namn för denna server';
 $strSetupSetValue = 'Ange värde: %s';
 $strSetupShowAll_desc = 'Ifall en användare ska få se en knapp "visa alla (rader)"';
@@ -1443,4 +1441,6 @@ $strZeroRemovesTheLimit = 'Anm: Genom att sätta dessa alternativ till 0 (noll)
 $strZip = '"zippad"';
 
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php
index 37243f867..aa9c28086 100644
--- a/lang/tatarish-utf-8.inc.php
+++ b/lang/tatarish-utf-8.inc.php
@@ -1217,9 +1217,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1456,4 +1454,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php
index 9f53ac768..a44bb4446 100644
--- a/lang/thai-utf-8.inc.php
+++ b/lang/thai-utf-8.inc.php
@@ -1228,9 +1228,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1467,4 +1465,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php
index 3f470d87f..91d9f1108 100644
--- a/lang/turkish-utf-8.inc.php
+++ b/lang/turkish-utf-8.inc.php
@@ -1212,9 +1212,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1451,4 +1449,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>
diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php
index df96a5047..375f5d739 100644
--- a/lang/ukrainian-utf-8.inc.php
+++ b/lang/ukrainian-utf-8.inc.php
@@ -1226,9 +1226,7 @@ $strSetupForm_Export_defaults_desc = 'Customize default export options';  //to t
 $strSetupForm_Query_window = 'Query window';  //to translate
 $strSetupForm_Query_window_desc = 'Customize query window options';  //to translate
 $strSetupServers_verbose_name = 'Verbose name of this server';  //to translate
-$strSetupServers_verbose_desc = 'Hostname where MySQL server is running';  //to translate
 $strSetupServers_host_name = 'Server hostname';  //to translate
-$strSetupServers_host_desc = '';  //to translate
 $strSetupServers_port_name = 'Server port';  //to translate
 $strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default';  //to translate
 $strSetupServers_socket_name = 'Server socket';  //to translate
@@ -1465,4 +1463,6 @@ $strSetupServers_extension_desc = 'What PHP extension to use; you should use mys
 $strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.';  //to translate
 $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)';  //to translate
 $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc-maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.';  //to translate
+$strSetupServers_host_desc = 'Hostname where MySQL server is running';  //to translate
+$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.';  //to translate
 ?>