From eceb0aa5bcce3f93c4a37673421ebefb04121877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Tue, 3 Mar 2009 15:08:13 +0000 Subject: [PATCH] rfe #2186820 Explanation for using Host table. --- ChangeLog | 1 + lang/afrikaans-utf-8.inc.php | 1 + lang/albanian-utf-8.inc.php | 1 + lang/arabic-utf-8.inc.php | 1 + lang/azerbaijani-utf-8.inc.php | 1 + lang/bangla-utf-8.inc.php | 1 + lang/basque-utf-8.inc.php | 1 + lang/belarusian_cyrillic-utf-8.inc.php | 1 + lang/belarusian_latin-utf-8.inc.php | 1 + lang/bosnian-utf-8.inc.php | 1 + lang/brazilian_portuguese-utf-8.inc.php | 1 + lang/bulgarian-utf-8.inc.php | 1 + lang/catalan-utf-8.inc.php | 1 + lang/chinese_simplified-utf-8.inc.php | 1 + lang/chinese_traditional-utf-8.inc.php | 1 + lang/croatian-utf-8.inc.php | 1 + lang/czech-utf-8.inc.php | 3 +- lang/danish-utf-8.inc.php | 1 + lang/dutch-utf-8.inc.php | 1 + lang/english-utf-8.inc.php | 85 +++++++++++++------------ lang/estonian-utf-8.inc.php | 1 + lang/finnish-utf-8.inc.php | 1 + lang/french-utf-8.inc.php | 1 + lang/galician-utf-8.inc.php | 1 + lang/georgian-utf-8.inc.php | 1 + lang/german-utf-8.inc.php | 1 + lang/greek-utf-8.inc.php | 1 + lang/hebrew-utf-8.inc.php | 1 + lang/hindi-utf-8.inc.php | 1 + lang/hungarian-utf-8.inc.php | 1 + lang/indonesian-utf-8.inc.php | 1 + lang/italian-utf-8.inc.php | 1 + lang/japanese-utf-8.inc.php | 1 + lang/korean-utf-8.inc.php | 1 + lang/latvian-utf-8.inc.php | 1 + lang/lithuanian-utf-8.inc.php | 1 + lang/macedonian_cyrillic-utf-8.inc.php | 1 + lang/malay-utf-8.inc.php | 1 + lang/mongolian-utf-8.inc.php | 1 + lang/norwegian-utf-8.inc.php | 1 + lang/persian-utf-8.inc.php | 1 + lang/polish-utf-8.inc.php | 1 + lang/portuguese-utf-8.inc.php | 1 + lang/romanian-utf-8.inc.php | 1 + lang/russian-utf-8.inc.php | 1 + lang/serbian_cyrillic-utf-8.inc.php | 1 + lang/serbian_latin-utf-8.inc.php | 1 + lang/sinhala-utf-8.inc.php | 1 + lang/slovak-utf-8.inc.php | 1 + lang/slovenian-utf-8.inc.php | 1 + lang/spanish-utf-8.inc.php | 1 + lang/swedish-utf-8.inc.php | 1 + lang/tatarish-utf-8.inc.php | 1 + lang/thai-utf-8.inc.php | 1 + lang/turkish-utf-8.inc.php | 1 + lang/ukrainian-utf-8.inc.php | 1 + server_privileges.php | 13 ++-- 57 files changed, 106 insertions(+), 49 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2852263dd..5c29264e8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -37,6 +37,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + rfe #2123386 Added option to disable mcrypt warning. - bug #2648502 Request-URI Too Large error from Location header + rfe #1731967 Check for relations support on main page. ++ rfe #2186820 Explanation for using Host table. 3.1.4.0 (not yet released) + patch #1808339 [doc] Apache SSLOptions and StdEnvVars FAQ, diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 71f721d71..389a9f500 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1474,4 +1474,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 4a0e5c27b..eaeb23162 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1473,4 +1473,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 56057e10c..8021208b8 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1475,4 +1475,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index 26dfbb1ce..a5ca8305f 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1470,4 +1470,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index e31d652e9..4ce3c3430 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1449,4 +1449,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 5b38a92f2..2ee7b5583 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1467,4 +1467,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 552c5df4f..5df4e661f 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1449,4 +1449,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 358ddcfe1..570106891 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1457,4 +1457,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 6ddc4d3db..21398992e 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1473,4 +1473,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 0b3bd5992..2b3a8e04d 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1447,4 +1447,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index d654a3845..822711ad7 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1470,4 +1470,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 9aaace630..bf2a989ac 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1447,4 +1447,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 1afc5630c..c4bd9880a 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1475,4 +1475,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 7862a82de..8c2c53590 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1454,4 +1454,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 1d18acd54..c4c0aace7 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1451,4 +1451,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 2c2fce929..03f31c97e 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1288,7 +1288,7 @@ $strUploadLimit = 'Pravděpodobně jste se pokusili nahrát příliš velký sou $strUploadsNotAllowed = 'Upload souborů není na tomto serveru povolen.'; $strUsage = 'Používá'; $strUseBackquotes = 'Použít zpětné uvozovky u jmen tabulek a sloupců'; -$strUseHostTable = 'Použít tabulku s počítači'; +$strUseHostTable = 'Použít tabulku Host'; $strUserAlreadyExists = 'Uživatel %s již existuje!'; $strUserEmpty = 'Jméno uživatele je prázdné!'; $strUserName = 'Jméno uživatele'; @@ -1453,4 +1453,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'Pokud je použita tabulka Host, toto pole je ignorováno a jsou použity hodnoty uložené v tabulce Host.'; ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index f94b7edc1..1052efbbd 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1449,4 +1449,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 124548559..253e8228d 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1456,4 +1456,5 @@ $strStatic = 'statisch'; $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 62a639328..ebd0103b1 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -132,26 +132,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'; @@ -361,6 +361,7 @@ $strHome = 'Home'; $strHomepageOfficial = 'Official Homepage'; $strHostEmpty = 'The host name is empty!'; $strHost = 'Host'; +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; $strHTMLExcel = 'Microsoft Excel 2000'; $strHTMLWord = 'Microsoft Word 2000'; $strHungarian = 'Hungarian'; @@ -433,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'; @@ -442,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'; @@ -499,9 +500,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'; @@ -568,19 +569,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.'; @@ -639,8 +640,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.'; @@ -788,8 +789,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'; -$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'; +$strSetupBlowfishSecretCharsMsg = 'Key should contain letters, numbers [em]and[/em] special characters'; $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'; @@ -802,13 +803,6 @@ $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'; @@ -850,12 +844,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'; @@ -918,6 +912,13 @@ $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'; @@ -965,10 +966,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'; -$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'; +$strSetupMaxCharactersInDisplayedSQL_desc = 'Maximum number of characters used when a SQL query is displayed'; +$strSetupMaxCharactersInDisplayedSQL_name = 'Maximum displayed SQL length'; $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'; @@ -1075,20 +1076,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 = 'A user-friendly description of this server. Leave blank to display the hostname instead.'; $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'; @@ -1240,8 +1241,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.'; @@ -1287,9 +1288,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'; $strStatic = 'static'; $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'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 4452b6144..2b16b48e1 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1455,4 +1455,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 3fce1a5a8..34efee9d4 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1450,4 +1450,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 68e37285b..e6f0e37bf 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1446,4 +1446,5 @@ $strYes = 'Oui'; $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.'; $strZip = '"zippé"'; +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index ec492dbf4..826d73a0a 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1448,4 +1448,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index 9bebf10b2..4f2ce8126 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1454,4 +1454,5 @@ $strZip = '"zip-ით შეკუმშული"'; $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index edcc99855..8bec7b3df 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1455,4 +1455,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 941bd7470..fa749af5e 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1472,4 +1472,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 09e8022db..b655141db 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1467,4 +1467,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index d50dd8f9e..9e3c3e0d8 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1475,4 +1475,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 752491096..85f98dd56 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1452,4 +1452,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index d834d9c1c..565120818 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1465,4 +1465,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 9852d19f8..43edaffc3 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1454,4 +1454,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 600861f2c..5488520b9 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1455,4 +1455,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 532ec2f38..863b9eb57 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1470,4 +1470,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index 6ce3d49a5..4a1059913 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1472,4 +1472,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index ce6d47ea7..fc2827db6 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1464,4 +1464,5 @@ $strViewVideo = 'View video'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index 357004475..a0a37c7b6 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1450,4 +1450,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index fff21f7b0..18e9a607a 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1487,4 +1487,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 2d636c311..a0a202621 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1470,4 +1470,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index c0e0b7505..06cce0bc7 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1447,4 +1447,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index d533d478d..79fcdd15f 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1501,4 +1501,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 85dda23dc..06404568f 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1443,4 +1443,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index cc9e8f1f9..66d66200a 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1476,4 +1476,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index 8d633467d..bf8bc0295 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1456,4 +1456,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index bd9b865d2..e7899e441 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1460,4 +1460,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 15e88c82a..adb9a5b09 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1449,4 +1449,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index ba5d6df9f..447c89f65 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1449,4 +1449,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 3d059deca..166acf848 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1452,4 +1452,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 7d8626ce6..b15a6a06e 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1450,4 +1450,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 24fc0c56d..bb642b76e 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1469,4 +1469,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index f50554628..0426f5532 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1445,4 +1445,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 7458df98e..42ec9b063 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1447,4 +1447,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 3641ee0f9..fcf3c3611 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1460,4 +1460,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index da6f882e8..8ffbb977d 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1471,4 +1471,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 68afdf3fd..24eb69a82 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1453,4 +1453,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 31f91deb2..227d62c3f 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1469,4 +1469,5 @@ $strStatic = 'static'; //to translate $strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate ?> diff --git a/server_privileges.php b/server_privileges.php index e7a11ba6c..5cbbe2761 100644 --- a/server_privileges.php +++ b/server_privileges.php @@ -85,10 +85,10 @@ if (!$is_superuser) { * no escaping (for example test_db) but in mysql.db you'll see test\_db * for a db-specific privilege. * - * @param string $db_and_table + * @param string $db_and_table * @param string $dbname * @param string $tablename - * @return string the escaped (if necessary) $db_and_table + * @return string the escaped (if necessary) $db_and_table */ function PMA_WildcardEscapeForGrant($db_and_table, $dbname, $tablename) { @@ -750,6 +750,7 @@ function PMA_displayLoginInformationFields($mode = 'new') . (isset($GLOBALS['hostname']) ? $GLOBALS['hostname'] : '') . '" title="' . $GLOBALS['strHost'] . '" onchange="pred_hostname.value = \'userdefined\';" />' . "\n" + . PMA_showHint($GLOBALS['strHostTableExplanation']) . '' . "\n" . '
' . "\n" . '