From 4ad6f11561060dc868ec0558de2267f932195ff1 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 24 Feb 2010 16:48:52 +0000 Subject: [PATCH] patch #2948421 HTTP Basic auth realm name --- ChangeLog | 2 + Documentation.html | 10 +++ lang/afrikaans-utf-8.inc.php | 2 + lang/albanian-utf-8.inc.php | 2 + lang/arabic-utf-8.inc.php | 2 + lang/azerbaijani-utf-8.inc.php | 2 + lang/bangla-utf-8.inc.php | 2 + lang/basque-utf-8.inc.php | 2 + lang/belarusian_cyrillic-utf-8.inc.php | 2 + lang/belarusian_latin-utf-8.inc.php | 2 + lang/bosnian-utf-8.inc.php | 2 + lang/brazilian_portuguese-utf-8.inc.php | 2 + lang/bulgarian-utf-8.inc.php | 2 + lang/catalan-utf-8.inc.php | 2 + lang/chinese_simplified-utf-8.inc.php | 2 + lang/chinese_traditional-utf-8.inc.php | 2 + lang/croatian-utf-8.inc.php | 2 + lang/czech-utf-8.inc.php | 2 + lang/danish-utf-8.inc.php | 2 + lang/dutch-utf-8.inc.php | 2 + lang/english-gb-utf-8.inc.php | 96 +++++++++++++------------ lang/english-utf-8.inc.php | 96 +++++++++++++------------ lang/estonian-utf-8.inc.php | 2 + lang/finnish-utf-8.inc.php | 2 + lang/french-utf-8.inc.php | 2 + lang/galician-utf-8.inc.php | 2 + lang/georgian-utf-8.inc.php | 2 + lang/german-utf-8.inc.php | 2 + lang/greek-utf-8.inc.php | 2 + lang/hebrew-utf-8.inc.php | 2 + lang/hindi-utf-8.inc.php | 2 + lang/hungarian-utf-8.inc.php | 2 + lang/indonesian-utf-8.inc.php | 2 + lang/italian-utf-8.inc.php | 2 + lang/japanese-utf-8.inc.php | 2 + lang/korean-utf-8.inc.php | 2 + lang/latvian-utf-8.inc.php | 2 + lang/lithuanian-utf-8.inc.php | 2 + lang/macedonian_cyrillic-utf-8.inc.php | 2 + lang/malay-utf-8.inc.php | 2 + lang/mongolian-utf-8.inc.php | 2 + lang/norwegian-utf-8.inc.php | 2 + lang/persian-utf-8.inc.php | 2 + lang/polish-utf-8.inc.php | 2 + lang/portuguese-utf-8.inc.php | 2 + lang/romanian-utf-8.inc.php | 2 + lang/russian-utf-8.inc.php | 2 + lang/serbian_cyrillic-utf-8.inc.php | 2 + lang/serbian_latin-utf-8.inc.php | 2 + lang/sinhala-utf-8.inc.php | 2 + lang/slovak-utf-8.inc.php | 2 + lang/slovenian-utf-8.inc.php | 2 + lang/spanish-utf-8.inc.php | 2 + lang/swedish-utf-8.inc.php | 2 + lang/tatarish-utf-8.inc.php | 2 + lang/thai-utf-8.inc.php | 2 + lang/turkish-utf-8.inc.php | 2 + lang/ukrainian-utf-8.inc.php | 2 + lang/uzbek_cyrillic-utf-8.inc.php | 2 + lang/uzbek_latin-utf-8.inc.php | 2 + libraries/auth/http.auth.lib.php | 15 ++-- libraries/config.default.php | 7 ++ setup/lib/forms.inc.php | 1 + 63 files changed, 240 insertions(+), 99 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2799fdaf..16810d369 100644 --- a/ChangeLog +++ b/ChangeLog @@ -42,6 +42,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + rfe #2792992 [doc] Added advice to re-login after changing pmadb settings + patch #2952353 [interface] Prefill "Copy table to" in tbl_operations.php, thanks to iinl + [lang] Add English (United Kingdom) translation, thanks to Robert Readman. ++ patch #2948421 [auth] HTTP Basic auth realm name, + thanks to Harald Jenny - haraldj 3.3.1.0 (not yet released) - bug #2941037 [core] Database structure not sorted by table correctly diff --git a/Documentation.html b/Documentation.html index 442c04f66..4306cb234 100644 --- a/Documentation.html +++ b/Documentation.html @@ -771,6 +771,16 @@ since this link provides funding for phpMyAdmin. Please see the install section on "Using authentication modes" for more information. +
+ $cfg['Servers'][$i]['auth_http_realm'] string
+
+
+ When using auth_type = 'HTTP', this field allows to define a custom + HTTP Basic Auth Realm which will be displayed to the user. If not explicitly + specified in your configuration, a string combined of "phpMyAdmin " and either + $cfg['Servers'][$i]['verbose'] + or $cfg['Servers'][$i]['host'] will be used. +
$cfg['Servers'][$i]['auth_swekey_config'] string
diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 255c75256..d893e5b73 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1656,4 +1656,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 04767b4d4..462e0208c 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1654,4 +1654,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 51e575e32..32d4eab90 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1658,4 +1658,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index ce439c55d..381ab18d9 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1653,4 +1653,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index 8ca1429b4..3cef1e84b 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1655,4 +1655,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 106e769c4..8a1dbe5cd 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1650,4 +1650,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index c6d42129f..3cb21c945 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1650,4 +1650,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index c2ee5f33b..b7591f302 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1662,4 +1662,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 74454995c..1792a4a82 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1656,4 +1656,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index ebcfacdcb..cc01e07eb 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1650,4 +1650,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index d9e42d1cd..711acd6c7 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1656,4 +1656,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index e82282183..a28150c5f 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1635,4 +1635,6 @@ $strShowInsert = 'Show insert query'; //to translate $strSQLExportUTC = 'Export time in UTC'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 8ca372144..9a236bbe6 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1655,4 +1655,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index d8bfafc2d..ed16cb91f 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1657,4 +1657,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index a8c1be344..fc0f717d2 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1650,4 +1650,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 4278c65df..b80f0beb3 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1636,4 +1636,6 @@ $strReplicationSlaveIOThreadNotRunning = 'Slave IO Thread not running!'; //to t $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 928b91b52..3d3fba82a 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1653,4 +1653,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index b453e2868..51499d909 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1640,4 +1640,6 @@ $strCreateNewTableShort = 'Create new table'; //to translate $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/english-gb-utf-8.inc.php b/lang/english-gb-utf-8.inc.php index 62173b095..2571b0ab5 100644 --- a/lang/english-gb-utf-8.inc.php +++ b/lang/english-gb-utf-8.inc.php @@ -133,6 +133,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'; $strClickToSelect = 'Click to select'; $strClickToUnselect = 'Click to unselect'; $strColComFeat = 'Displaying Column Comments'; @@ -189,26 +209,6 @@ $strCustomColor = 'Custom colour'; $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'; @@ -474,6 +474,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'; @@ -482,7 +483,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'; @@ -541,9 +541,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'; @@ -614,19 +614,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.'; @@ -646,9 +646,9 @@ $strPBXTTransactionBufferSize = 'Transaction buffer size'; $strPdfDbSchema = 'Schema of the "%s" database - Page %s'; $strPdfInvalidTblName = 'The "%s" table doesn\'t exist!'; $strPdfNoTables = 'No tables'; -$strPDF = 'PDF'; $strPDFPageCreated = 'Page has been created'; $strPDFPageCreateFailed = 'Page creation failed'; +$strPDF = 'PDF'; $strPDFReportExplanation = '(Generates a report containing the data of a single table)'; $strPDFReportTitle = 'Report title'; $strPerHour = 'per hour'; @@ -694,8 +694,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.'; @@ -774,15 +774,15 @@ $strReplaceNULLBy = 'Replace NULL by'; $strReplaceTable = 'Replace table data with file'; $strReplicationAddLines = 'Now, add the following lines at the end of [mysqld] section in your my.cnf and please restart the MySQL server afterwards.'; $strReplicationAddSlaveUser = 'Add slave replication user'; +$strReplicationChangedSuccesfully = 'Master server changed succesfully to %s'; $strReplicationConfiguredMaster = 'This server is configured as master in a replication process.'; $strReplicationControlSlave = 'Control slave:'; $strReplicationErrorGetPosition = 'Unable to read master log position. Possible privilege problem on master.'; $strReplicationErrorMasterConnect = 'Unable to connect to master %s.'; -$strReplicationChangedSuccesfully = 'Master server changed succesfully to %s'; -$strReplicationMasterConfiguration = 'Master configuration'; $strReplicationMasterChooseAll = 'Replicate all databases; Ignore:'; $strReplicationMasterChooseIgn = 'Ignore all databases; Replicate:'; $strReplicationMasterChooseMode = 'This server is not configured as master server in a replication process. You can choose from either replicating all databases and ignoring certain (useful if you want to replicate majority of databases) or you can choose to ignore all databases by default and allow only certain databases to be replicated. Please select the mode:'; +$strReplicationMasterConfiguration = 'Master configuration'; $strReplicationMaster = 'Master replication'; $strReplication = 'Replication'; $strReplicationRestartServer = 'Once you restarted MySQL server, please click on Go button. Afterwards, you should see a message informing you, that this server is configured as master'; @@ -792,10 +792,10 @@ $strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report- $strReplicationShowConnectedSlaves = 'Show connected slaves'; $strReplicationShowMasterStatus = 'Show master status'; $strReplicationSkippingErrorWarn = 'Skipping error(s) might lead into unsynchronised master and slave!'; +$strReplicationSlaveChangeMaster = 'Change or reconfigure master server'; $strReplicationSlaveConfiguration = 'Slave configuration'; $strReplicationSlaveConfigured = 'Server is configured as slave in a replication process. Would you like to:'; $strReplicationSlaveErrorManagement = 'Error management:'; -$strReplicationSlaveChangeMaster = 'Change or reconfigure master server'; $strReplicationSlaveIOThread = 'IO Thread %s only'; $strReplicationSlaveIOThreadNotRunning = 'Slave IO Thread not running!'; $strReplicationSlaveNotConfigured = 'This server is not configured as slave in a replication process. Would you like to configure it?'; @@ -805,8 +805,8 @@ $strReplicationSlaveSkipCurrentError = 'Skip current error'; $strReplicationSlaveSkipNextErrors = 'errors.'; $strReplicationSlaveSkipNext = 'Skip next'; $strReplicationSlave = 'Slave replication'; -$strReplicationSlaveSQLThread = 'SQL Thread %s only'; $strReplicationSlaveSQLThreadNotRunning = 'Slave SQL Thread not running!'; +$strReplicationSlaveSQLThread = 'SQL Thread %s only'; $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; $strReplicationStatus_master = 'Master status'; $strReplicationStatus = 'Replication status'; @@ -890,8 +890,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'; @@ -904,6 +904,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'; @@ -945,12 +952,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'; @@ -1013,13 +1020,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'; @@ -1067,10 +1067,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'; @@ -1115,6 +1115,8 @@ $strSetupServers_AllowDeny_rules_desc = 'Leave blank for defaults'; $strSetupServers_AllowDeny_rules_name = 'Host authentication rules'; $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; $strSetupServers_AllowRoot_name = 'Allow root login'; +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; $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)'; $strSetupServers_auth_swekey_config_name = 'SweKey config file'; $strSetupServers_auth_type_desc = 'Authentication method to use'; @@ -1177,20 +1179,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'; @@ -1345,8 +1347,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.'; @@ -1396,9 +1398,9 @@ $strSQPBugUnclosedQuote = 'Unclosed quote'; $strSQPBugUnknownPunctuation = 'Unknown Punctuation String'; $strStandInStructureForView = 'Stand-in structure for view'; $strStart = 'Start'; +$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/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 69684b752..ec65a3809 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -133,6 +133,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'; $strClickToSelect = 'Click to select'; $strClickToUnselect = 'Click to unselect'; $strColComFeat = 'Displaying Column Comments'; @@ -189,26 +209,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'; @@ -474,6 +474,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'; @@ -482,7 +483,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'; @@ -541,9 +541,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'; @@ -614,19 +614,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.'; @@ -646,9 +646,9 @@ $strPBXTTransactionBufferSize = 'Transaction buffer size'; $strPdfDbSchema = 'Schema of the "%s" database - Page %s'; $strPdfInvalidTblName = 'The "%s" table doesn\'t exist!'; $strPdfNoTables = 'No tables'; -$strPDF = 'PDF'; $strPDFPageCreated = 'Page has been created'; $strPDFPageCreateFailed = 'Page creation failed'; +$strPDF = 'PDF'; $strPDFReportExplanation = '(Generates a report containing the data of a single table)'; $strPDFReportTitle = 'Report title'; $strPerHour = 'per hour'; @@ -694,8 +694,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.'; @@ -774,15 +774,15 @@ $strReplaceNULLBy = 'Replace NULL by'; $strReplaceTable = 'Replace table data with file'; $strReplicationAddLines = 'Now, add the following lines at the end of [mysqld] section in your my.cnf and please restart the MySQL server afterwards.'; $strReplicationAddSlaveUser = 'Add slave replication user'; +$strReplicationChangedSuccesfully = 'Master server changed succesfully to %s'; $strReplicationConfiguredMaster = 'This server is configured as master in a replication process.'; $strReplicationControlSlave = 'Control slave:'; $strReplicationErrorGetPosition = 'Unable to read master log position. Possible privilege problem on master.'; $strReplicationErrorMasterConnect = 'Unable to connect to master %s.'; -$strReplicationChangedSuccesfully = 'Master server changed succesfully to %s'; -$strReplicationMasterConfiguration = 'Master configuration'; $strReplicationMasterChooseAll = 'Replicate all databases; Ignore:'; $strReplicationMasterChooseIgn = 'Ignore all databases; Replicate:'; $strReplicationMasterChooseMode = 'This server is not configured as master server in a replication process. You can choose from either replicating all databases and ignoring certain (useful if you want to replicate majority of databases) or you can choose to ignore all databases by default and allow only certain databases to be replicated. Please select the mode:'; +$strReplicationMasterConfiguration = 'Master configuration'; $strReplicationMaster = 'Master replication'; $strReplication = 'Replication'; $strReplicationRestartServer = 'Once you restarted MySQL server, please click on Go button. Afterwards, you should see a message informing you, that this server is configured as master'; @@ -792,10 +792,10 @@ $strReplicationShowConnectedSlavesNote = 'Only slaves started with the --report- $strReplicationShowConnectedSlaves = 'Show connected slaves'; $strReplicationShowMasterStatus = 'Show master status'; $strReplicationSkippingErrorWarn = 'Skipping error(s) might lead into unsynchronized master and slave!'; +$strReplicationSlaveChangeMaster = 'Change or reconfigure master server'; $strReplicationSlaveConfiguration = 'Slave configuration'; $strReplicationSlaveConfigured = 'Server is configured as slave in a replication process. Would you like to:'; $strReplicationSlaveErrorManagement = 'Error management:'; -$strReplicationSlaveChangeMaster = 'Change or reconfigure master server'; $strReplicationSlaveIOThread = 'IO Thread %s only'; $strReplicationSlaveIOThreadNotRunning = 'Slave IO Thread not running!'; $strReplicationSlaveNotConfigured = 'This server is not configured as slave in a replication process. Would you like to configure it?'; @@ -805,8 +805,8 @@ $strReplicationSlaveSkipCurrentError = 'Skip current error'; $strReplicationSlaveSkipNextErrors = 'errors.'; $strReplicationSlaveSkipNext = 'Skip next'; $strReplicationSlave = 'Slave replication'; -$strReplicationSlaveSQLThread = 'SQL Thread %s only'; $strReplicationSlaveSQLThreadNotRunning = 'Slave SQL Thread not running!'; +$strReplicationSlaveSQLThread = 'SQL Thread %s only'; $strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; $strReplicationStatus_master = 'Master status'; $strReplicationStatus = 'Replication status'; @@ -890,8 +890,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'; @@ -904,6 +904,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'; @@ -945,12 +952,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'; @@ -1013,13 +1020,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'; @@ -1067,10 +1067,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'; @@ -1115,6 +1115,8 @@ $strSetupServers_AllowDeny_rules_desc = 'Leave blank for defaults'; $strSetupServers_AllowDeny_rules_name = 'Host authentication rules'; $strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; $strSetupServers_AllowRoot_name = 'Allow root login'; +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; $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)'; $strSetupServers_auth_swekey_config_name = 'SweKey config file'; $strSetupServers_auth_type_desc = 'Authentication method to use'; @@ -1177,20 +1179,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'; @@ -1345,8 +1347,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.'; @@ -1396,9 +1398,9 @@ $strSQPBugUnclosedQuote = 'Unclosed quote'; $strSQPBugUnknownPunctuation = 'Unknown Punctuation String'; $strStandInStructureForView = 'Stand-in structure for view'; $strStart = 'Start'; +$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 a5151e224..7964b9fa5 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1655,4 +1655,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index d694c5a94..8e60ea2d3 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1632,4 +1632,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index e280837a4..52347fa28 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1628,4 +1628,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 96bb62b79..c5e3fe027 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1636,4 +1636,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index 3f8ca39d2..edfc4690b 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1653,4 +1653,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index a7c52219b..5fc0f3333 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1653,4 +1653,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 46ce58a5b..0fc489ea0 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1659,4 +1659,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index a8308f682..18c04c098 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1651,4 +1651,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index 8afce6968..9c2b3fcfe 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1657,4 +1657,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 4e14d5ca6..19ccac472 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1650,4 +1650,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index 23bc71968..886200f7b 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1650,4 +1650,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 74e6d551f..d4d567b8e 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1650,4 +1650,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index 039b4be6f..c8cbf3016 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1655,4 +1655,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 0baeb5d33..188947dbd 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1652,4 +1652,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index 306e0a646..d3257ba30 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1655,4 +1655,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index 0a131031c..580517715 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1648,4 +1648,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index 8afca431c..e38eb22fc 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1656,4 +1656,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index f5e232ddd..18aa105f9 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1669,4 +1669,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index bddff9eba..e61e335be 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1655,4 +1655,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index c5720ba40..a6518e2fd 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1631,4 +1631,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index d7c6371b0..d8d3bb342 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1658,4 +1658,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index ffe25ae51..ff9c27fd2 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1641,4 +1641,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 2e7e9c6ea..e9387d150 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1659,4 +1659,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index e78b7ceff..05eaef934 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1649,4 +1649,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index 5ea7bd450..df60e4dd3 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1634,4 +1634,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 28d56c1b9..953e9b612 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1653,4 +1653,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index 1a8f4fccf..80721707c 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1653,4 +1653,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 4097edcb4..f81cca090 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1657,4 +1657,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index f3c267cce..5d0fb94ac 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1649,4 +1649,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 2a72e36ea..ae740f0fc 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1652,4 +1652,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 6188726c4..357251f3f 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1644,4 +1644,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 1f8e74700..94793ee9c 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1645,4 +1645,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 1bf2ab232..b45c1765d 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1649,4 +1649,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index c219c5d31..7d16183b5 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1654,4 +1654,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index f1e2304de..a4562322c 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1644,4 +1644,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index 022e991e6..cca1958bc 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1652,4 +1652,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/uzbek_cyrillic-utf-8.inc.php b/lang/uzbek_cyrillic-utf-8.inc.php index 4cb888f66..72de43a37 100644 --- a/lang/uzbek_cyrillic-utf-8.inc.php +++ b/lang/uzbek_cyrillic-utf-8.inc.php @@ -1649,4 +1649,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/lang/uzbek_latin-utf-8.inc.php b/lang/uzbek_latin-utf-8.inc.php index b9f3e401d..cd341d8b0 100644 --- a/lang/uzbek_latin-utf-8.inc.php +++ b/lang/uzbek_latin-utf-8.inc.php @@ -1649,4 +1649,6 @@ $strPmadbCreateConfig = 'Enable advanced features in configuration file (c $strPDFPageCreated = 'Page has been created'; //to translate $strPDFPageCreateFailed = 'Page creation failed'; //to translate $strPmadbReLoginToEnable = 'Re-login to phpMyAdmin to load the updated configuration file.'; //to translate +$strSetupServers_auth_http_realm_desc = 'HTTP Basic Auth Realm name to display when doing HTTP Auth'; //to translate +$strSetupServers_auth_http_realm_name = 'HTTP Realm'; //to translate ?> diff --git a/libraries/auth/http.auth.lib.php b/libraries/auth/http.auth.lib.php index 9ab2d2634..af1b353b8 100644 --- a/libraries/auth/http.auth.lib.php +++ b/libraries/auth/http.auth.lib.php @@ -28,14 +28,19 @@ function PMA_auth() exit; } - if (empty($GLOBALS['cfg']['Server']['verbose'])) { - $server_message = $GLOBALS['cfg']['Server']['host']; + if (empty($GLOBALS['cfg']['Server']['auth_http_realm'])) { + if (empty($GLOBALS['cfg']['Server']['verbose'])) { + $server_message = $GLOBALS['cfg']['Server']['host']; + } else { + $server_message = $GLOBALS['cfg']['Server']['verbose']; + } + $realm_message = 'phpMyAdmin ' . $server_message; } else { - $server_message = $GLOBALS['cfg']['Server']['verbose']; + $realm_message = $GLOBALS['cfg']['Server']['auth_http_realm']; } // remove non US-ASCII to respect RFC2616 - $server_message = preg_replace('/[^\x20-\x7e]/i', '', $server_message); - header('WWW-Authenticate: Basic realm="phpMyAdmin ' . $server_message . '"'); + $realm_message = preg_replace('/[^\x20-\x7e]/i', '', $realm_message); + header('WWW-Authenticate: Basic realm="' . $realm_message . '"'); header('HTTP/1.0 401 Unauthorized'); if (php_sapi_name() !== 'cgi-fcgi') { header('status: 401 Unauthorized'); diff --git a/libraries/config.default.php b/libraries/config.default.php index a61c80006..4a9e164d1 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -176,6 +176,13 @@ $cfg['Servers'][$i]['controlpass'] = ''; */ $cfg['Servers'][$i]['auth_type'] = 'cookie'; +/** + * HTTP Basic Auth Realm name to display (only used with 'HTTP' auth_type) + * + * @global string $cfg['Servers'][$i]['auth_http_realm'] + */ +$cfg['Servers'][$i]['auth_http_realm'] = ''; + /** * File containing Swekey ids and login names (see /contrib); * leave empty to deactivate Swekey hardware authentication diff --git a/setup/lib/forms.inc.php b/setup/lib/forms.inc.php index 1040224a0..d3bd0cf25 100644 --- a/setup/lib/forms.inc.php +++ b/setup/lib/forms.inc.php @@ -32,6 +32,7 @@ $forms['Server'] = array('Servers' => array(1 => array( 'extension', 'compress', 'auth_type', + 'auth_http_realm', 'user', 'password', 'nopassword',