rfe #1778908 [auth] arbitrary server auth can now also accept port

ChangeLog

@@ -17,6 +17,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 + [auth] cookie authentication is now default
 + [auth] do not allow root user without password unless explicitly enabled by
   AllowEmptyRoot
++ rfe #1778908 [auth] arbitrary server auth can now also accept port
 
 3.0.0.0 (not yet released)
 + [export] properly handle line breaks for YAML, thanks to Dan Barry -

lang/afrikaans-utf-8.inc.php

@@ -1118,4 +1118,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/albanian-utf-8.inc.php

@@ -1117,4 +1117,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/arabic-utf-8.inc.php

@@ -1119,4 +1119,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/azerbaijani-utf-8.inc.php

@@ -1114,4 +1114,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/bangla-utf-8.inc.php

@@ -1093,4 +1093,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/basque-utf-8.inc.php

@@ -1111,4 +1111,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/belarusian_cyrillic-utf-8.inc.php

@@ -1094,4 +1094,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/belarusian_latin-utf-8.inc.php

@@ -1102,4 +1102,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/bosnian-utf-8.inc.php

@@ -1117,4 +1117,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/brazilian_portuguese-utf-8.inc.php

@@ -1091,4 +1091,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/bulgarian-utf-8.inc.php

@@ -1114,4 +1114,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/catalan-utf-8.inc.php

@@ -1089,4 +1089,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/chinese_simplified-utf-8.inc.php

@@ -1119,4 +1119,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/chinese_traditional-utf-8.inc.php

@@ -1098,4 +1098,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/croatian-utf-8.inc.php

@@ -1092,4 +1092,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/czech-utf-8.inc.php

@@ -458,6 +458,7 @@ $strLoginInformation = 'Přihlašování';
 $strLogin = 'Přihlášení';
 $strLogout = 'Odhlásit se';
 $strLogPassword = 'Heslo:';
+$strLogServerHelp = 'Můžete zadat jméno počítače/IP adresu a port oddělené mezerou.';
 $strLogServer = 'Server:';
 $strLogUsername = 'Jméno:';
 $strLongOperation = 'Tato operace může trvat velmi dlouho. Chcete je přesto provést?';

lang/danish-utf-8.inc.php

@@ -1093,4 +1093,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/dutch-utf-8.inc.php

@@ -1115,4 +1115,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/english-utf-8.inc.php

@@ -133,26 +133,6 @@ $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';
@@ -201,6 +181,26 @@ $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';
@@ -434,7 +434,6 @@ $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';
@@ -443,6 +442,7 @@ $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';
@@ -458,6 +458,7 @@ $strLoginInformation = 'Login Information';
 $strLogin = 'Log in';
 $strLogout = 'Log out';
 $strLogPassword = 'Password:';
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';
 $strLogServer = 'Server:';
 $strLogUsername = 'Username:';
 $strLongOperation = 'This operation could take a long time. Proceed anyway?';
@@ -498,9 +499,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 +568,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 pre thread, but only if the thread is required to write a data log.';
@@ -638,8 +639,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';
-$strPrivDescExecute5 = 'Allows executing stored routines.';
 $strPrivDescExecute = 'Allows running stored procedures; has no effect in this MySQL version.';
+$strPrivDescExecute5 = 'Allows executing stored routines.';
 $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.';
@@ -885,8 +886,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_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_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_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.';
@@ -932,9 +933,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';

lang/estonian-utf-8.inc.php

@@ -1099,4 +1099,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/finnish-utf-8.inc.php

@@ -1093,4 +1093,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/french-utf-8.inc.php

@@ -1090,4 +1090,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/galician-utf-8.inc.php

@@ -1092,4 +1092,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/georgian-utf-8.inc.php

@@ -1119,4 +1119,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/german-utf-8.inc.php

@@ -1099,4 +1099,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/greek-utf-8.inc.php

@@ -1116,4 +1116,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/hebrew-utf-8.inc.php

@@ -1111,4 +1111,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/hindi-utf-8.inc.php

@@ -1119,4 +1119,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/hungarian-utf-8.inc.php

@@ -1110,4 +1110,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/indonesian-utf-8.inc.php

@@ -1109,4 +1109,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/italian-utf-8.inc.php

@@ -1093,4 +1093,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/japanese-utf-8.inc.php

