diff --git a/ChangeLog b/ChangeLog index e363864b4..df90beae6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -55,6 +55,8 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - patch #1863739 [auth] cache control missing (PHP-CGI), thanks to stmfd - patch #2750541 [parser] Incorrect parsing of constraints in ALTER TABLE, thanks to Yannick Betemps - arkhee ++ patch #2735162 [status] Server status - replication, + thanks to Tomas Srnka - tomassrnka 3.1.5.0 (not yet released) diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 54d1b5aa6..787fedc18 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1480,4 +1480,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index dd4046969..2f979f987 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1479,4 +1479,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index 6489bb64c..652370e5a 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1481,4 +1481,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index d213b3348..780ec02be 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1476,4 +1476,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/bangla-utf-8.inc.php b/lang/bangla-utf-8.inc.php index ed2c284d7..2c5f18641 100644 --- a/lang/bangla-utf-8.inc.php +++ b/lang/bangla-utf-8.inc.php @@ -1455,4 +1455,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 043c8b3af..61a3d7394 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1473,4 +1473,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 855bce3d1..654d8616a 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1455,4 +1455,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index 2debd1d6c..ffc2342dd 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1463,4 +1463,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 4580372f8..62eac267e 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1479,4 +1479,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 57232e74f..bb7e7c522 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1453,4 +1453,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 5909799e7..f742c2e54 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1476,4 +1476,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index 71d022203..079baf50b 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1453,4 +1453,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 3364d4d53..cb4ddf5f2 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1462,4 +1462,9 @@ $strZip = 'zip 压缩'; $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 04de87096..976f095d7 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1460,4 +1460,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index ceb38dc79..d1a0fe17f 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1457,4 +1457,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 015ada9f6..5d0c91bc1 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -1461,4 +1461,9 @@ $strStatic = 'static'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index 90bf12228..64fb57794 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1455,4 +1455,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 5d28d7ce6..5d19e8695 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -1462,4 +1462,9 @@ $strNoneDefault = 'Geen'; $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 073a76f9d..be502c694 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -55,6 +55,7 @@ $strAlterOrderBy = 'Alter table order by'; $strAnalyze = 'Analyze'; $strAnalyzeTable = 'Analyze table'; $strAnd = 'And'; +$strAndSmall = 'and'; $strAndThen = 'and then'; $strAngularLinks = 'Angular links'; $strAnIndex = 'An index has been added on %s'; @@ -719,6 +720,10 @@ $strRepairTable = 'Repair table'; $strReplaceNULLBy = 'Replace NULL by'; $strReplaceTable = 'Replace table data with file'; $strReplication = 'Replication'; +$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'; +$strReplicationStatus_slave = 'Slave status'; $strReset = 'Reset'; $strResourceLimits = 'Resource limits'; $strRestartInsertion = 'Restart insertion with %s rows'; diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 6b2c89e19..78af823cb 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1461,4 +1461,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index 5c128ca34..189d39922 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1456,4 +1456,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 921c281b2..012bbc9eb 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -1452,4 +1452,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index ee62e064e..394c66204 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1454,4 +1454,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index b8d5d9d4f..f55608b65 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1460,4 +1460,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 09bdeb1b0..e946245a7 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1474,4 +1474,9 @@ $strViewHasAtLeast = 'This view has at least this number of rows. Please refer t $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index c5f8c348f..cb17cb0ef 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1478,4 +1478,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 41b0edfea..cefeb6612 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1473,4 +1473,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index 1dc850a26..f278c049b 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1481,4 +1481,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 00e9c16c9..3a13b0eed 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1458,4 +1458,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index edb3388dd..d800dbb25 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1471,4 +1471,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 1dabf2012..440e5a62b 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1460,4 +1460,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index d58ad9beb..711a378d0 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1461,4 +1461,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index 554f4042d..38adc23de 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1476,4 +1476,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index 976c51879..f1dbfa9da 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1478,4 +1478,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index aea110f6f..afa9f1a13 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1470,4 +1470,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/macedonian_cyrillic-utf-8.inc.php b/lang/macedonian_cyrillic-utf-8.inc.php index ae11e3d17..be272f207 100644 --- a/lang/macedonian_cyrillic-utf-8.inc.php +++ b/lang/macedonian_cyrillic-utf-8.inc.php @@ -1456,4 +1456,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index 517bc40f1..d9c1d1ff3 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1493,4 +1493,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 415350337..b08588bed 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1476,4 +1476,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index 67c5e7152..689627fb5 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1453,4 +1453,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 0faae5138..e6426dd13 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1507,4 +1507,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 0d031318e..219548b80 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1449,4 +1449,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index f42fbd9fc..c5b5dfbc8 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1482,4 +1482,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index dc502c5ce..4f771b200 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1462,4 +1462,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index 663a37855..d4c43e445 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1466,4 +1466,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 6bd8f8911..04b0b0d23 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1455,4 +1455,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index d6bd29650..83571cc10 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1455,4 +1455,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index 155315f7b..a4b002da5 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1458,4 +1458,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 4a92b6d1b..905133a57 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1456,4 +1456,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 609de5576..04edd3d0c 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1475,4 +1475,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 0136c29f9..66490ca4d 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1453,4 +1453,9 @@ $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 643b2f8d1..1503de18a 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1453,4 +1453,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 420c5a764..3e04821f9 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1466,4 +1466,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 977fd1d89..e50b463d9 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1477,4 +1477,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 9361c5fe8..4191f1c1c 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1459,4 +1459,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index dd0adc7c5..01ec3fbd7 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1475,4 +1475,9 @@ $strNoneDefault = 'None'; //to translate $strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate $strEscapeCRLF = 'Remove CRLF characters within fields'; //to translate $strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate +$strAndSmall = 'and'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate ?> diff --git a/server_status.php b/server_status.php index 3bbf2e033..1e071b61d 100644 --- a/server_status.php +++ b/server_status.php @@ -64,13 +64,22 @@ if (isset($_REQUEST['flush'])) { */ $server_status = PMA_DBI_fetch_result('SHOW GLOBAL STATUS', 0, 1); +/** + * get master status from server + */ +$server_master_status = PMA_DBI_fetch_result('SHOW MASTER STATUS'); + +/** + * get slave status from server + */ +$server_slave_status = PMA_DBI_fetch_result('SHOW SLAVE STATUS'); + /** * for some calculations we require also some server settings */ $server_variables = PMA_DBI_fetch_result('SHOW GLOBAL VARIABLES', 0, 1); - /** * starttime calculation */ @@ -254,7 +263,70 @@ $sections = array( 'tc' => array('title' => $strTransactionCoordinator), ); +/** + * replication types + */ +$replication_types = array('master', 'slave'); +/** + * define variables for master status + */ +$master_variables = array( + 'File', + 'Position', + 'Binlog_Do_DB', + 'Binlog_Ignore_DB' +); + +/** + * Define variables for slave status + */ +$slave_variables = array( + 'Slave_IO_State', + 'Master_Host', + 'Master_User', + 'Master_Port', + 'Connect_Retry', + 'Master_Log_File', + 'Read_Master_Log_Pos', + 'Relay_Log_File', + 'Relay_Log_Pos', + 'Relay_Master_Log_File', + 'Slave_IO_Running', + 'Slave_SQL_Running', + 'Replicate_Do_DB', + 'Replicate_Ignore_DB', + 'Replicate_Do_Table', + 'Replicate_Ignore_Table', + 'Replicate_Wild_Do_Table', + 'Replicate_Wild_Ignore_Table', + 'Last_Errno', + 'Last_Error', + 'Skip_Counter', + 'Exec_Master_Log_Pos', + 'Relay_Log_Space', + 'Until_Condition', + 'Until_Log_File', + 'Until_Log_Pos', + 'Master_SSL_Allowed', + 'Master_SSL_CA_File', + 'Master_SSL_CA_Path', + 'Master_SSL_Cert', + 'Master_SSL_Cipher', + 'Master_SSL_Key', + 'Seconds_Behind_Master' +); +/** + * define important variables, which need to be watched for correct running of replication in slave mode + */ +$slave_variables_alerts = array( + 'Slave_IO_Running' => 'No', + 'Slave_SQL_Running' => 'No' + ); +$slave_variables_oks = array( + 'Slave_IO_Running' => 'Yes', + 'Slave_SQL_Running' => 'Yes' + ); /** * define some needfull links/commands */ @@ -315,6 +387,14 @@ foreach ($server_status as $name => $value) { } unset($name, $value, $filter, $section, $allocations); +// check which replication is available +foreach ($replication_types as $type) +{ + if (count(${"server_{$type}_status"}) > 0) + ${"server_{$type}_status_run"} = true; + else + ${"server_{$type}_status_run"} = false; +} // rest $sections['all']['vars'] =& $server_status; @@ -342,6 +422,23 @@ echo sprintf($strServerStatusUptime, ?>

+' . $type . ' '; + } + } + echo sprintf('

' . $strReplicationStatusInfo . '

', $replicationOut); +} +?> + - + +
+

+ +

+ + + + + + + + + + + + + + + + + +
+ + + '; + if (${"{$type}_variables_oks"}[$variable] == ${"server_{$type}_status"}[0][$variable]) + echo ''; + else + echo ''; + echo ${"server_{$type}_status"}[0][$variable]; + echo ''; + ?> +
+ + + +