@@ -1110,4 +1110,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/korean-utf-8.inc.php

@@ -1114,4 +1114,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/latvian-utf-8.inc.php

@@ -1116,4 +1116,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/lithuanian-utf-8.inc.php

@@ -1109,4 +1109,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/macedonian_cyrillic-utf-8.inc.php

@@ -1094,4 +1094,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/malay-utf-8.inc.php

@@ -1131,4 +1131,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/mongolian-utf-8.inc.php

@@ -1114,4 +1114,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/norwegian-utf-8.inc.php

@@ -1091,4 +1091,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/persian-utf-8.inc.php

@@ -1116,4 +1116,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/polish-utf-8.inc.php

@@ -1087,4 +1087,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/portuguese-utf-8.inc.php

@@ -1120,4 +1120,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/romanian-utf-8.inc.php

@@ -1108,4 +1108,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/russian-utf-8.inc.php

@@ -1095,4 +1095,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/serbian_cyrillic-utf-8.inc.php

@@ -1093,4 +1093,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/serbian_latin-utf-8.inc.php

@@ -1093,4 +1093,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/sinhala-utf-8.inc.php

@@ -1096,4 +1096,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/slovak-utf-8.inc.php

@@ -1094,4 +1094,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/slovenian-utf-8.inc.php

@@ -1113,4 +1113,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/spanish-utf-8.inc.php

@@ -1089,4 +1089,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/swedish-utf-8.inc.php

@@ -1091,4 +1091,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/tatarish-utf-8.inc.php

@@ -1105,4 +1105,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/thai-utf-8.inc.php

@@ -1115,4 +1115,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/turkish-utf-8.inc.php

@@ -1099,4 +1099,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

lang/ukrainian-utf-8.inc.php

@@ -1113,4 +1113,5 @@ $strViewImage = 'View image';  //to translate
 $strPlayAudio = 'Play audio';  //to translate
 $strViewVideo = 'View video';  //to translate
 $strDownloadFile = 'Download file';  //to translate
+$strLogServerHelp = 'You can ether hostname/IP address and port separated by space.';  //to translate
 ?>

libraries/auth/cookie.auth.lib.php

@@ -262,8 +262,8 @@ if (top != self) {
 
 <?php if ($GLOBALS['cfg']['AllowArbitraryServer']) { ?>
         <div class="item">
-            <label for="input_servername"><?php echo $GLOBALS['strLogServer']; ?></label>
-            <input type="text" name="pma_servername" id="input_servername" value="<?php echo htmlspecialchars($default_server); ?>" size="24" class="textfield" />
+            <label for="input_servername" title="<?php echo $GLOBALS['strLogServerHelp']; ?>"><?php echo $GLOBALS['strLogServer']; ?></label>
+            <input type="text" name="pma_servername" id="input_servername" value="<?php echo htmlspecialchars($default_server); ?>" size="24" class="textfield" title="<?php echo $GLOBALS['strLogServerHelp']; ?>" />
         </div>
 <?php } ?>
         <div class="item">
@@ -548,9 +548,22 @@ function PMA_auth_set_user()
     } // end if
 
     if ($GLOBALS['cfg']['AllowArbitraryServer']
-     && ! empty($GLOBALS['pma_auth_server'])
-     && $cfg['Server']['host'] != $GLOBALS['pma_auth_server']) {
-        $cfg['Server']['host'] = $GLOBALS['pma_auth_server'];
+     && ! empty($GLOBALS['pma_auth_server'])) {
+        /* Allow to specify 'host port' */
+        $parts = explode(' ', $GLOBALS['pma_auth_server']);
+        if (count($parts) == 2) {
+            $tmp_host = $parts[0];
+            $tmp_port = $parts[1];
+        } else {
+            $tmp_host = $GLOBALS['pma_auth_server'];
+            $tmp_port = '';
+        }
+        if ($cfg['Server']['host'] != $GLOBALS['pma_auth_server']) {
+            $cfg['Server']['host'] = $tmp_host;
+            if (!empty($tmp_port)) {
+                $cfg['Server']['port'] = $tmp_port;
+            }
+        }
     }
     $cfg['Server']['user']     = $GLOBALS['PHP_AUTH_USER'];
     $cfg['Server']['password'] = $GLOBALS['PHP_AUTH_PW'];