diff options
157 files changed, 1949 insertions, 1035 deletions
@@ -6,6 +6,7 @@ $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ + [import] support handling of DELIMITER to mimic mysql CLI, thanks to fb1 ++ improved PHP 6 compatibility - bug #1674914 [structure] changing definition of a TIMESTAMP field - bug #1615530 [upload] added more specific error message if field upload fails - bug #1627210, #1083301, #1482401 [data] warning on duplicate indexes @@ -17,7 +18,6 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #1523747 [innodb] make warning about row count more visible - bug #1676012 [auth] strip non-US-ASCII characters (RFC2616) - bug #1679440 Added FAQ entry about header errors under IIS caused by -- typo in fix for bug #1671813 an end-of-line character - [gui] avoid displaying a wide selector in server selection - bug #1614004 [relation] foreign key spanning multiple columns are @@ -50,8 +50,20 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA + [doc] requirement of mcrypt on 64-bit, thanks to Isaac Bennetch + [lang] danish update, thanks to Finn Sorensen + RFE #1435922 [gui] navigation frame shows listing of databases when none selected ++ [data] support BIT datatype (under mysqli), thanks to Christian Schmidt ++ [display] automatic confirmation for sort by key, thanks to Juergen Wind ++ [data] can now choose the number of insert rows ++ RFE #1704779 [gui] link documentation from login page ++ RFE #1513345 [setup] check control user connection during setup ++ [structure] TRIGGERS: display/edit/drop/SQL export + +2.10.2.0 (not yet released) + ++ [data] display all warnings, not only last one +- typo in fix for bug #1671813 +- bug #1714908 Inserted Row Count is wrong -2.10.1.0 (not released yet) +2.10.1.0 (2007-04-23) ===================== - bug #1541147 [js] '#' in database names not correctly handled by queywindow.js @@ -79,12 +91,11 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #1690718 Can't edit if BLOB and no PK - bug #1672636 [export] PDF export too wide + [lang] brazilian-portuguese update, thanks to Airon Luis Pereira - -2.10.0.3 (not released yet) -===================== - +- patch #1698964 javascript typo, thanks to Corey Hollaway +- bug #1703897 [css] undefined index 'js_frame' - bug #1690561 Blobs being cleared on Edit of row - bug #1679801 [core] XSS vulnerability in PMA_sanitize(), thanks to sp3x SecurityReason +- bug #1704467 XSS vulnerability in browse_foreigners.php, thanks to sp3x SecurityReason 2.10.0.2 (2007-03-02) ===================== diff --git a/browse_foreigners.php b/browse_foreigners.php index bb58864cab..82187e782b 100644 --- a/browse_foreigners.php +++ b/browse_foreigners.php @@ -105,7 +105,7 @@ if (isset($disp_row) && is_array($disp_row)) { var element_name = field + '[]'; <?php } ?> - <?php if (isset($fieldkey)) { ?> + <?php if (isset($fieldkey) && is_numeric($fieldkey)) { ?> var element_name_alt = field + '[<?php echo $fieldkey; ?>]'; <?php } else { ?> var element_name_alt = field + '[0]'; @@ -73,7 +73,7 @@ header('Content-Type: text/html; charset=' . $charset); <body> <h1>phpMyAdmin - <?php echo $type; ?></h1> <p><?php -if (get_magic_quotes_gpc()) { +if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { echo PMA_sanitize(stripslashes($_REQUEST['error'])); } else { echo PMA_sanitize($_REQUEST['error']); diff --git a/js/functions.js b/js/functions.js index efe959b1de..37b0f982d6 100644 --- a/js/functions.js +++ b/js/functions.js @@ -368,7 +368,7 @@ function checkTableEditForm(theForm, fieldsCnt) { id = "field_" + i + "_2"; elm = getElement(id); - if (elm.value == 'VARCHAR' || elm.value == 'CHAR') { + if (elm.value == 'VARCHAR' || elm.value == 'CHAR' || elm.value == 'BIT') { elm2 = getElement("field_" + i + "_3"); val = parseInt(elm2.value); elm3 = getElement("field_" + i + "_1"); @@ -993,8 +993,8 @@ function getElement(e,f){ if(f.document.layers[e]) { return f.document.layers[e]; } - for(W=0;i<f.document.layers.length;W++) { - return(getElement(e,fdocument.layers[W])); + for(W=0;W<f.document.layers.length;W++) { + return(getElement(e,f.document.layers[W])); } } if(document.all) { diff --git a/lang/afrikaans-iso-8859-1.inc.php b/lang/afrikaans-iso-8859-1.inc.php index b73459cdbf..be40e79289 100644 --- a/lang/afrikaans-iso-8859-1.inc.php +++ b/lang/afrikaans-iso-8859-1.inc.php @@ -1056,4 +1056,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/afrikaans-utf-8.inc.php b/lang/afrikaans-utf-8.inc.php index 7bb7e61de9..ebb982f98c 100644 --- a/lang/afrikaans-utf-8.inc.php +++ b/lang/afrikaans-utf-8.inc.php @@ -1057,4 +1057,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/albanian-iso-8859-1.inc.php b/lang/albanian-iso-8859-1.inc.php index e5a0cb0e69..da7d31ab09 100644 --- a/lang/albanian-iso-8859-1.inc.php +++ b/lang/albanian-iso-8859-1.inc.php @@ -1055,4 +1055,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/albanian-utf-8.inc.php b/lang/albanian-utf-8.inc.php index 29a884325a..eec69a051c 100644 --- a/lang/albanian-utf-8.inc.php +++ b/lang/albanian-utf-8.inc.php @@ -1056,4 +1056,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/arabic-utf-8.inc.php b/lang/arabic-utf-8.inc.php index d9a48f55fc..b9fd9f5a82 100644 --- a/lang/arabic-utf-8.inc.php +++ b/lang/arabic-utf-8.inc.php @@ -1058,4 +1058,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/arabic-windows-1256.inc.php b/lang/arabic-windows-1256.inc.php index 7331b576d6..b529486050 100644 --- a/lang/arabic-windows-1256.inc.php +++ b/lang/arabic-windows-1256.inc.php @@ -1057,4 +1057,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/azerbaijani-iso-8859-9.inc.php b/lang/azerbaijani-iso-8859-9.inc.php index 1376ec79aa..96083664cd 100644 --- a/lang/azerbaijani-iso-8859-9.inc.php +++ b/lang/azerbaijani-iso-8859-9.inc.php @@ -1052,4 +1052,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/azerbaijani-utf-8.inc.php b/lang/azerbaijani-utf-8.inc.php index c749f73e16..0825236b8a 100644 --- a/lang/azerbaijani-utf-8.inc.php +++ b/lang/azerbaijani-utf-8.inc.php @@ -1053,4 +1053,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/basque-iso-8859-1.inc.php b/lang/basque-iso-8859-1.inc.php index d1b0c66be1..6543dfedce 100644 --- a/lang/basque-iso-8859-1.inc.php +++ b/lang/basque-iso-8859-1.inc.php @@ -1049,4 +1049,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/basque-utf-8.inc.php b/lang/basque-utf-8.inc.php index 99be1f75bc..ea1524b5e6 100644 --- a/lang/basque-utf-8.inc.php +++ b/lang/basque-utf-8.inc.php @@ -1050,4 +1050,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/belarusian_cyrillic-utf-8.inc.php b/lang/belarusian_cyrillic-utf-8.inc.php index 3766517da1..a81e11b1ea 100644 --- a/lang/belarusian_cyrillic-utf-8.inc.php +++ b/lang/belarusian_cyrillic-utf-8.inc.php @@ -1033,4 +1033,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/belarusian_cyrillic-windows-1251.inc.php b/lang/belarusian_cyrillic-windows-1251.inc.php index 481398f6e5..09ba32ed9d 100644 --- a/lang/belarusian_cyrillic-windows-1251.inc.php +++ b/lang/belarusian_cyrillic-windows-1251.inc.php @@ -1032,4 +1032,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/belarusian_latin-utf-8.inc.php b/lang/belarusian_latin-utf-8.inc.php index dbbf74dcab..653e2cd00c 100644 --- a/lang/belarusian_latin-utf-8.inc.php +++ b/lang/belarusian_latin-utf-8.inc.php @@ -1032,4 +1032,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/bosnian-utf-8.inc.php b/lang/bosnian-utf-8.inc.php index 1bf8041d41..824d65573d 100644 --- a/lang/bosnian-utf-8.inc.php +++ b/lang/bosnian-utf-8.inc.php @@ -1056,4 +1056,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/bosnian-windows-1250.inc.php b/lang/bosnian-windows-1250.inc.php index 93b0d7b69e..26c0498643 100644 --- a/lang/bosnian-windows-1250.inc.php +++ b/lang/bosnian-windows-1250.inc.php @@ -1055,4 +1055,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/brazilian_portuguese-iso-8859-1.inc.php b/lang/brazilian_portuguese-iso-8859-1.inc.php index cc26656da8..a54fb8bb42 100644 --- a/lang/brazilian_portuguese-iso-8859-1.inc.php +++ b/lang/brazilian_portuguese-iso-8859-1.inc.php @@ -3,7 +3,7 @@ /** * translated by: - Airon Luis Pereira <aironp@pop.com.br> + Airon Luis Pereira <airon.pereira@gmail.com> */ $charset = 'iso-8859-1'; @@ -25,6 +25,11 @@ $datefmt = '%B %d, %Y as %I:%M %p'; $timespanfmt = '%s dias, %s horas, %s minutos e %s segundos'; + + + + + $strAbortedClients = 'Abortado'; $strAccessDenied = 'Acesso negado'; $strAccessDeniedCreateConfig = 'A provvel razo para isso que voc no criou o arquivo de configurao. Voc deve usar o %1$ssetup script%2$s para criar um.'; @@ -244,7 +249,7 @@ $strDoAQuery = 'Faa uma "consulta por exemplo" (coringa: "%")'; $strDocSQL = 'DocSQL'; $strDocSQLOptions = 'Opes DocSQL'; $strDocu = 'Documentao'; -$strDoYouReally = 'Confirmar: '; +$strDoYouReally = 'Confirmar'; $strDropDatabaseStrongWarning = 'Voc est prestes DESTRUIR completamente o Banco de Dados!'; $strDrop = 'Eliminar'; $strDropUsersDb = 'Eliminar o Banco de Dados que possui o mesmo nome dos usurios.'; @@ -257,7 +262,7 @@ $strEdit = 'Editar'; $strEditPDFPages = 'Editar Pginas PDF'; $strEditPrivileges = 'Editar Privilgios'; $strEffective = 'Efetivo'; -$strEmpty = 'Limpa'; +$strEmpty = 'Limpar'; $strEmptyResultSet = 'MySQL retornou um conjunto vazio (ex. zero registros).'; $strEnabled = 'Habilitado'; $strEncloseInTransaction = 'Encapsular exportao numa transao'; @@ -266,7 +271,7 @@ $strEnd = 'Fim'; $strEndRaw = 'FIM CRU'; $strEngineAvailable = '%s est disponvel neste servidor MySQL.'; $strEngineDisabled = '%s est desabilitado neste servidor MySQL.'; -$strEngines = 'Engines'; +$strEngines = 'Engines'; //sem traducao $strEngineUnsupported = 'Esse servidor MySQL no suporta o stored engine %s.'; $strEnglish = 'Ingls'; $strEnglishPrivileges = ' Nota: nomes de privilgios do MySQL so expressos em ingls '; @@ -291,6 +296,7 @@ $strExtra = 'Extra'; $strFailedAttempts = 'Tentativas falharam'; $strField = 'Campo'; $strFieldHasBeenDropped = 'Campo %s foi deletado'; +$strFieldInsertFromFileTempDirNotExists = 'Erro ao mover o arquivo carregado, veja FAQ 1.11'; $strFields = 'Campos'; $strFieldsEmpty = ' O campo count esta vazio! '; $strFieldsEnclosedBy = 'Campos delimitados por'; @@ -304,6 +310,7 @@ $strFileNameTemplateDescriptionServer = 'nome do servidor'; $strFileNameTemplateDescriptionTable = 'nome da tabela'; $strFileNameTemplate = 'Nome do arquivo do modelo'; $strFileNameTemplateRemember = 'lembrar modelo'; +$strFiles = 'Arquivos'; $strFileToImport = 'Arquivo para importar'; $strFixed = 'fixo'; $strFlushPrivilegesNote = 'Nota: O phpMyAdmin recebe os privilgios dos usurio diretamente da tabela de privilgios do MySQL. O contedo destas tabelas pode divergir dos privilgios que o servidor usa se alteraes manuais forem feitas nele. Neste caso, voc deve usar %sRELOAD PRIVILEGES%s antes de continuar..'; @@ -340,6 +347,7 @@ $strHasBeenCreated = 'foi criado.'; $strHaveToShow = 'Deve escolher pelo menos uma coluna para exibir'; $strHebrew = 'Hebreu'; $strHelp = 'Ajuda'; +$strHexForBLOB = 'Usar hexadecimal para BLOB'; $strHide = 'Ocultar'; $strHideShowAll = 'Ocultar/Exibir tudo'; $strHideShowNoRelation = 'Ocultar/Exibir Tabelas sem relacionamento'; @@ -364,6 +372,7 @@ $strImportFormat = 'Formato do arquivo importado'; $strImport = 'Importar'; $strImportSuccessfullyFinished = 'Importao finalizada com sucesso, %d consultas executadas.'; $strIndexes = 'ndices'; +$strIndexesSeemEqual = 'Os seguintes ndices parecem ser idnticos e um deles deve ser removido:'; $strIndexHasBeenDropped = 'ndice %s foi eliminado'; $strIndex = 'ndice'; $strIndexName = 'Nome do ndice:'; @@ -489,6 +498,7 @@ $strMyISAMSortBufferSize = 'Tamanho do buffer de ordenao'; $strMySQLCharset = 'Conjunto de caracteres MySQL'; $strMysqlClientVersion = 'Verso do cliente MySQL'; $strMySQLConnectionCollation = 'Collation de conexo do MySQL'; // Collation nao tem traducao +$strMysqlLibDiffersServerVersion = 'Sua verso %s da biblioteca MySQL do PHP difere da verso %s do seu servidor MySQL. Isso pode causar um comportamento estranho.'; $strMySQLSaid = 'Mensagens do MySQL : '; $strMySQLShowProcess = 'Mostrar os Processos'; $strMySQLShowStatus = 'Mostrar informao de runtime do MySQL'; @@ -540,6 +550,7 @@ $strOpenNewWindow = 'Abrir nova janela do phpMyAdmin'; $strOperations = 'Operaes'; $strOperator = 'Operador'; $strOptimizeTable = 'Otimizar tabela'; +$strOptions = 'Opes'; $strOr = 'Ou'; $strOverhead = 'Sobrecarga'; $strOverwriteExisting = 'Sobrescrever arquivo(s) existente(s)'; @@ -671,6 +682,8 @@ $strRevokeAndDelete = 'Revogar todos os privilgios ativos dos usuarios e depois $strRevokeMessage = 'Voc revogou os privilgios para %s'; $strRevoke = 'Revogar'; $strRomanian = 'Romno'; +$strRoutineReturnType = 'Tipo de returno'; +$strRoutines = 'Rotinas'; $strRowLength = 'Tamanho da coluna'; $strRows = 'Colunas'; $strRowsFrom = 'colunas comeando de'; @@ -722,6 +735,7 @@ $strServerTabVariables = 'Variveis'; $strServerTrafficNotes = '<b>Trfico do servidor</b>: Essas tabelas mostram as estatsticas do trfico da rede neste servidor MySQL desde o incio.'; $strServerVars = 'Variveis e configuraes do servidor'; $strServerVersion = 'Verso do Servidor'; +$strSessionStartupErrorGeneral = 'No pde iniciar a sesso sem erros, cheque os erros ocorridos nos logs do PHP e/ou do seu servidor web e configure a instalao do PHP corretamente.'; $strSessionValue = 'Valor da sesso'; $strSetEnumVal = 'Se um tipo de campo "enum" ou "set", por favor entre valores usando este formato: \'a\',\'b\',\'c\'...<br />Se voc for colocar uma barra contrria ("\") ou aspas simples ("\'") entre os valores, coloque uma barra contrria antes (por exemplo \'\\\\xyz\' ou \'a\\\'b\').'; $strShowAll = 'Mostrar todos'; @@ -969,6 +983,13 @@ $strUpdateProfileMessage = 'A configurao foi atualizada.'; $strUpdateQuery = 'Atualizar a consulta SQL'; $strUpdComTab = 'Consulte a documentao sobre como atualizar sua tabela Column_comments'; $strUpgrade = 'Voc deveria atualizar para %s %s ou posterior.'; +$strUploadErrorCantWrite = 'Falhou ao salvar arquivo no disco.'; +$strUploadErrorExtension = 'Carregamento do arquivo parado pela exteno.'; +$strUploadErrorFormSize = 'O arquivo carregado excede o tamanho definido na diretriz MAX_FILE_SIZE do formulrio HTM.'; +$strUploadErrorIniSize = 'O arquivo carregado excede o tamanho definido na diretriz upload_max_filesize no php.ini.'; +$strUploadErrorNoTempDir = 'Pasta temporria no encontrada.'; +$strUploadErrorPartial = 'Carregamento do arquivo foi apenas parcial.'; +$strUploadErrorUnknown = 'Erro desconhecido no carregamento do arquivo.'; $strUploadLimit = 'Voc provavelmente tentou carregar um arquivo muito grande. Veja referncias na %sdocumentation%s para burlar esses limites.'; $strUploadsNotAllowed = 'No permitido subir arquivos neste servidor.'; $strUsage = 'Uso'; @@ -998,6 +1019,7 @@ $strViewDumpDB = 'Ver o esquema do Banco de Dados'; $strViewDump = 'Ver o esquema da tabela'; $strViewHasBeenDropped = 'Viso %s foi apagada'; $strViewMaxExactCount = 'Essa viso tem mais que %s linhas. Veja referncias na %sdocumentation%s.'; +$strViewName = 'Nome da VISO'; $strView = 'Viso'; $strWebServerUploadDirectoryError = 'O diretrio que voc especificou para subir arquivos no foi encontrado.'; @@ -1018,32 +1040,10 @@ $strZeroRemovesTheLimit = 'Nota: Ajustar essa opo para 0 (zero) remove os limi $strZip = '"compactado com zip"'; // To translate: -$strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate - -$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate -$strFiles = 'Files'; //to translate - -$strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate - -$strIndexesSeemEqual = 'The following indexes appear to be equal and one of them should be removed:'; //to translate - -$strMysqlLibDiffersServerVersion = 'Your PHP MySQL library version %s differs from your MySQL server version %s. This may cause unpredictable behavior.'; //to translate - -$strOptions = 'Options'; //to translate - -$strRoutineReturnType = 'Return type'; //to translate -$strRoutines = 'Routines'; //to translate - -$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate - -$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate -$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate -$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate -$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate -$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate -$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate -$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate -$strViewName = 'VIEW name'; //to translate +$strControluserFailed = 'Conexo para controle do usurio como definido nas configuraes falhou.'; +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 471e104b2d..5d7192096f 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -3,7 +3,7 @@ /** * translated by: - Airon Luis Pereira <aironp@pop.com.br> + Airon Luis Pereira <airon.pereira@gmail.com> */ $charset = 'utf-8'; @@ -26,6 +26,11 @@ $datefmt = '%B %d, %Y as %I:%M %p'; $timespanfmt = '%s dias, %s horas, %s minutos e %s segundos'; + + + + + $strAbortedClients = 'Abortado'; $strAccessDenied = 'Acesso negado'; $strAccessDeniedCreateConfig = 'A provável razão para isso é que você não criou o arquivo de configuração. Você deve usar o %1$ssetup script%2$s para criar um.'; @@ -245,7 +250,7 @@ $strDoAQuery = 'Faça uma "consulta por exemplo" (coringa: "%")'; $strDocSQL = 'DocSQL'; $strDocSQLOptions = 'Opções DocSQL'; $strDocu = 'Documentação'; -$strDoYouReally = 'Confirmar: '; +$strDoYouReally = 'Confirmar'; $strDropDatabaseStrongWarning = 'Você está prestes à DESTRUIR completamente o Banco de Dados!'; $strDrop = 'Eliminar'; $strDropUsersDb = 'Eliminar o Banco de Dados que possui o mesmo nome dos usuários.'; @@ -258,7 +263,7 @@ $strEdit = 'Editar'; $strEditPDFPages = 'Editar Páginas PDF'; $strEditPrivileges = 'Editar Privilégios'; $strEffective = 'Efetivo'; -$strEmpty = 'Limpa'; +$strEmpty = 'Limpar'; $strEmptyResultSet = 'MySQL retornou um conjunto vazio (ex. zero registros).'; $strEnabled = 'Habilitado'; $strEncloseInTransaction = 'Encapsular exportação numa transação'; @@ -267,7 +272,7 @@ $strEnd = 'Fim'; $strEndRaw = 'FIM CRU'; $strEngineAvailable = '%s está disponível neste servidor MySQL.'; $strEngineDisabled = '%s está desabilitado neste servidor MySQL.'; -$strEngines = 'Engines'; +$strEngines = 'Engines'; //sem traducao $strEngineUnsupported = 'Esse servidor MySQL não suporta o stored engine %s.'; $strEnglish = 'Inglês'; $strEnglishPrivileges = ' Nota: nomes de privilégios do MySQL são expressos em inglês '; @@ -292,6 +297,7 @@ $strExtra = 'Extra'; $strFailedAttempts = 'Tentativas falharam'; $strField = 'Campo'; $strFieldHasBeenDropped = 'Campo %s foi deletado'; +$strFieldInsertFromFileTempDirNotExists = 'Erro ao mover o arquivo carregado, veja FAQ 1.11'; $strFields = 'Campos'; $strFieldsEmpty = ' O campo count esta vazio! '; $strFieldsEnclosedBy = 'Campos delimitados por'; @@ -305,6 +311,7 @@ $strFileNameTemplateDescriptionServer = 'nome do servidor'; $strFileNameTemplateDescriptionTable = 'nome da tabela'; $strFileNameTemplate = 'Nome do arquivo do modelo'; $strFileNameTemplateRemember = 'lembrar modelo'; +$strFiles = 'Arquivos'; $strFileToImport = 'Arquivo para importar'; $strFixed = 'fixo'; $strFlushPrivilegesNote = 'Nota: O phpMyAdmin recebe os privilégios dos usuário diretamente da tabela de privilégios do MySQL. O conteúdo destas tabelas pode divergir dos privilégios que o servidor usa se alterações manuais forem feitas nele. Neste caso, você deve usar %sRELOAD PRIVILEGES%s antes de continuar..'; @@ -341,6 +348,7 @@ $strHasBeenCreated = 'foi criado.'; $strHaveToShow = 'Deve escolher pelo menos uma coluna para exibir'; $strHebrew = 'Hebreu'; $strHelp = 'Ajuda'; +$strHexForBLOB = 'Usar hexadecimal para BLOB'; $strHide = 'Ocultar'; $strHideShowAll = 'Ocultar/Exibir tudo'; $strHideShowNoRelation = 'Ocultar/Exibir Tabelas sem relacionamento'; @@ -365,6 +373,7 @@ $strImportFormat = 'Formato do arquivo importado'; $strImport = 'Importar'; $strImportSuccessfullyFinished = 'Importação finalizada com sucesso, %d consultas executadas.'; $strIndexes = 'Índices'; +$strIndexesSeemEqual = 'Os seguintes índices parecem ser idênticos e um deles deve ser removido:'; $strIndexHasBeenDropped = 'Índice %s foi eliminado'; $strIndex = 'Índice'; $strIndexName = 'Nome do índice:'; @@ -490,6 +499,7 @@ $strMyISAMSortBufferSize = 'Tamanho do buffer de ordenação'; $strMySQLCharset = 'Conjunto de caracteres MySQL'; $strMysqlClientVersion = 'Versão do cliente MySQL'; $strMySQLConnectionCollation = 'Collation de conexão do MySQL'; // Collation nao tem traducao +$strMysqlLibDiffersServerVersion = 'Sua versão %s da biblioteca MySQL do PHP difere da versão %s do seu servidor MySQL. Isso pode causar um comportamento estranho.'; $strMySQLSaid = 'Mensagens do MySQL : '; $strMySQLShowProcess = 'Mostrar os Processos'; $strMySQLShowStatus = 'Mostrar informação de runtime do MySQL'; @@ -541,6 +551,7 @@ $strOpenNewWindow = 'Abrir nova janela do phpMyAdmin'; $strOperations = 'Operações'; $strOperator = 'Operador'; $strOptimizeTable = 'Otimizar tabela'; +$strOptions = 'Opções'; $strOr = 'Ou'; $strOverhead = 'Sobrecarga'; $strOverwriteExisting = 'Sobrescrever arquivo(s) existente(s)'; @@ -672,6 +683,8 @@ $strRevokeAndDelete = 'Revogar todos os privilégios ativos dos usuarios e depoi $strRevokeMessage = 'Você revogou os privilégios para %s'; $strRevoke = 'Revogar'; $strRomanian = 'Romêno'; +$strRoutineReturnType = 'Tipo de returno'; +$strRoutines = 'Rotinas'; $strRowLength = 'Tamanho da coluna'; $strRows = 'Colunas'; $strRowsFrom = 'colunas começando de'; @@ -723,6 +736,7 @@ $strServerTabVariables = 'Variáveis'; $strServerTrafficNotes = '<b>Tráfico do servidor</b>: Essas tabelas mostram as estatísticas do tráfico da rede neste servidor MySQL desde o início.'; $strServerVars = 'Variáveis e configurações do servidor'; $strServerVersion = 'Versão do Servidor'; +$strSessionStartupErrorGeneral = 'Não pôde iniciar a sessão sem erros, cheque os erros ocorridos nos logs do PHP e/ou do seu servidor web e configure a instalação do PHP corretamente.'; $strSessionValue = 'Valor da sessão'; $strSetEnumVal = 'Se um tipo de campo é "enum" ou "set", por favor entre valores usando este formato: \'a\',\'b\',\'c\'...<br />Se você for colocar uma barra contrária ("\") ou aspas simples ("\'") entre os valores, coloque uma barra contrária antes (por exemplo \'\\\\xyz\' ou \'a\\\'b\').'; $strShowAll = 'Mostrar todos'; @@ -970,6 +984,13 @@ $strUpdateProfileMessage = 'A configuração foi atualizada.'; $strUpdateQuery = 'Atualizar a consulta SQL'; $strUpdComTab = 'Consulte a documentação sobre como atualizar sua tabela Column_comments'; $strUpgrade = 'Você deveria atualizar para %s %s ou posterior.'; +$strUploadErrorCantWrite = 'Falhou ao salvar arquivo no disco.'; +$strUploadErrorExtension = 'Carregamento do arquivo parado pela extenção.'; +$strUploadErrorFormSize = 'O arquivo carregado excede o tamanho definido na diretriz MAX_FILE_SIZE do formulário HTM.'; +$strUploadErrorIniSize = 'O arquivo carregado excede o tamanho definido na diretriz upload_max_filesize no php.ini.'; +$strUploadErrorNoTempDir = 'Pasta temporária não encontrada.'; +$strUploadErrorPartial = 'Carregamento do arquivo foi apenas parcial.'; +$strUploadErrorUnknown = 'Erro desconhecido no carregamento do arquivo.'; $strUploadLimit = 'Você provavelmente tentou carregar um arquivo muito grande. Veja referências na %sdocumentation%s para burlar esses limites.'; $strUploadsNotAllowed = 'Não é permitido subir arquivos neste servidor.'; $strUsage = 'Uso'; @@ -999,6 +1020,7 @@ $strViewDumpDB = 'Ver o esquema do Banco de Dados'; $strViewDump = 'Ver o esquema da tabela'; $strViewHasBeenDropped = 'Visão %s foi apagada'; $strViewMaxExactCount = 'Essa visão tem mais que %s linhas. Veja referências na %sdocumentation%s.'; +$strViewName = 'Nome da VISÃO'; $strView = 'Visão'; $strWebServerUploadDirectoryError = 'O diretório que você especificou para subir arquivos não foi encontrado.'; @@ -1019,32 +1041,10 @@ $strZeroRemovesTheLimit = 'Nota: Ajustar essa opção para 0 (zero) remove os li $strZip = '"compactado com zip"'; // To translate: -$strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate - -$strFieldInsertFromFileTempDirNotExists = 'Error moving the uploaded file, see FAQ 1.11'; //to translate -$strFiles = 'Files'; //to translate - -$strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate - -$strIndexesSeemEqual = 'The following indexes appear to be equal and one of them should be removed:'; //to translate - -$strMysqlLibDiffersServerVersion = 'Your PHP MySQL library version %s differs from your MySQL server version %s. This may cause unpredictable behavior.'; //to translate - -$strOptions = 'Options'; //to translate - -$strRoutineReturnType = 'Return type'; //to translate -$strRoutines = 'Routines'; //to translate - -$strSessionStartupErrorGeneral = 'Cannot start session without errors, please check errors given in your PHP and/or webserver log file and configure your PHP installation properly.'; //to translate - -$strUploadErrorCantWrite = 'Failed to write file to disk.'; //to translate -$strUploadErrorExtension = 'File upload stopped by extension.'; //to translate -$strUploadErrorFormSize = 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.'; //to translate -$strUploadErrorIniSize = 'The uploaded file exceeds the upload_max_filesize directive in php.ini.'; //to translate -$strUploadErrorNoTempDir = 'Missing a temporary folder.'; //to translate -$strUploadErrorPartial = 'The uploaded file was only partially uploaded.'; //to translate -$strUploadErrorUnknown = 'Unknown error in file upload.'; //to translate -$strViewName = 'VIEW name'; //to translate +$strControluserFailed = 'Conexão para controle do usuário como definido nas configurações falhou.'; +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/bulgarian-koi8-r.inc.php b/lang/bulgarian-koi8-r.inc.php index 2eadb4f5ec..9c9be29f27 100644 --- a/lang/bulgarian-koi8-r.inc.php +++ b/lang/bulgarian-koi8-r.inc.php @@ -1052,4 +1052,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/bulgarian-utf-8.inc.php b/lang/bulgarian-utf-8.inc.php index 63e1dc2e6b..ded648b108 100644 --- a/lang/bulgarian-utf-8.inc.php +++ b/lang/bulgarian-utf-8.inc.php @@ -1053,4 +1053,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/bulgarian-windows-1251.inc.php b/lang/bulgarian-windows-1251.inc.php index bf28c8074b..968690606a 100644 --- a/lang/bulgarian-windows-1251.inc.php +++ b/lang/bulgarian-windows-1251.inc.php @@ -1052,4 +1052,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/catalan-iso-8859-1.inc.php b/lang/catalan-iso-8859-1.inc.php index 4638b43832..1f0119860d 100644 --- a/lang/catalan-iso-8859-1.inc.php +++ b/lang/catalan-iso-8859-1.inc.php @@ -1028,4 +1028,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/catalan-utf-8.inc.php b/lang/catalan-utf-8.inc.php index cd34344e4c..d63ea40cb1 100644 --- a/lang/catalan-utf-8.inc.php +++ b/lang/catalan-utf-8.inc.php @@ -1029,4 +1029,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/chinese_simplified-gb2312.inc.php b/lang/chinese_simplified-gb2312.inc.php index d5d3127096..d766f5ca8e 100644 --- a/lang/chinese_simplified-gb2312.inc.php +++ b/lang/chinese_simplified-gb2312.inc.php @@ -1057,4 +1057,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/chinese_simplified-utf-8.inc.php b/lang/chinese_simplified-utf-8.inc.php index 23bca3b2d0..a0bcd5c8f5 100644 --- a/lang/chinese_simplified-utf-8.inc.php +++ b/lang/chinese_simplified-utf-8.inc.php @@ -1058,4 +1058,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/chinese_traditional-big5.inc.php b/lang/chinese_traditional-big5.inc.php index a08d7a1dc5..c7ccff5d7a 100644 --- a/lang/chinese_traditional-big5.inc.php +++ b/lang/chinese_traditional-big5.inc.php @@ -1036,4 +1036,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/chinese_traditional-utf-8.inc.php b/lang/chinese_traditional-utf-8.inc.php index 2978c682a4..8abb6bc7df 100644 --- a/lang/chinese_traditional-utf-8.inc.php +++ b/lang/chinese_traditional-utf-8.inc.php @@ -1037,4 +1037,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/croatian-iso-8859-2.inc.php b/lang/croatian-iso-8859-2.inc.php index 68efec2146..5974d23513 100644 --- a/lang/croatian-iso-8859-2.inc.php +++ b/lang/croatian-iso-8859-2.inc.php @@ -1030,4 +1030,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/croatian-utf-8.inc.php b/lang/croatian-utf-8.inc.php index 22ca877f79..a3a9068e45 100644 --- a/lang/croatian-utf-8.inc.php +++ b/lang/croatian-utf-8.inc.php @@ -1031,4 +1031,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/croatian-windows-1250.inc.php b/lang/croatian-windows-1250.inc.php index 4cbaa5f6b3..8ab004b791 100644 --- a/lang/croatian-windows-1250.inc.php +++ b/lang/croatian-windows-1250.inc.php @@ -1030,4 +1030,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/czech-iso-8859-2.inc.php b/lang/czech-iso-8859-2.inc.php index d5e4183571..13c85dee9b 100644 --- a/lang/czech-iso-8859-2.inc.php +++ b/lang/czech-iso-8859-2.inc.php @@ -113,7 +113,7 @@ $strCanNotLoadExportPlugins = 'Nepodailo se nahrt pluginy pro export, zkontrol $strCanNotLoadImportPlugins = 'Nepodailo se nahrt pluginy pro import, zkontrolujte prosm va instalaci!'; $strCannotLogin = 'Nepodailo se pihlen k MySQL serveru'; $strCantLoad = 'nelze nahrt rozen %s,<br />zkontrolujte prosm nastaven PHP'; -$strCantLoadRecodeIconv = 'Nelze nahrt rozen iconv ani recode potebn pro pevod znakovch sad. Upravte nastaven PHP tak, aby umoovalo pout tyto rozen nebo vypnte pevod znakovch sad v phpMyAdminu.'; +$strCantLoadRecodeIconv = 'Nelze nahrt rozen iconv ani recode potebn pro pevod znakovch sad. Upravte nastaven PHP tak, aby umoovalo pout tyto rozen nebo vypnte pevod znakovch sad v phpMyAdminovi.'; $strCantRenameIdxToPrimary = 'Index nemete pejmenovat na „PRIMARY“!'; $strCantUseRecodeIconv = 'Nelze pout funkce iconv ani libiconv ani recode_string, pestoe rozen jsou nahrna. Zkontrolujte nastaven PHP.'; $strCardinality = 'Mohutnost'; @@ -150,7 +150,7 @@ $strCompatibleHashing = 'Kompatibiln s MySQL 4.0'; $strCompleteInserts = 'pln inserty'; $strCompression = 'Komprese'; $strCompressionWillBeDetected = 'Komprimace importovanho souboru bude automaticky rozpoznna. Podporovny jsou: %s'; -$strConfigDefaultFileError = 'Nepodailo se nahrt vchoz konfiguraci ze soubouru: "%1$s"'; +$strConfigDefaultFileError = 'Nepodailo se nahrt vchoz konfiguraci ze souboru: "%1$s"'; $strConfigFileError = 'phpMyAdmin nemohl nast konfiguran soubor!<br />Tato chyba me nastat, pokud v nm PHP najde chybu nebo neme tento soubor najt.<br />Po kliknut na nsledujc odkaz se PHP pokus pmo interpretovat tento soubor a zobraz informace o chyb, ke kter dolo. Pak opravte tuto chybu (nejastji se jedn o chybjc stednk).<br />Pokud zskte przdnou strnku, vechno je v podku.'; $strConfigureTableCoord = 'Prosm, nastavte souadnice pro tabulku %s'; $strConnectionError = 'Nepodailo se pipojit: chybn nastaven.'; @@ -203,7 +203,7 @@ $strDatabasesStats = 'Statistiky databz'; $strData = 'Data'; $strDataDict = 'Datov slovnk'; $strDataOnly = ' Jen data'; -$strDataPages = 'Strnek obshahujcch data'; +$strDataPages = 'Strnek obsahujcch data'; $strDBComment = 'Koment k databzi: '; $strDBCopy = 'Zkoprovat databzi na'; $strDbIsEmpty = 'Databze se zd bt przdn!'; @@ -216,7 +216,7 @@ $strDefault = 'Vchoz'; $strDefragment = 'Defragmentovat tabulku'; $strDelayedInserts = 'Pouvat zpodn inserty'; $strDeleteAndFlushDescr = 'Toto je nejist een, ale natn oprvnn me trvat dlouho.'; -$strDeleteAndFlush = 'Odstranit uivatele a znovunast oprvnn.'; +$strDeleteAndFlush = 'Odstranit uivatele a znovu nast oprvnn.'; $strDeleted = 'dek byl smazn'; $strDeletedRows = 'Smazan dky:'; $strDeleteNoUsersSelected = 'Muste vybrat uivatele, kter chcete odstranit!'; @@ -276,6 +276,7 @@ $strErrorSaveTable = 'Chyba pi ukldn souadnic pro Nvrhe.'; $strEscapeWildcards = 'Zstupn znaky _ a % by mly bt escapovny pomoc \, pokud je chcete pout jako znak'; $strEsperanto = 'Esperanto'; $strEstonian = 'Estontina'; +$strEvent = 'Udlost'; $strExcelEdition = 'Verze Excelu'; $strExecuteBookmarked = 'Spustit oblben dotaz'; $strExplain = 'Vysvtlit dotaz'; @@ -287,7 +288,7 @@ $strExtra = 'Extra'; $strFailedAttempts = 'Nepovedench pokus'; $strFieldHasBeenDropped = 'Sloupec %s byl odstrann'; -$strFieldInsertFromFileTempDirNotExists = 'Chyba pi pejmenovn nahrtho soubory, viz FAQ 1.11'; +$strFieldInsertFromFileTempDirNotExists = 'Chyba pi pejmenovn nahranho soubory, viz FAQ 1.11'; $strFieldsEmpty = ' Nebyl zadn poet sloupc! '; $strFieldsEnclosedBy = 'Nzvy sloupc uzaven'; $strFieldsEscapedBy = 'Nzvy sloupc escapovny'; @@ -305,7 +306,7 @@ $strFileNameTemplate = 'Vzor pro jmno souboru'; $strFiles = 'Soubory'; $strFileToImport = 'Soubor pro importovn'; $strFixed = 'pevn'; -$strFlushPrivilegesNote = 'Poznmka: phpMyAdmin zskv oprvnn pmo z tabulek MySQL. Obsah tchto tabulek se me liit od oprvnn, kter server prv pouv, pokud byly tyto tabulky upravovny. V tomto ppad je vhodn provst %sznovunaten oprvnn%s ped pokraovnm.'; +$strFlushPrivilegesNote = 'Poznmka: phpMyAdmin zskv oprvnn pmo z tabulek MySQL. Obsah tchto tabulek se me liit od oprvnn, kter server prv pouv, pokud byly tyto tabulky upravovny. V tomto ppad je vhodn provst %snov naten oprvnn%s ped pokraovnm.'; $strFlushQueryCache = 'Vyprzdnit vyrovnvac pam dotaz'; $strFlushTables = 'Zavt vechny tabulky'; $strFlushTable = 'Vyprzdnit vyrovnvac pam pro tabulku („FLUSH“)'; @@ -408,7 +409,7 @@ $strInvalidTableName = 'Chybn jmno tabulky'; $strJapanese = 'Japontina'; $strJoins = 'Pouit vbry'; $strJumpToDB = 'Pejt na databzi „%s“.'; -$strJustDeleteDescr = 'Odstrann uivatel stle budou mt pstup na server, dokud nebudou znovunatena oprvnn.'; +$strJustDeleteDescr = 'Odstrann uivatel stle budou mt pstup na server, dokud nebudou znovu natena oprvnn.'; $strJustDelete = 'Jen odstranit uivatele z tabulek s oprvnnmi.'; $strKeepPass = 'Nemnit heslo'; @@ -454,7 +455,7 @@ $strLongOperation = 'Tato operace me trvat velmi dlouho. Chcete je pesto prov $strMaxConnects = 'Maximum souasnch pipojen'; $strMaximalQueryLength = 'Maximln velikost vytvoenho dotazu'; $strMaximumSize = 'Maximln velikost: %s%s'; -$strMbExtensionMissing = 'Rozen mbstring pro PHP nebylo nalezeno a zd se, e povte vcebajtovou znakovou sadu. Bez rozen mbstring neum phpMyAdmin sprvn rozdlovat etzce a proto to me mt neekan nsledky.'; +$strMbExtensionMissing = 'Rozen mbstring pro PHP nebylo nalezeno a zd se, e povte vce bajtovou znakovou sadu. Bez rozen mbstring neum phpMyAdmin sprvn rozdlovat etzce a proto to me mt neekan nsledky.'; $strMbOverloadWarning = 'V nastaven PHP mte zapnuto mbstring.func_overload. Toto nastaven nen kompatibiln s phpMyAdminem a me zpsobit pokozen dat!'; $strMIME_available_mime = 'Dostupn MIME typy'; $strMIME_available_transform = 'Dostupn transformace'; @@ -483,7 +484,7 @@ $strMyISAMMaxSortFileSizeDesc = 'Maximln velikost doasnch soubor, kter sm $strMyISAMMaxSortFileSize = 'Maximln velikost doasnch soubor pro azen'; $strMyISAMRecoverOptions = 'Automatick reim obnovy'; $strMyISAMRecoverOptionsDesc = 'Reim automatick obnovy pokozench MyISAM tabulek. Nastavuje se parametrem --myisam-recover pi spoutn serveru.'; -$strMyISAMRepairThreadsDesc = 'Pokud je tato hodnota vt ne 1, indexy v MyISAM tabulkch jsou vytveny paralelen (kad index vlastnm threadem) pi obnov nebo azen.'; +$strMyISAMRepairThreadsDesc = 'Pokud je tato hodnota vt ne 1, indexy v MyISAM tabulkch jsou vytveny paraleln (kad index vlastnm threadem) pi obnov nebo azen.'; $strMyISAMRepairThreads = 'Thread pro opravovn'; $strMyISAMSortBufferSizeDesc = 'Pam, kter je alokovna pi azen MyISAM index bhem jejich vytven nebo opravovn.'; $strMyISAMSortBufferSize = 'Velikost pamti pro azen'; @@ -536,8 +537,8 @@ $strNumSearchResultsTotal = '<b>Celkem:</b> <i>%s</i> odpovdajc(ch) zznam() $strNumTables = 'Tabulek'; $strOK = 'OK'; -$strOpenDocumentSpreadsheet = 'Seit Open Document'; -$strOpenDocumentText = 'Text Open Document'; +$strOpenDocumentSpreadsheet = 'Seit OpenDocument'; +$strOpenDocumentText = 'Text OpenDocument'; $strOpenNewWindow = 'Otevt nov okno phpMyAdmina'; $strOperations = 'pravy'; $strOperator = 'Opertor'; @@ -568,7 +569,7 @@ $strPerMinute = 'za minutu'; $strPerSecond = 'za sekundu'; $strPersian = 'Pertina'; $strPhoneBook = 'adres'; -$strPHP40203 = 'Pouvte PHP 4.2.3, kter m zvanou chybu pi prci s vcebajtovmi znaky (mbstring), jedn se o chybu PHP slo 19404. Nedoporuujeme pouvat tuto verzi PHP s phpMyAdminem.'; +$strPHP40203 = 'Pouvte PHP 4.2.3, kter m zvanou chybu pi prci s vce bajtovmi znaky (mbstring), jedn se o chybu PHP slo 19404. Nedoporuujeme pouvat tuto verzi PHP s phpMyAdminem.'; $strPHPVersion = 'Verze PHP'; $strPhp = 'Vytvoit PHP kd'; $strPleaseSelectPrimaryOrUniqueKey = 'Zvolte, prosm, primrn nebo uniktn kl'; @@ -612,7 +613,7 @@ $strPrivDescMaxUserConnections = 'Omezuje poet souasnch pipojen uivatele.' $strPrivDescProcess3 = 'Umouje ukonit procesy jinm uivatelm.'; $strPrivDescProcess4 = 'Umouje vidt cel dotazy v seznamu proces.'; $strPrivDescReferences = 'Nem dn vliv v tto verzi MySQL.'; -$strPrivDescReload = 'Umouje znovunaten nastaven a vyprzdnn vyrovnvacch pamt MySQL serveru.'; +$strPrivDescReload = 'Umouje znovu nast nastaven a vyprzdnn vyrovnvacch pamt MySQL serveru.'; $strPrivDescReplClient = 'Umon uivateli zjistit, kde je hlavn / pomocn server.'; $strPrivDescReplSlave = 'Potebn pro replikaci pomocnch server.'; $strPrivDescSelect = 'Umouje vybrat data.'; @@ -623,7 +624,7 @@ $strPrivDescSuper = 'Umouje pipojen, i kdy je dosaen maximln poet pipo $strPrivDescUpdate = 'Umouje mnit data.'; $strPrivDescUsage = 'dn oprvnn.'; $strPrivileges = 'Oprvnn'; -$strPrivilegesReloaded = 'Oprvnn byla znovunatena spn.'; +$strPrivilegesReloaded = 'Oprvnn byla natena spn.'; $strProcedures = 'Procedury'; $strProcesses = 'Procesy'; $strProcesslist = 'Seznam proces'; @@ -655,8 +656,8 @@ $strRelationNotWorking = 'Nkter z rozench funkc phpMyAdmina nelze po $strRelationsForTable = 'RELACE PRO TABULKU'; $strRelations = 'Relace'; $strRelationView = 'Zobrazit relace'; -$strReloadingThePrivileges = 'Znovunatm oprvnn'; -$strReloadPrivileges = 'Znovunast oprvnn'; +$strReloadingThePrivileges = 'Natm oprvnn'; +$strReloadPrivileges = 'Znovu nast oprvnn'; $strReload = 'Znovu nast'; $strRemoveSelectedUsers = 'Odstranit vybran uivatele'; $strRenameDatabaseOK = 'Databze %s byla pejmenovna na %s'; @@ -668,8 +669,9 @@ $strReplaceTable = 'Pepsat data tabulky souborem'; $strReplication = 'Replikace'; $strReset = 'Pvodn'; $strResourceLimits = 'Omezen zdroj'; +$strRestartInsertion = 'Zat znovu vkldn s %s dky'; $strReType = 'Heslo znovu'; -$strRevokeAndDeleteDescr = 'Uivatel budou mt oprvnn „USAGE“ (pouvn), dokud nebudou znovunatena oprvnn.'; +$strRevokeAndDeleteDescr = 'Uivatel budou mt oprvnn „USAGE“ (pouvn), dokud nebudou znovu natena oprvnn.'; $strRevokeAndDelete = 'Odebrat uivatelm veker oprvnn a pot je odstranit z tabulek.'; $strRevokeMessage = 'Byla zruena prva pro %s'; $strRevoke = 'Zruit'; @@ -760,7 +762,7 @@ $strShowStatusHandler_read_firstDescr = 'Poet peten prvn poloky indexu. P $strShowStatusHandler_read_keyDescr = 'Poet poadavk na peten dku vychzejc z indexu. Vysok hodnota znamen, e dotazy sprvn vyuvaj indexy.'; $strShowStatusHandler_read_nextDescr = 'Poet poadavk na peten dalho dku podle indexu. Tato hodnota se zvtuje pokud provdte dotaz na indexovan sloupec s omezenm rozsahu nebo prohledvte index.'; $strShowStatusHandler_read_prevDescr = 'Poet poadavk na peten pedchozho dku z indexu. Pouvan pro optimalizaci dotaz ORDER BY ... DESC.'; -$strShowStatusHandler_read_rndDescr = 'Poet poadavk na peten konkrtnho dku tabulky. Vysok hodnota znamen, e provdte mnoho dotaz, kter vyaduj azen vsledk. Pravdpodobn pouvte mnoho dotaz, kter vyaduj prohlen cel tabulky nebo pouvte spojen tabulek, kter nevyuvaj index.'; +$strShowStatusHandler_read_rndDescr = 'Poet poadavk na peten konkrtnho dku tabulky. Vysok hodnota znamen, e provdte mnoho dotaz, kter vyaduj azen vsledk. Pravdpodobn pouvte mnoho dotaz, kter vyaduj prohlen cel tabulky nebo pouvte spojen tabulek, kter nevyuvaj index.'; $strShowStatusHandler_read_rnd_nextDescr = 'Poet poadavk na peten dalho dku ze souboru. Tato hodnota je vysok pokud dotazy prochzej cel tabulky, pravdpodobn tedy nemaj vhodn indexy.'; $strShowStatusHandler_rollbackDescr = 'Poet internch pkaz ROLLBACK.'; $strShowStatusHandler_updateDescr = 'Poet poadavk na aktualizaci dku.'; @@ -783,8 +785,8 @@ $strShowStatusInnodb_data_pending_fsyncsDescr = 'Poet nevyzench synchronizac $strShowStatusInnodb_data_pending_readsDescr = 'Poet nevyzench ten.'; $strShowStatusInnodb_data_pending_writesDescr = 'Poet nevyzench zpis.'; $strShowStatusInnodb_data_readDescr = 'Velikost petench dat, v bajtech.'; -$strShowStatusInnodb_data_readsDescr = 'Poet provedench ten dat.'; -$strShowStatusInnodb_data_writesDescr = 'Poet provedench zpis dat.'; +$strShowStatusInnodb_data_readsDescr = 'Poet provedench ten dat.'; +$strShowStatusInnodb_data_writesDescr = 'Poet provedench zpis dat.'; $strShowStatusInnodb_data_writtenDescr = 'Velikost zapsanch dat, v bajtech.'; $strShowStatusInnodb_dblwr_pages_writtenDescr = 'Poet provedench dvojitch zapsn a poet strnek, kter byly takto zapsny.'; $strShowStatusInnodb_dblwr_writesDescr = 'Poet provedench dvojitch zapsn a poet strnek, kter byly takto zapsny.'; @@ -804,18 +806,18 @@ $strShowStatusInnodb_row_lock_time_avgDescr = 'Prmrn as potebn pro zskn $strShowStatusInnodb_row_lock_timeDescr = 'Celkov as strven eknm na zmek dku, v milisekundch.'; $strShowStatusInnodb_row_lock_time_maxDescr = 'Maximln as potebn pro zskn zmku dku, v milisekundch.'; $strShowStatusInnodb_row_lock_waitsDescr = 'Kolikrt se muselo ekat na zmek dku.'; -$strShowStatusInnodb_rows_deletedDescr = 'Poet dk ostrannch z InnoDB tabulek.'; +$strShowStatusInnodb_rows_deletedDescr = 'Poet dk odstrannch z InnoDB tabulek.'; $strShowStatusInnodb_rows_insertedDescr = 'Poet dk vloench do InnoDB tabulek.'; $strShowStatusInnodb_rows_readDescr = 'Poet dk petench z InnoDB tabulek.'; $strShowStatusInnodb_rows_updatedDescr = 'Poet dk aktualizovanch v InnoDB tabulkch.'; $strShowStatusKey_blocks_not_flushedDescr = 'Poet blok ve vyrovnvac pamti kl, kter byly zmnny, ale nebyly zapsny na disk. Dve se tato hodnota jmenovala Not_flushed_key_blocks.'; -$strShowStatusKey_blocks_unusedDescr = 'Poet nepouitch blok ve vyrovnvac pamti kl. Pomoc tto hodoty poznte jak moc je vyrovnvac pam vyuit.'; +$strShowStatusKey_blocks_unusedDescr = 'Poet nepouitch blok ve vyrovnvac pamti kl. Pomoc tto hodnoty poznte jak moc je vyrovnvac pam vyuit.'; $strShowStatusKey_blocks_usedDescr = 'Poet pouitch blok ve vyrovnvac pamti kl. Tato hodnota uruje maximum blok, kter kdy byly obsazeny najednou.'; $strShowStatusKey_read_requestsDescr = 'Poet poadavk na peten kle z vyrovnvac pamti.'; $strShowStatusKey_readsDescr = 'Poet skutench ten bloku zkle z disku. Pokud je hodnota pli velk, pravdpodobn mte malou vyrovnvac pam (key_buffer_size). spnost vyrovnvac pamti mete spotat jako Key_reads/Key_read_requests.'; $strShowStatusKey_write_requestsDescr = 'Poet poadavk na zpis bloku kle na disk.'; $strShowStatusKey_writesDescr = 'Poet skutench zpis bloku kle na disk.'; -$strShowStatusLast_query_costDescr = 'Celkov cena poslednho kompilovanho dotazu spotan optimalizrem dotaz. Uiten pro porovnn rznch dotaz. Vchoz hodnota 0 znamen, e dn dotaz jet nebyl kompilovn.'; +$strShowStatusLast_query_costDescr = 'Celkov cena poslednho kompilovanho dotazu spotan optimaliztorem dotaz. Uiten pro porovnn rznch dotaz. Vchoz hodnota 0 znamen, e dn dotaz jet nebyl kompilovn.'; $strShowStatusNot_flushed_delayed_rowsDescr = 'Poet dk ekajcch na zapsn ve front INSERT DELAYED.'; $strShowStatusOpened_tablesDescr = 'Celkem otevench tabulek. Pokud je tato hodnota pli vysok, pravdpodobn mte malou vyrovnvac pam pro tabulky.'; $strShowStatusOpen_filesDescr = 'Poet otevench soubor.'; @@ -824,7 +826,7 @@ $strShowStatusOpen_tablesDescr = 'Poet aktuln otevench tabulek.'; $strShowStatusQcache_free_blocksDescr = 'Poet volnch blok pamti ve vyrovnvac pamti dotaz.'; $strShowStatusQcache_free_memoryDescr = 'Velikost voln pamti ve vyrovnvac pamti dotaz.'; $strShowStatusQcache_hitsDescr = 'Poet zsah vyrovnvac pamti dotaz.'; -$strShowStatusQcache_insertsDescr = 'Poet dotazch pidanch do vyrovnvac pamti dotaz.'; +$strShowStatusQcache_insertsDescr = 'Poet dotaz pidanch do vyrovnvac pamti dotaz.'; $strShowStatusQcache_lowmem_prunesDescr = 'Poet dotaz odstrannch z vyrovnvac pamti dotaz aby uvolnily msto pro nov. Tato hodnota me pomoci v nastaven velikosti vyrovnvac pamti. Vyrovnvac pam pouv strategii LRU (nejdle nepouit) pro vyazovn dotaz z vyrovnvac pamti.'; $strShowStatusQcache_not_cachedDescr = 'Poet necachovanch dotaz (necachovatelnch nebo necachovanch kvli nastaven query_cache_type).'; $strShowStatusQcache_queries_in_cacheDescr = 'Poet dotaz ve vyrovnvac pamti dotaz.'; @@ -834,19 +836,19 @@ $strShowStatusRpl_statusDescr = 'Stav failsafe replikace.'; $strShowStatusSelect_full_joinDescr = 'Poet spojen, kter nevyuvaly indexy. Pokud tato hodnota nen 0, mli byste zkontrolovat indexy tabulek.'; $strShowStatusSelect_full_range_joinDescr = 'Poet spojen, kter pouvaly intervalov vyhledvn na referenn tabulce.'; $strShowStatusSelect_range_checkDescr = 'Poet spojen bez kl, kter kontrolovaly pouit kl po kadm dku. Pokud tato hodnota nen 0, mli byste zkontrolovat indexy tabulek.'; -$strShowStatusSelect_rangeDescr = 'Poet spojen, kter pouivaly intervalov vyhledvn na prvn tabulce. Tato hodnota obvykle nen kritick i kdy je vysok.'; +$strShowStatusSelect_rangeDescr = 'Poet spojen, kter pouvaly intervalov vyhledvn na prvn tabulce. Tato hodnota obvykle nen kritick i kdy je vysok.'; $strShowStatusSelect_scanDescr = 'Poet spojen, kter provdly kompletn prochzen prvn tabulky.'; $strShowStatusSlave_open_temp_tablesDescr = 'Poet doasnch tabulek v souasn dob otevench podzenm serverem.'; -$strShowStatusSlave_retried_transactionsDescr = 'Celkov poek, kolikrt musel podzen server opakovat transakce.'; +$strShowStatusSlave_retried_transactionsDescr = 'Celkov poet, kolikrt musel podzen server opakovat transakce.'; $strShowStatusSlave_runningDescr = 'Tato poloka je zapnut, pokud server pracuje jako podzen.'; -$strShowStatusSlow_launch_threadsDescr = 'Poet vlken jejih vytvoen trvalo dle ne slow_launch_time sekund.'; +$strShowStatusSlow_launch_threadsDescr = 'Poet vlken jejich vytvoen trvalo dle ne slow_launch_time sekund.'; $strShowStatusSlow_queriesDescr = 'Poet dotaz, kter trvaly dle ne long_query_time sekund.'; $strShowStatusSort_merge_passesDescr = 'Poet prchod sluovn, kter musel provst adic algoritmus. Pi pli vysok hodnot zvate zven sort_buffer_size.'; $strShowStatusSort_rangeDescr = 'Poet azen, kter byly omezeny rozsahem.'; $strShowStatusSort_rowsDescr = 'Poet azench dek.'; $strShowStatusSort_scanDescr = 'Poet azen provedench prochzenm tabulky.'; -$strShowStatusTable_locks_immediateDescr = 'Poek okamitch zskn zmku tabulky.'; -$strShowStatusTable_locks_waitedDescr = 'Poet ekn na zskn zmku tabulky. Pokud je tato hodnota vysok a mte problmy s vkonem, mli byste optimalizovat dostazy a ppadn rozdlit tabulky nebo pout replikaci.'; +$strShowStatusTable_locks_immediateDescr = 'Poet okamitch zskn zmku tabulky.'; +$strShowStatusTable_locks_waitedDescr = 'Poet ekn na zskn zmku tabulky. Pokud je tato hodnota vysok a mte problmy s vkonem, mli byste optimalizovat dotazy a ppadn rozdlit tabulky nebo pout replikaci.'; $strShowStatusThreads_cachedDescr = 'Poet vlken ve vyrovnvac pamti. spnost vyrovnvac pamti me bt spotna jako Threads_created/Connections. Pokud je tato hodnota erven, mli byste zvit thread_cache_size.'; $strShowStatusThreads_connectedDescr = 'Poet aktuln otevench pipojen.'; $strShowStatusThreads_createdDescr = 'Poet vlken vytvoench pro obsluhu pipojen. Pokud je hodnota pli velk, mete zvtit parametr thread_cache_size. Na platformch, kter maj dobrou implementaci vlken vak toto nem pli velk vliv.'; @@ -863,7 +865,7 @@ $strSlovak = 'Sloventina'; $strSlovenian = 'Slovintina'; $strSmallBigAll = 'Ve mal/velk'; $strSnapToGrid = 'Zachytvat na mku'; -$strSocketProblem = '(nebo nen spvn nastaven lokln socket MySQL serveru)'; +$strSocketProblem = '(nebo nen sprvn nastaven lokln socket MySQL serveru)'; $strSortByKey = 'Setdit podle kle'; $strSorting = 'azen'; $strSort = 'adit'; @@ -934,7 +936,7 @@ $strThisHost = 'Tento pota'; $strThreads = 'Poet vlken'; $strThreadSuccessfullyKilled = 'Vlkno %s bylo spn zabito.'; $strTime = 'as'; -$strTimeoutInfo = 'Pedchoz mport vyerpal veker as, po dalm odesln bude import pokraovat od pozize %d.'; +$strTimeoutInfo = 'Pedchoz mport vyerpal veker as, po dalm odesln bude import pokraovat od pozice %d.'; $strTimeoutNothingParsed = 'Bohuel bhem poslednho pokusu nebyla dn data natena. Toto obvykle znamen, e phpMyAdmin nebude schopen nast tento soubor, pokud nezvte asov limity v PHP.'; $strTimeoutPassed = 'Limit pro bh importu vyprel, prosm odelete formul znovu se stejnm souborem a import bude pokraovat.'; $strToFromPage = 'do/ze strnky'; @@ -948,7 +950,7 @@ $strTraditionalSpanish = 'Tradin panltina'; $strTraffic = 'Provoz'; $strTransactionCoordinator = 'Koordintor transakc'; $strTransformation_application_octetstream__download = 'Zobraz odkaz na sthnut dat. Prvn parametr je jmno souboru, druh jmno sloupce v tabulce obsahujc jmno souboru. Pokud zadte druh parametr, prvn mus bt przdn.'; -$strTransformation_application_octetstream__hex = 'Zobraz data estnctkov. Nepovinn parameter uruje po kolika znacch m bt pidna mezera (vchoz hodnota je 2).'; +$strTransformation_application_octetstream__hex = 'Zobraz data estnctkov. Nepovinn parametr uruje po kolika znacch m bt pidna mezera (vchoz hodnota je 2).'; $strTransformation_image_jpeg__inline = 'Zobraz nhled obrzku s odkazem na obrzek; parametry ka a vka v bodech (pomr stran obrzku zstane zachovn)'; $strTransformation_image_jpeg__link = 'Zobraz odkaz na obrzek (napklad sthnut pole blob).'; $strTransformation_image_png__inline = 'Viz image/jpeg: inline'; @@ -959,6 +961,7 @@ $strTransformation_text_plain__imagelink = 'Zobraz obrzek a odkaz z pole $strTransformation_text_plain__link = 'Zobraz odkaz z pole obsahujcho odkaz. Prvn parametr je prefix URL (napklad „http://mojedomena.cz/“), druh text odkazu.'; $strTransformation_text_plain__sql = 'Zobraz text jako SQL dotaz se zvrazovnm syntaxe.'; $strTransformation_text_plain__substr = 'Zobraz jen st textu. Prvn parametr je posun od zatku (vchoz je 0) a druh uruje dlku textu, kter se m zobrazit, pokud nen uveden, bude zobrazen zbytek textu. Tet parametr uruje, jak text m bt pidn za zkrcen text (vchoz je ...).'; +$strTriggers = 'Spout'; $strTruncateQueries = 'Zobrazit zkrcen dotazy'; $strTurkish = 'Turecky'; $strType = 'Typ'; diff --git a/lang/czech-utf-8.inc.php b/lang/czech-utf-8.inc.php index 831b9f4014..acf2b1b1a5 100644 --- a/lang/czech-utf-8.inc.php +++ b/lang/czech-utf-8.inc.php @@ -114,7 +114,7 @@ $strCanNotLoadExportPlugins = 'Nepodařilo se nahrát pluginy pro export, zkontr $strCanNotLoadImportPlugins = 'Nepodařilo se nahrát pluginy pro import, zkontrolujte prosím vaší instalaci!'; $strCannotLogin = 'Nepodařilo se přihlášení k MySQL serveru'; $strCantLoad = 'nelze nahrát rozšíření %s,<br />zkontrolujte prosím nastavení PHP'; -$strCantLoadRecodeIconv = 'Nelze nahrát rozšíření iconv ani recode potřebná pro převod znakových sad. Upravte nastavení PHP tak, aby umožňovalo použít tyto rozšíření nebo vypněte převod znakových sad v phpMyAdminu.'; +$strCantLoadRecodeIconv = 'Nelze nahrát rozšíření iconv ani recode potřebná pro převod znakových sad. Upravte nastavení PHP tak, aby umožňovalo použít tyto rozšíření nebo vypněte převod znakových sad v phpMyAdminovi.'; $strCantRenameIdxToPrimary = 'Index nemůžete přejmenovat na „PRIMARY“!'; $strCantUseRecodeIconv = 'Nelze použít funkce iconv ani libiconv ani recode_string, přestože rozšíření jsou nahrána. Zkontrolujte nastavení PHP.'; $strCardinality = 'Mohutnost'; @@ -151,7 +151,7 @@ $strCompatibleHashing = 'Kompatibilní s MySQL 4.0'; $strCompleteInserts = 'Úplné inserty'; $strCompression = 'Komprese'; $strCompressionWillBeDetected = 'Komprimace importovaného souboru bude automaticky rozpoznána. Podporovány jsou: %s'; -$strConfigDefaultFileError = 'Nepodařilo se nahrát výchozí konfiguraci ze soubouru: "%1$s"'; +$strConfigDefaultFileError = 'Nepodařilo se nahrát výchozí konfiguraci ze souboru: "%1$s"'; $strConfigFileError = 'phpMyAdmin nemohl načíst konfigurační soubor!<br />Tato chyba může nastat, pokud v něm PHP najde chybu nebo nemůže tento soubor najít.<br />Po kliknutí na následující odkaz se PHP pokusí přímo interpretovat tento soubor a zobrazí informace o chybě, ke které došlo. Pak opravte tuto chybu (nejčastěji se jedná o chybějící středník).<br />Pokud získáte prázdnou stránku, všechno je v pořádku.'; $strConfigureTableCoord = 'Prosím, nastavte souřadnice pro tabulku %s'; $strConnectionError = 'Nepodařilo se připojit: chybné nastavení.'; @@ -204,7 +204,7 @@ $strDatabasesStats = 'Statistiky databází'; $strData = 'Data'; $strDataDict = 'Datový slovník'; $strDataOnly = ' Jen data'; -$strDataPages = 'Stránek obshahujících data'; +$strDataPages = 'Stránek obsahujících data'; $strDBComment = 'Komentář k databázi: '; $strDBCopy = 'Zkopírovat databázi na'; $strDbIsEmpty = 'Databáze se zdá být prázdná!'; @@ -217,7 +217,7 @@ $strDefault = 'Výchozí'; $strDefragment = 'Defragmentovat tabulku'; $strDelayedInserts = 'Používat zpožděné inserty'; $strDeleteAndFlushDescr = 'Toto je nejčistší řešení, ale načítání oprávnění může trvat dlouho.'; -$strDeleteAndFlush = 'Odstranit uživatele a znovunačíst oprávnění.'; +$strDeleteAndFlush = 'Odstranit uživatele a znovu načíst oprávnění.'; $strDeleted = 'Řádek byl smazán'; $strDeletedRows = 'Smazané řádky:'; $strDeleteNoUsersSelected = 'Musíte vybrat uživatele, které chcete odstranit!'; @@ -277,6 +277,7 @@ $strErrorSaveTable = 'Chyba při ukládání souřadnic pro Návrháře.'; $strEscapeWildcards = 'Zástupné znaky _ a % by měly být escapovány pomocí \, pokud je chcete použít jako znak'; $strEsperanto = 'Esperanto'; $strEstonian = 'Estonština'; +$strEvent = 'Událost'; $strExcelEdition = 'Verze Excelu'; $strExecuteBookmarked = 'Spustit oblíbený dotaz'; $strExplain = 'Vysvětlit dotaz'; @@ -288,7 +289,7 @@ $strExtra = 'Extra'; $strFailedAttempts = 'Nepovedených pokusů'; $strFieldHasBeenDropped = 'Sloupec %s byl odstraněn'; -$strFieldInsertFromFileTempDirNotExists = 'Chyba při přejmenování nahrátého soubory, viz FAQ 1.11'; +$strFieldInsertFromFileTempDirNotExists = 'Chyba při přejmenování nahraného soubory, viz FAQ 1.11'; $strFieldsEmpty = ' Nebyl zadán počet sloupců! '; $strFieldsEnclosedBy = 'Názvy sloupců uzavřené'; $strFieldsEscapedBy = 'Názvy sloupců escapovány'; @@ -306,7 +307,7 @@ $strFileNameTemplate = 'Vzor pro jméno souboru'; $strFiles = 'Soubory'; $strFileToImport = 'Soubor pro importování'; $strFixed = 'pevný'; -$strFlushPrivilegesNote = 'Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto tabulek se může lišit od oprávnění, která server právě používá, pokud byly tyto tabulky upravovány. V tomto případě je vhodné provést %sznovunačtení oprávnění%s před pokračováním.'; +$strFlushPrivilegesNote = 'Poznámka: phpMyAdmin získává oprávnění přímo z tabulek MySQL. Obsah těchto tabulek se může lišit od oprávnění, která server právě používá, pokud byly tyto tabulky upravovány. V tomto případě je vhodné provést %snové načtení oprávnění%s před pokračováním.'; $strFlushQueryCache = 'Vyprázdnit vyrovnávací paměť dotazů'; $strFlushTables = 'Zavřít všechny tabulky'; $strFlushTable = 'Vyprázdnit vyrovnávací paměť pro tabulku („FLUSH“)'; @@ -409,7 +410,7 @@ $strInvalidTableName = 'Chybné jméno tabulky'; $strJapanese = 'Japonština'; $strJoins = 'Použité výběry'; $strJumpToDB = 'Přejít na databázi „%s“.'; -$strJustDeleteDescr = 'Odstranění uživatelé stále budou mít přístup na server, dokud nebudou znovunačtena oprávnění.'; +$strJustDeleteDescr = 'Odstranění uživatelé stále budou mít přístup na server, dokud nebudou znovu načtena oprávnění.'; $strJustDelete = 'Jen odstranit uživatele z tabulek s oprávněními.'; $strKeepPass = 'Neměnit heslo'; @@ -455,7 +456,7 @@ $strLongOperation = 'Tato operace může trvat velmi dlouho. Chcete je přesto p $strMaxConnects = 'Maximum současných připojení'; $strMaximalQueryLength = 'Maximální velikost vytvořeného dotazu'; $strMaximumSize = 'Maximální velikost: %s%s'; -$strMbExtensionMissing = 'Rozšíření mbstring pro PHP nebylo nalezeno a zdá se, že požíváte vícebajtovou znakovou sadu. Bez rozšíření mbstring neumí phpMyAdmin správně rozdělovat řetězce a proto to může mít nečekané následky.'; +$strMbExtensionMissing = 'Rozšíření mbstring pro PHP nebylo nalezeno a zdá se, že požíváte více bajtovou znakovou sadu. Bez rozšíření mbstring neumí phpMyAdmin správně rozdělovat řetězce a proto to může mít nečekané následky.'; $strMbOverloadWarning = 'V nastavení PHP máte zapnuto mbstring.func_overload. Toto nastavení není kompatibilní s phpMyAdminem a může způsobit poškození dat!'; $strMIME_available_mime = 'Dostupné MIME typy'; $strMIME_available_transform = 'Dostupné transformace'; @@ -484,7 +485,7 @@ $strMyISAMMaxSortFileSizeDesc = 'Maximální velikost dočasných souborů, kter $strMyISAMMaxSortFileSize = 'Maximální velikost dočasných souborů pro řazení'; $strMyISAMRecoverOptions = 'Automatický režim obnovy'; $strMyISAMRecoverOptionsDesc = 'Režim automatické obnovy poškozených MyISAM tabulek. Nastavuje se parametrem --myisam-recover při spouštění serveru.'; -$strMyISAMRepairThreadsDesc = 'Pokud je tato hodnota větší než 1, indexy v MyISAM tabulkách jsou vytvářeny paraleleně (každý index vlastním threadem) při obnově nebo řazení.'; +$strMyISAMRepairThreadsDesc = 'Pokud je tato hodnota větší než 1, indexy v MyISAM tabulkách jsou vytvářeny paralelně (každý index vlastním threadem) při obnově nebo řazení.'; $strMyISAMRepairThreads = 'Threadů pro opravování'; $strMyISAMSortBufferSizeDesc = 'Paměť, která je alokována při řazení MyISAM indexů během jejich vytváření nebo opravování.'; $strMyISAMSortBufferSize = 'Velikost paměti pro řazení'; @@ -537,8 +538,8 @@ $strNumSearchResultsTotal = '<b>Celkem:</b> <i>%s</i> odpovídající(ch) zázna $strNumTables = 'Tabulek'; $strOK = 'OK'; -$strOpenDocumentSpreadsheet = 'Sešit Open Document'; -$strOpenDocumentText = 'Text Open Document'; +$strOpenDocumentSpreadsheet = 'Sešit OpenDocument'; +$strOpenDocumentText = 'Text OpenDocument'; $strOpenNewWindow = 'Otevřít nové okno phpMyAdmina'; $strOperations = 'Úpravy'; $strOperator = 'Operátor'; @@ -569,7 +570,7 @@ $strPerMinute = 'za minutu'; $strPerSecond = 'za sekundu'; $strPersian = 'Perština'; $strPhoneBook = 'adresář'; -$strPHP40203 = 'Používáte PHP 4.2.3, které má závažnou chybu při práci s vícebajtovými znaky (mbstring), jedná se o chybu PHP číslo 19404. Nedoporučujeme používat tuto verzi PHP s phpMyAdminem.'; +$strPHP40203 = 'Používáte PHP 4.2.3, které má závažnou chybu při práci s více bajtovými znaky (mbstring), jedná se o chybu PHP číslo 19404. Nedoporučujeme používat tuto verzi PHP s phpMyAdminem.'; $strPHPVersion = 'Verze PHP'; $strPhp = 'Vytvořit PHP kód'; $strPleaseSelectPrimaryOrUniqueKey = 'Zvolte, prosím, primární nebo unikátní klíč'; @@ -613,7 +614,7 @@ $strPrivDescMaxUserConnections = 'Omezuje počet současných připojení uživa $strPrivDescProcess3 = 'Umožňuje ukončit procesy jiným uživatelům.'; $strPrivDescProcess4 = 'Umožňuje vidět celé dotazy v seznamu procesů.'; $strPrivDescReferences = 'Nemá žádný vliv v této verzi MySQL.'; -$strPrivDescReload = 'Umožňuje znovunačtení nastavení a vyprázdnění vyrovnávacích pamětí MySQL serveru.'; +$strPrivDescReload = 'Umožňuje znovu načíst nastavení a vyprázdnění vyrovnávacích pamětí MySQL serveru.'; $strPrivDescReplClient = 'Umožní uživateli zjistit, kde je hlavní / pomocný server.'; $strPrivDescReplSlave = 'Potřebné pro replikaci pomocných serverů.'; $strPrivDescSelect = 'Umožňuje vybírat data.'; @@ -624,7 +625,7 @@ $strPrivDescSuper = 'Umožňuje připojení, i když je dosažen maximální po $strPrivDescUpdate = 'Umožňuje měnit data.'; $strPrivDescUsage = 'Žádná oprávnění.'; $strPrivileges = 'Oprávnění'; -$strPrivilegesReloaded = 'Oprávnění byla znovunačtena úspěšně.'; +$strPrivilegesReloaded = 'Oprávnění byla načtena úspěšně.'; $strProcedures = 'Procedury'; $strProcesses = 'Procesy'; $strProcesslist = 'Seznam procesů'; @@ -656,8 +657,8 @@ $strRelationNotWorking = 'Některé z rozšířených funkcí phpMyAdmina n $strRelationsForTable = 'RELACE PRO TABULKU'; $strRelations = 'Relace'; $strRelationView = 'Zobrazit relace'; -$strReloadingThePrivileges = 'Znovunačítám oprávnění'; -$strReloadPrivileges = 'Znovunačíst oprávnění'; +$strReloadingThePrivileges = 'Načítám oprávnění'; +$strReloadPrivileges = 'Znovu načíst oprávnění'; $strReload = 'Znovu načíst'; $strRemoveSelectedUsers = 'Odstranit vybrané uživatele'; $strRenameDatabaseOK = 'Databáze %s byla přejmenována na %s'; @@ -669,8 +670,9 @@ $strReplaceTable = 'Přepsat data tabulky souborem'; $strReplication = 'Replikace'; $strReset = 'Původní'; $strResourceLimits = 'Omezení zdrojů'; +$strRestartInsertion = 'Začít znovu vkládání s %s řádky'; $strReType = 'Heslo znovu'; -$strRevokeAndDeleteDescr = 'Uživatelé budou mít oprávnění „USAGE“ (používání), dokud nebudou znovunačtena oprávnění.'; +$strRevokeAndDeleteDescr = 'Uživatelé budou mít oprávnění „USAGE“ (používání), dokud nebudou znovu načtena oprávnění.'; $strRevokeAndDelete = 'Odebrat uživatelům veškerá oprávnění a poté je odstranit z tabulek.'; $strRevokeMessage = 'Byla zrušena práva pro %s'; $strRevoke = 'Zrušit'; @@ -761,7 +763,7 @@ $strShowStatusHandler_read_firstDescr = 'Počet přečtení první položky inde $strShowStatusHandler_read_keyDescr = 'Počet požadavků na přečtení řádku vycházející z indexu. Vysoká hodnota znamená, že dotazy správně využívají indexy.'; $strShowStatusHandler_read_nextDescr = 'Počet požadavků na přečtení dalšího řádku podle indexu. Tato hodnota se zvětšuje pokud provádíte dotaz na indexovaný sloupec s omezením rozsahu nebo prohledáváte index.'; $strShowStatusHandler_read_prevDescr = 'Počet požadavků na přečtení předchozího řádku z indexu. Používané pro optimalizaci dotazů ORDER BY ... DESC.'; -$strShowStatusHandler_read_rndDescr = 'Počet požadavků na přečtení konkrétního řádku tabulky. Vysoká hodnota znamená, že provádíte mnoho dotazů, které vyřadují řazení výsledků. Pravděpodobně používáte mnoho dotazů, které vyžadují prohlížení celé tabulky nebo používáte spojení tabulek, která nevyužívají indexů.'; +$strShowStatusHandler_read_rndDescr = 'Počet požadavků na přečtení konkrétního řádku tabulky. Vysoká hodnota znamená, že provádíte mnoho dotazů, které vyžadují řazení výsledků. Pravděpodobně používáte mnoho dotazů, které vyžadují prohlížení celé tabulky nebo používáte spojení tabulek, která nevyužívají indexů.'; $strShowStatusHandler_read_rnd_nextDescr = 'Počet požadavků na přečtení dalšího řádku ze souboru. Tato hodnota je vysoká pokud dotazy procházejí celé tabulky, pravděpodobně tedy nemají vhodné indexy.'; $strShowStatusHandler_rollbackDescr = 'Počet interních příkazů ROLLBACK.'; $strShowStatusHandler_updateDescr = 'Počet požadavků na aktualizaci řádku.'; @@ -784,8 +786,8 @@ $strShowStatusInnodb_data_pending_fsyncsDescr = 'Počet nevyřízených synchron $strShowStatusInnodb_data_pending_readsDescr = 'Počet nevyřízených čtení.'; $strShowStatusInnodb_data_pending_writesDescr = 'Počet nevyřízených zápisů.'; $strShowStatusInnodb_data_readDescr = 'Velikost přečtených dat, v bajtech.'; -$strShowStatusInnodb_data_readsDescr = 'Počet provedenách čtení dat.'; -$strShowStatusInnodb_data_writesDescr = 'Počet provedenách zápisů dat.'; +$strShowStatusInnodb_data_readsDescr = 'Počet provedených čtení dat.'; +$strShowStatusInnodb_data_writesDescr = 'Počet provedených zápisů dat.'; $strShowStatusInnodb_data_writtenDescr = 'Velikost zapsaných dat, v bajtech.'; $strShowStatusInnodb_dblwr_pages_writtenDescr = 'Počet provedených dvojitých zapsání a počet stránek, které byly takto zapsány.'; $strShowStatusInnodb_dblwr_writesDescr = 'Počet provedených dvojitých zapsání a počet stránek, které byly takto zapsány.'; @@ -805,18 +807,18 @@ $strShowStatusInnodb_row_lock_time_avgDescr = 'Průměrný čas potřebný pro z $strShowStatusInnodb_row_lock_timeDescr = 'Celkový čas strávený čekáním na zámek řádku, v milisekundách.'; $strShowStatusInnodb_row_lock_time_maxDescr = 'Maximální čas potřebný pro získání zámku řádku, v milisekundách.'; $strShowStatusInnodb_row_lock_waitsDescr = 'Kolikrát se muselo čekat na zámek řádku.'; -$strShowStatusInnodb_rows_deletedDescr = 'Počet řádků ostraněných z InnoDB tabulek.'; +$strShowStatusInnodb_rows_deletedDescr = 'Počet řádků odstraněných z InnoDB tabulek.'; $strShowStatusInnodb_rows_insertedDescr = 'Počet řádků vložených do InnoDB tabulek.'; $strShowStatusInnodb_rows_readDescr = 'Počet řádků přečtených z InnoDB tabulek.'; $strShowStatusInnodb_rows_updatedDescr = 'Počet řádků aktualizovaných v InnoDB tabulkách.'; $strShowStatusKey_blocks_not_flushedDescr = 'Počet bloků ve vyrovnávací paměti klíčů, které byly změněny, ale nebyly zapsány na disk. Dříve se tato hodnota jmenovala Not_flushed_key_blocks.'; -$strShowStatusKey_blocks_unusedDescr = 'Počet nepoužitých bloků ve vyrovnávací paměti klíčů. Pomocí této hodoty poznáte jak moc je vyrovnávací paměť využitá.'; +$strShowStatusKey_blocks_unusedDescr = 'Počet nepoužitých bloků ve vyrovnávací paměti klíčů. Pomocí této hodnoty poznáte jak moc je vyrovnávací paměť využitá.'; $strShowStatusKey_blocks_usedDescr = 'Počet použitých bloků ve vyrovnávací paměti klíčů. Tato hodnota určuje maximum bloků, které kdy byly obsazeny najednou.'; $strShowStatusKey_read_requestsDescr = 'Počet požadavků na přečtení klíče z vyrovnávací paměti.'; $strShowStatusKey_readsDescr = 'Počet skutečných čtení bloku zklíče z disku. Pokud je hodnota příliš velká, pravděpodobně máte malou vyrovnávací paměť (key_buffer_size). Úspěšnost vyrovnávací paměti můžete spočítat jako Key_reads/Key_read_requests.'; $strShowStatusKey_write_requestsDescr = 'Počet požadavků na zápis bloku klíče na disk.'; $strShowStatusKey_writesDescr = 'Počet skutečných zápisů bloku klíče na disk.'; -$strShowStatusLast_query_costDescr = 'Celková cena posledního kompilovaného dotazu spočítaná optimalizérem dotazů. Užitečné pro porovnání různých dotazů. Výchozí hodnota 0 znamená, že žádný dotaz ještě nebyl kompilován.'; +$strShowStatusLast_query_costDescr = 'Celková cena posledního kompilovaného dotazu spočítaná optimalizátorem dotazů. Užitečné pro porovnání různých dotazů. Výchozí hodnota 0 znamená, že žádný dotaz ještě nebyl kompilován.'; $strShowStatusNot_flushed_delayed_rowsDescr = 'Počet řádků čekajících na zapsání ve frontě INSERT DELAYED.'; $strShowStatusOpened_tablesDescr = 'Celkem otevřených tabulek. Pokud je tato hodnota příliš vysoká, pravděpodobně máte malou vyrovnávací paměť pro tabulky.'; $strShowStatusOpen_filesDescr = 'Počet otevřených souborů.'; @@ -825,7 +827,7 @@ $strShowStatusOpen_tablesDescr = 'Počet aktuálně otevřených tabulek.'; $strShowStatusQcache_free_blocksDescr = 'Počet volných bloků paměti ve vyrovnávací paměti dotazů.'; $strShowStatusQcache_free_memoryDescr = 'Velikost volné paměti ve vyrovnávací paměti dotazů.'; $strShowStatusQcache_hitsDescr = 'Počet zásahů vyrovnávací paměti dotazů.'; -$strShowStatusQcache_insertsDescr = 'Počet dotazůch přidaných do vyrovnávací paměti dotazů.'; +$strShowStatusQcache_insertsDescr = 'Počet dotazů přidaných do vyrovnávací paměti dotazů.'; $strShowStatusQcache_lowmem_prunesDescr = 'Počet dotazů odstraněných z vyrovnávací paměti dotazů aby uvolnily místo pro nové. Tato hodnota může pomoci v nastavení velikosti vyrovnávací paměti. Vyrovnávací paměť používá strategii LRU (nejdéle nepoužité) pro vyřazování dotazů z vyrovnávací paměti.'; $strShowStatusQcache_not_cachedDescr = 'Počet necachovaných dotazů (necachovatelných nebo necachovaných kvůli nastavení query_cache_type).'; $strShowStatusQcache_queries_in_cacheDescr = 'Počet dotazů ve vyrovnávací paměti dotazů.'; @@ -835,19 +837,19 @@ $strShowStatusRpl_statusDescr = 'Stav failsafe replikace.'; $strShowStatusSelect_full_joinDescr = 'Počet spojení, které nevyužívaly indexy. Pokud tato hodnota není 0, měli byste zkontrolovat indexy tabulek.'; $strShowStatusSelect_full_range_joinDescr = 'Počet spojení, které používaly intervalové vyhledávání na referenční tabulce.'; $strShowStatusSelect_range_checkDescr = 'Počet spojení bez klíčů, které kontrolovaly použití klíčů po každém řádku. Pokud tato hodnota není 0, měli byste zkontrolovat indexy tabulek.'; -$strShowStatusSelect_rangeDescr = 'Počet spojení, které použivaly intervalové vyhledávání na první tabulce. Tato hodnota obvykle není kritická i když je vysoká.'; +$strShowStatusSelect_rangeDescr = 'Počet spojení, které používaly intervalové vyhledávání na první tabulce. Tato hodnota obvykle není kritická i když je vysoká.'; $strShowStatusSelect_scanDescr = 'Počet spojení, které prováděly kompletní procházení první tabulky.'; $strShowStatusSlave_open_temp_tablesDescr = 'Počet dočasných tabulek v současné době otevřených podřízeným serverem.'; -$strShowStatusSlave_retried_transactionsDescr = 'Celkový poček, kolikrát musel podřízený server opakovat transakce.'; +$strShowStatusSlave_retried_transactionsDescr = 'Celkový počet, kolikrát musel podřízený server opakovat transakce.'; $strShowStatusSlave_runningDescr = 'Tato položka je zapnutá, pokud server pracuje jako podřízený.'; -$strShowStatusSlow_launch_threadsDescr = 'Počet vláken jejihž vytvoření trvalo déle než slow_launch_time sekund.'; +$strShowStatusSlow_launch_threadsDescr = 'Počet vláken jejichž vytvoření trvalo déle než slow_launch_time sekund.'; $strShowStatusSlow_queriesDescr = 'Počet dotazů, které trvaly déle než long_query_time sekund.'; $strShowStatusSort_merge_passesDescr = 'Počet průchodů slučování, které musel provést řadicí algoritmus. Při příliš vysoké hodnotě zvažte zvýšení sort_buffer_size.'; $strShowStatusSort_rangeDescr = 'Počet řazení, které byly omezeny rozsahem.'; $strShowStatusSort_rowsDescr = 'Počet řazených řádek.'; $strShowStatusSort_scanDescr = 'Počet řazení provedených procházením tabulky.'; -$strShowStatusTable_locks_immediateDescr = 'Poček okamžitých získání zámku tabulky.'; -$strShowStatusTable_locks_waitedDescr = 'Počet čekání na získání zámku tabulky. Pokud je tato hodnota vysoká a máte problémy s výkonem, měli byste optimalizovat dostazy a případně rozdělit tabulky nebo použít replikaci.'; +$strShowStatusTable_locks_immediateDescr = 'Počet okamžitých získání zámku tabulky.'; +$strShowStatusTable_locks_waitedDescr = 'Počet čekání na získání zámku tabulky. Pokud je tato hodnota vysoká a máte problémy s výkonem, měli byste optimalizovat dotazy a případně rozdělit tabulky nebo použít replikaci.'; $strShowStatusThreads_cachedDescr = 'Počet vláken ve vyrovnávací paměti. Úspěšnost vyrovnávací paměti může být spočítána jako Threads_created/Connections. Pokud je tato hodnota červená, měli byste zvýšit thread_cache_size.'; $strShowStatusThreads_connectedDescr = 'Počet aktuálně otevřených připojení.'; $strShowStatusThreads_createdDescr = 'Počet vláken vytvořených pro obsluhu připojení. Pokud je hodnota příliš velká, můžete zvětšit parametr thread_cache_size. Na platformách, které mají dobrou implementaci vláken však toto nemá příliš velký vliv.'; @@ -864,7 +866,7 @@ $strSlovak = 'Slovenština'; $strSlovenian = 'Slovinština'; $strSmallBigAll = 'Vše malé/velké'; $strSnapToGrid = 'Zachytávat na mřížku'; -$strSocketProblem = '(nebo není spávně nastaven lokální socket MySQL serveru)'; +$strSocketProblem = '(nebo není správně nastaven lokální socket MySQL serveru)'; $strSortByKey = 'Setřídit podle klíče'; $strSorting = 'Řazení'; $strSort = 'Řadit'; @@ -935,7 +937,7 @@ $strThisHost = 'Tento počítač'; $strThreads = 'Počet vláken'; $strThreadSuccessfullyKilled = 'Vlákno %s bylo úspěšně zabito.'; $strTime = 'Čas'; -$strTimeoutInfo = 'Předchozí ímport vyčerpal veškerý čas, po dalším odeslání bude import pokračovat od pozize %d.'; +$strTimeoutInfo = 'Předchozí ímport vyčerpal veškerý čas, po dalším odeslání bude import pokračovat od pozice %d.'; $strTimeoutNothingParsed = 'Bohužel během posledního pokusu nebyla žádná data načtena. Toto obvykle znamená, že phpMyAdmin nebude schopen načíst tento soubor, pokud nezvýšíte časové limity v PHP.'; $strTimeoutPassed = 'Limit pro běh importu vypršel, prosím odešlete formulář znovu se stejným souborem a import bude pokračovat.'; $strToFromPage = 'do/ze stránky'; @@ -949,7 +951,7 @@ $strTraditionalSpanish = 'Tradiční španělština'; $strTraffic = 'Provoz'; $strTransactionCoordinator = 'Koordinátor transakcí'; $strTransformation_application_octetstream__download = 'Zobrazí odkaz na stáhnutí dat. První parametr je jméno souboru, druhý jméno sloupce v tabulce obsahující jméno souboru. Pokud zadáte druhý parametr, první musí být prázdný.'; -$strTransformation_application_octetstream__hex = 'Zobrazí data šestnáctkově. Nepovinný parameter určuje po kolika znacích má být přidána mezera (výchozí hodnota je 2).'; +$strTransformation_application_octetstream__hex = 'Zobrazí data šestnáctkově. Nepovinný parametr určuje po kolika znacích má být přidána mezera (výchozí hodnota je 2).'; $strTransformation_image_jpeg__inline = 'Zobrazí náhled obrázku s odkazem na obrázek; parametry šířka a výška v bodech (poměr stran obrázku zůstane zachován)'; $strTransformation_image_jpeg__link = 'Zobrazí odkaz na obrázek (například stáhnutí pole blob).'; $strTransformation_image_png__inline = 'Viz image/jpeg: inline'; @@ -960,6 +962,7 @@ $strTransformation_text_plain__imagelink = 'Zobrazí obrázek a odkaz z pol $strTransformation_text_plain__link = 'Zobrazí odkaz z pole obsahujícího odkaz. První parametr je prefix URL (například „http://mojedomena.cz/“), druhý text odkazu.'; $strTransformation_text_plain__sql = 'Zobrazí text jako SQL dotaz se zvýrazňováním syntaxe.'; $strTransformation_text_plain__substr = 'Zobrazí jen část textu. První parametr je posun od začátku (výchozí je 0) a druhý určuje délku textu, který se má zobrazit, pokud není uveden, bude zobrazen zbytek textu. Třetí parametr určuje, jaký text má být přidán za zkrácený text (výchozí je ...).'; +$strTriggers = 'Spouště'; $strTruncateQueries = 'Zobrazit zkrácené dotazy'; $strTurkish = 'Turecky'; $strType = 'Typ'; diff --git a/lang/czech-windows-1250.inc.php b/lang/czech-windows-1250.inc.php index d284be222d..1386e30e0f 100644 --- a/lang/czech-windows-1250.inc.php +++ b/lang/czech-windows-1250.inc.php @@ -113,7 +113,7 @@ $strCanNotLoadExportPlugins = 'Nepodailo se nahrt pluginy pro export, zkontrol $strCanNotLoadImportPlugins = 'Nepodailo se nahrt pluginy pro import, zkontrolujte prosm va instalaci!'; $strCannotLogin = 'Nepodailo se pihlen k MySQL serveru'; $strCantLoad = 'nelze nahrt rozen %s,<br />zkontrolujte prosm nastaven PHP'; -$strCantLoadRecodeIconv = 'Nelze nahrt rozen iconv ani recode potebn pro pevod znakovch sad. Upravte nastaven PHP tak, aby umoovalo pout tyto rozen nebo vypnte pevod znakovch sad v phpMyAdminu.'; +$strCantLoadRecodeIconv = 'Nelze nahrt rozen iconv ani recode potebn pro pevod znakovch sad. Upravte nastaven PHP tak, aby umoovalo pout tyto rozen nebo vypnte pevod znakovch sad v phpMyAdminovi.'; $strCantRenameIdxToPrimary = 'Index nemete pejmenovat na „PRIMARY“!'; $strCantUseRecodeIconv = 'Nelze pout funkce iconv ani libiconv ani recode_string, pestoe rozen jsou nahrna. Zkontrolujte nastaven PHP.'; $strCardinality = 'Mohutnost'; @@ -150,7 +150,7 @@ $strCompatibleHashing = 'Kompatibiln s MySQL 4.0'; $strCompleteInserts = 'pln inserty'; $strCompression = 'Komprese'; $strCompressionWillBeDetected = 'Komprimace importovanho souboru bude automaticky rozpoznna. Podporovny jsou: %s'; -$strConfigDefaultFileError = 'Nepodailo se nahrt vchoz konfiguraci ze soubouru: "%1$s"'; +$strConfigDefaultFileError = 'Nepodailo se nahrt vchoz konfiguraci ze souboru: "%1$s"'; $strConfigFileError = 'phpMyAdmin nemohl nast konfiguran soubor!<br />Tato chyba me nastat, pokud v nm PHP najde chybu nebo neme tento soubor najt.<br />Po kliknut na nsledujc odkaz se PHP pokus pmo interpretovat tento soubor a zobraz informace o chyb, ke kter dolo. Pak opravte tuto chybu (nejastji se jedn o chybjc stednk).<br />Pokud zskte przdnou strnku, vechno je v podku.'; $strConfigureTableCoord = 'Prosm, nastavte souadnice pro tabulku %s'; $strConnectionError = 'Nepodailo se pipojit: chybn nastaven.'; @@ -203,7 +203,7 @@ $strDatabasesStats = 'Statistiky databz'; $strData = 'Data'; $strDataDict = 'Datov slovnk'; $strDataOnly = ' Jen data'; -$strDataPages = 'Strnek obshahujcch data'; +$strDataPages = 'Strnek obsahujcch data'; $strDBComment = 'Koment k databzi: '; $strDBCopy = 'Zkoprovat databzi na'; $strDbIsEmpty = 'Databze se zd bt przdn!'; @@ -216,7 +216,7 @@ $strDefault = 'Vchoz'; $strDefragment = 'Defragmentovat tabulku'; $strDelayedInserts = 'Pouvat zpodn inserty'; $strDeleteAndFlushDescr = 'Toto je nejist een, ale natn oprvnn me trvat dlouho.'; -$strDeleteAndFlush = 'Odstranit uivatele a znovunast oprvnn.'; +$strDeleteAndFlush = 'Odstranit uivatele a znovu nast oprvnn.'; $strDeleted = 'dek byl smazn'; $strDeletedRows = 'Smazan dky:'; $strDeleteNoUsersSelected = 'Muste vybrat uivatele, kter chcete odstranit!'; @@ -276,6 +276,7 @@ $strErrorSaveTable = 'Chyba pi ukldn souadnic pro Nvrhe.'; $strEscapeWildcards = 'Zstupn znaky _ a % by mly bt escapovny pomoc \, pokud je chcete pout jako znak'; $strEsperanto = 'Esperanto'; $strEstonian = 'Estontina'; +$strEvent = 'Udlost'; $strExcelEdition = 'Verze Excelu'; $strExecuteBookmarked = 'Spustit oblben dotaz'; $strExplain = 'Vysvtlit dotaz'; @@ -287,7 +288,7 @@ $strExtra = 'Extra'; $strFailedAttempts = 'Nepovedench pokus'; $strFieldHasBeenDropped = 'Sloupec %s byl odstrann'; -$strFieldInsertFromFileTempDirNotExists = 'Chyba pi pejmenovn nahrtho soubory, viz FAQ 1.11'; +$strFieldInsertFromFileTempDirNotExists = 'Chyba pi pejmenovn nahranho soubory, viz FAQ 1.11'; $strFieldsEmpty = ' Nebyl zadn poet sloupc! '; $strFieldsEnclosedBy = 'Nzvy sloupc uzaven'; $strFieldsEscapedBy = 'Nzvy sloupc escapovny'; @@ -305,7 +306,7 @@ $strFileNameTemplate = 'Vzor pro jmno souboru'; $strFiles = 'Soubory'; $strFileToImport = 'Soubor pro importovn'; $strFixed = 'pevn'; -$strFlushPrivilegesNote = 'Poznmka: phpMyAdmin zskv oprvnn pmo z tabulek MySQL. Obsah tchto tabulek se me liit od oprvnn, kter server prv pouv, pokud byly tyto tabulky upravovny. V tomto ppad je vhodn provst %sznovunaten oprvnn%s ped pokraovnm.'; +$strFlushPrivilegesNote = 'Poznmka: phpMyAdmin zskv oprvnn pmo z tabulek MySQL. Obsah tchto tabulek se me liit od oprvnn, kter server prv pouv, pokud byly tyto tabulky upravovny. V tomto ppad je vhodn provst %snov naten oprvnn%s ped pokraovnm.'; $strFlushQueryCache = 'Vyprzdnit vyrovnvac pam dotaz'; $strFlushTables = 'Zavt vechny tabulky'; $strFlushTable = 'Vyprzdnit vyrovnvac pam pro tabulku („FLUSH“)'; @@ -408,7 +409,7 @@ $strInvalidTableName = 'Chybn jmno tabulky'; $strJapanese = 'Japontina'; $strJoins = 'Pouit vbry'; $strJumpToDB = 'Pejt na databzi „%s“.'; -$strJustDeleteDescr = 'Odstrann uivatel stle budou mt pstup na server, dokud nebudou znovunatena oprvnn.'; +$strJustDeleteDescr = 'Odstrann uivatel stle budou mt pstup na server, dokud nebudou znovu natena oprvnn.'; $strJustDelete = 'Jen odstranit uivatele z tabulek s oprvnnmi.'; $strKeepPass = 'Nemnit heslo'; @@ -454,7 +455,7 @@ $strLongOperation = 'Tato operace me trvat velmi dlouho. Chcete je pesto prov $strMaxConnects = 'Maximum souasnch pipojen'; $strMaximalQueryLength = 'Maximln velikost vytvoenho dotazu'; $strMaximumSize = 'Maximln velikost: %s%s'; -$strMbExtensionMissing = 'Rozen mbstring pro PHP nebylo nalezeno a zd se, e povte vcebajtovou znakovou sadu. Bez rozen mbstring neum phpMyAdmin sprvn rozdlovat etzce a proto to me mt neekan nsledky.'; +$strMbExtensionMissing = 'Rozen mbstring pro PHP nebylo nalezeno a zd se, e povte vce bajtovou znakovou sadu. Bez rozen mbstring neum phpMyAdmin sprvn rozdlovat etzce a proto to me mt neekan nsledky.'; $strMbOverloadWarning = 'V nastaven PHP mte zapnuto mbstring.func_overload. Toto nastaven nen kompatibiln s phpMyAdminem a me zpsobit pokozen dat!'; $strMIME_available_mime = 'Dostupn MIME typy'; $strMIME_available_transform = 'Dostupn transformace'; @@ -483,7 +484,7 @@ $strMyISAMMaxSortFileSizeDesc = 'Maximln velikost doasnch soubor, kter sm $strMyISAMMaxSortFileSize = 'Maximln velikost doasnch soubor pro azen'; $strMyISAMRecoverOptions = 'Automatick reim obnovy'; $strMyISAMRecoverOptionsDesc = 'Reim automatick obnovy pokozench MyISAM tabulek. Nastavuje se parametrem --myisam-recover pi spoutn serveru.'; -$strMyISAMRepairThreadsDesc = 'Pokud je tato hodnota vt ne 1, indexy v MyISAM tabulkch jsou vytveny paralelen (kad index vlastnm threadem) pi obnov nebo azen.'; +$strMyISAMRepairThreadsDesc = 'Pokud je tato hodnota vt ne 1, indexy v MyISAM tabulkch jsou vytveny paraleln (kad index vlastnm threadem) pi obnov nebo azen.'; $strMyISAMRepairThreads = 'Thread pro opravovn'; $strMyISAMSortBufferSizeDesc = 'Pam, kter je alokovna pi azen MyISAM index bhem jejich vytven nebo opravovn.'; $strMyISAMSortBufferSize = 'Velikost pamti pro azen'; @@ -536,8 +537,8 @@ $strNumSearchResultsTotal = '<b>Celkem:</b> <i>%s</i> odpovdajc(ch) zznam() $strNumTables = 'Tabulek'; $strOK = 'OK'; -$strOpenDocumentSpreadsheet = 'Seit Open Document'; -$strOpenDocumentText = 'Text Open Document'; +$strOpenDocumentSpreadsheet = 'Seit OpenDocument'; +$strOpenDocumentText = 'Text OpenDocument'; $strOpenNewWindow = 'Otevt nov okno phpMyAdmina'; $strOperations = 'pravy'; $strOperator = 'Opertor'; @@ -568,7 +569,7 @@ $strPerMinute = 'za minutu'; $strPerSecond = 'za sekundu'; $strPersian = 'Pertina'; $strPhoneBook = 'adres'; -$strPHP40203 = 'Pouvte PHP 4.2.3, kter m zvanou chybu pi prci s vcebajtovmi znaky (mbstring), jedn se o chybu PHP slo 19404. Nedoporuujeme pouvat tuto verzi PHP s phpMyAdminem.'; +$strPHP40203 = 'Pouvte PHP 4.2.3, kter m zvanou chybu pi prci s vce bajtovmi znaky (mbstring), jedn se o chybu PHP slo 19404. Nedoporuujeme pouvat tuto verzi PHP s phpMyAdminem.'; $strPHPVersion = 'Verze PHP'; $strPhp = 'Vytvoit PHP kd'; $strPleaseSelectPrimaryOrUniqueKey = 'Zvolte, prosm, primrn nebo uniktn kl'; @@ -612,7 +613,7 @@ $strPrivDescMaxUserConnections = 'Omezuje poet souasnch pipojen uivatele.' $strPrivDescProcess3 = 'Umouje ukonit procesy jinm uivatelm.'; $strPrivDescProcess4 = 'Umouje vidt cel dotazy v seznamu proces.'; $strPrivDescReferences = 'Nem dn vliv v tto verzi MySQL.'; -$strPrivDescReload = 'Umouje znovunaten nastaven a vyprzdnn vyrovnvacch pamt MySQL serveru.'; +$strPrivDescReload = 'Umouje znovu nast nastaven a vyprzdnn vyrovnvacch pamt MySQL serveru.'; $strPrivDescReplClient = 'Umon uivateli zjistit, kde je hlavn / pomocn server.'; $strPrivDescReplSlave = 'Potebn pro replikaci pomocnch server.'; $strPrivDescSelect = 'Umouje vybrat data.'; @@ -623,7 +624,7 @@ $strPrivDescSuper = 'Umouje pipojen, i kdy je dosaen maximln poet pipo $strPrivDescUpdate = 'Umouje mnit data.'; $strPrivDescUsage = 'dn oprvnn.'; $strPrivileges = 'Oprvnn'; -$strPrivilegesReloaded = 'Oprvnn byla znovunatena spn.'; +$strPrivilegesReloaded = 'Oprvnn byla natena spn.'; $strProcedures = 'Procedury'; $strProcesses = 'Procesy'; $strProcesslist = 'Seznam proces'; @@ -655,8 +656,8 @@ $strRelationNotWorking = 'Nkter z rozench funkc phpMyAdmina nelze po $strRelationsForTable = 'RELACE PRO TABULKU'; $strRelations = 'Relace'; $strRelationView = 'Zobrazit relace'; -$strReloadingThePrivileges = 'Znovunatm oprvnn'; -$strReloadPrivileges = 'Znovunast oprvnn'; +$strReloadingThePrivileges = 'Natm oprvnn'; +$strReloadPrivileges = 'Znovu nast oprvnn'; $strReload = 'Znovu nast'; $strRemoveSelectedUsers = 'Odstranit vybran uivatele'; $strRenameDatabaseOK = 'Databze %s byla pejmenovna na %s'; @@ -668,8 +669,9 @@ $strReplaceTable = 'Pepsat data tabulky souborem'; $strReplication = 'Replikace'; $strReset = 'Pvodn'; $strResourceLimits = 'Omezen zdroj'; +$strRestartInsertion = 'Zat znovu vkldn s %s dky'; $strReType = 'Heslo znovu'; -$strRevokeAndDeleteDescr = 'Uivatel budou mt oprvnn „USAGE“ (pouvn), dokud nebudou znovunatena oprvnn.'; +$strRevokeAndDeleteDescr = 'Uivatel budou mt oprvnn „USAGE“ (pouvn), dokud nebudou znovu natena oprvnn.'; $strRevokeAndDelete = 'Odebrat uivatelm veker oprvnn a pot je odstranit z tabulek.'; $strRevokeMessage = 'Byla zruena prva pro %s'; $strRevoke = 'Zruit'; @@ -760,7 +762,7 @@ $strShowStatusHandler_read_firstDescr = 'Poet peten prvn poloky indexu. P $strShowStatusHandler_read_keyDescr = 'Poet poadavk na peten dku vychzejc z indexu. Vysok hodnota znamen, e dotazy sprvn vyuvaj indexy.'; $strShowStatusHandler_read_nextDescr = 'Poet poadavk na peten dalho dku podle indexu. Tato hodnota se zvtuje pokud provdte dotaz na indexovan sloupec s omezenm rozsahu nebo prohledvte index.'; $strShowStatusHandler_read_prevDescr = 'Poet poadavk na peten pedchozho dku z indexu. Pouvan pro optimalizaci dotaz ORDER BY ... DESC.'; -$strShowStatusHandler_read_rndDescr = 'Poet poadavk na peten konkrtnho dku tabulky. Vysok hodnota znamen, e provdte mnoho dotaz, kter vyaduj azen vsledk. Pravdpodobn pouvte mnoho dotaz, kter vyaduj prohlen cel tabulky nebo pouvte spojen tabulek, kter nevyuvaj index.'; +$strShowStatusHandler_read_rndDescr = 'Poet poadavk na peten konkrtnho dku tabulky. Vysok hodnota znamen, e provdte mnoho dotaz, kter vyaduj azen vsledk. Pravdpodobn pouvte mnoho dotaz, kter vyaduj prohlen cel tabulky nebo pouvte spojen tabulek, kter nevyuvaj index.'; $strShowStatusHandler_read_rnd_nextDescr = 'Poet poadavk na peten dalho dku ze souboru. Tato hodnota je vysok pokud dotazy prochzej cel tabulky, pravdpodobn tedy nemaj vhodn indexy.'; $strShowStatusHandler_rollbackDescr = 'Poet internch pkaz ROLLBACK.'; $strShowStatusHandler_updateDescr = 'Poet poadavk na aktualizaci dku.'; @@ -783,8 +785,8 @@ $strShowStatusInnodb_data_pending_fsyncsDescr = 'Poet nevyzench synchronizac $strShowStatusInnodb_data_pending_readsDescr = 'Poet nevyzench ten.'; $strShowStatusInnodb_data_pending_writesDescr = 'Poet nevyzench zpis.'; $strShowStatusInnodb_data_readDescr = 'Velikost petench dat, v bajtech.'; -$strShowStatusInnodb_data_readsDescr = 'Poet provedench ten dat.'; -$strShowStatusInnodb_data_writesDescr = 'Poet provedench zpis dat.'; +$strShowStatusInnodb_data_readsDescr = 'Poet provedench ten dat.'; +$strShowStatusInnodb_data_writesDescr = 'Poet provedench zpis dat.'; $strShowStatusInnodb_data_writtenDescr = 'Velikost zapsanch dat, v bajtech.'; $strShowStatusInnodb_dblwr_pages_writtenDescr = 'Poet provedench dvojitch zapsn a poet strnek, kter byly takto zapsny.'; $strShowStatusInnodb_dblwr_writesDescr = 'Poet provedench dvojitch zapsn a poet strnek, kter byly takto zapsny.'; @@ -804,18 +806,18 @@ $strShowStatusInnodb_row_lock_time_avgDescr = 'Prmrn as potebn pro zskn $strShowStatusInnodb_row_lock_timeDescr = 'Celkov as strven eknm na zmek dku, v milisekundch.'; $strShowStatusInnodb_row_lock_time_maxDescr = 'Maximln as potebn pro zskn zmku dku, v milisekundch.'; $strShowStatusInnodb_row_lock_waitsDescr = 'Kolikrt se muselo ekat na zmek dku.'; -$strShowStatusInnodb_rows_deletedDescr = 'Poet dk ostrannch z InnoDB tabulek.'; +$strShowStatusInnodb_rows_deletedDescr = 'Poet dk odstrannch z InnoDB tabulek.'; $strShowStatusInnodb_rows_insertedDescr = 'Poet dk vloench do InnoDB tabulek.'; $strShowStatusInnodb_rows_readDescr = 'Poet dk petench z InnoDB tabulek.'; $strShowStatusInnodb_rows_updatedDescr = 'Poet dk aktualizovanch v InnoDB tabulkch.'; $strShowStatusKey_blocks_not_flushedDescr = 'Poet blok ve vyrovnvac pamti kl, kter byly zmnny, ale nebyly zapsny na disk. Dve se tato hodnota jmenovala Not_flushed_key_blocks.'; -$strShowStatusKey_blocks_unusedDescr = 'Poet nepouitch blok ve vyrovnvac pamti kl. Pomoc tto hodoty poznte jak moc je vyrovnvac pam vyuit.'; +$strShowStatusKey_blocks_unusedDescr = 'Poet nepouitch blok ve vyrovnvac pamti kl. Pomoc tto hodnoty poznte jak moc je vyrovnvac pam vyuit.'; $strShowStatusKey_blocks_usedDescr = 'Poet pouitch blok ve vyrovnvac pamti kl. Tato hodnota uruje maximum blok, kter kdy byly obsazeny najednou.'; $strShowStatusKey_read_requestsDescr = 'Poet poadavk na peten kle z vyrovnvac pamti.'; $strShowStatusKey_readsDescr = 'Poet skutench ten bloku zkle z disku. Pokud je hodnota pli velk, pravdpodobn mte malou vyrovnvac pam (key_buffer_size). spnost vyrovnvac pamti mete spotat jako Key_reads/Key_read_requests.'; $strShowStatusKey_write_requestsDescr = 'Poet poadavk na zpis bloku kle na disk.'; $strShowStatusKey_writesDescr = 'Poet skutench zpis bloku kle na disk.'; -$strShowStatusLast_query_costDescr = 'Celkov cena poslednho kompilovanho dotazu spotan optimalizrem dotaz. Uiten pro porovnn rznch dotaz. Vchoz hodnota 0 znamen, e dn dotaz jet nebyl kompilovn.'; +$strShowStatusLast_query_costDescr = 'Celkov cena poslednho kompilovanho dotazu spotan optimaliztorem dotaz. Uiten pro porovnn rznch dotaz. Vchoz hodnota 0 znamen, e dn dotaz jet nebyl kompilovn.'; $strShowStatusNot_flushed_delayed_rowsDescr = 'Poet dk ekajcch na zapsn ve front INSERT DELAYED.'; $strShowStatusOpened_tablesDescr = 'Celkem otevench tabulek. Pokud je tato hodnota pli vysok, pravdpodobn mte malou vyrovnvac pam pro tabulky.'; $strShowStatusOpen_filesDescr = 'Poet otevench soubor.'; @@ -824,7 +826,7 @@ $strShowStatusOpen_tablesDescr = 'Poet aktuln otevench tabulek.'; $strShowStatusQcache_free_blocksDescr = 'Poet volnch blok pamti ve vyrovnvac pamti dotaz.'; $strShowStatusQcache_free_memoryDescr = 'Velikost voln pamti ve vyrovnvac pamti dotaz.'; $strShowStatusQcache_hitsDescr = 'Poet zsah vyrovnvac pamti dotaz.'; -$strShowStatusQcache_insertsDescr = 'Poet dotazch pidanch do vyrovnvac pamti dotaz.'; +$strShowStatusQcache_insertsDescr = 'Poet dotaz pidanch do vyrovnvac pamti dotaz.'; $strShowStatusQcache_lowmem_prunesDescr = 'Poet dotaz odstrannch z vyrovnvac pamti dotaz aby uvolnily msto pro nov. Tato hodnota me pomoci v nastaven velikosti vyrovnvac pamti. Vyrovnvac pam pouv strategii LRU (nejdle nepouit) pro vyazovn dotaz z vyrovnvac pamti.'; $strShowStatusQcache_not_cachedDescr = 'Poet necachovanch dotaz (necachovatelnch nebo necachovanch kvli nastaven query_cache_type).'; $strShowStatusQcache_queries_in_cacheDescr = 'Poet dotaz ve vyrovnvac pamti dotaz.'; @@ -834,19 +836,19 @@ $strShowStatusRpl_statusDescr = 'Stav failsafe replikace.'; $strShowStatusSelect_full_joinDescr = 'Poet spojen, kter nevyuvaly indexy. Pokud tato hodnota nen 0, mli byste zkontrolovat indexy tabulek.'; $strShowStatusSelect_full_range_joinDescr = 'Poet spojen, kter pouvaly intervalov vyhledvn na referenn tabulce.'; $strShowStatusSelect_range_checkDescr = 'Poet spojen bez kl, kter kontrolovaly pouit kl po kadm dku. Pokud tato hodnota nen 0, mli byste zkontrolovat indexy tabulek.'; -$strShowStatusSelect_rangeDescr = 'Poet spojen, kter pouivaly intervalov vyhledvn na prvn tabulce. Tato hodnota obvykle nen kritick i kdy je vysok.'; +$strShowStatusSelect_rangeDescr = 'Poet spojen, kter pouvaly intervalov vyhledvn na prvn tabulce. Tato hodnota obvykle nen kritick i kdy je vysok.'; $strShowStatusSelect_scanDescr = 'Poet spojen, kter provdly kompletn prochzen prvn tabulky.'; $strShowStatusSlave_open_temp_tablesDescr = 'Poet doasnch tabulek v souasn dob otevench podzenm serverem.'; -$strShowStatusSlave_retried_transactionsDescr = 'Celkov poek, kolikrt musel podzen server opakovat transakce.'; +$strShowStatusSlave_retried_transactionsDescr = 'Celkov poet, kolikrt musel podzen server opakovat transakce.'; $strShowStatusSlave_runningDescr = 'Tato poloka je zapnut, pokud server pracuje jako podzen.'; -$strShowStatusSlow_launch_threadsDescr = 'Poet vlken jejih vytvoen trvalo dle ne slow_launch_time sekund.'; +$strShowStatusSlow_launch_threadsDescr = 'Poet vlken jejich vytvoen trvalo dle ne slow_launch_time sekund.'; $strShowStatusSlow_queriesDescr = 'Poet dotaz, kter trvaly dle ne long_query_time sekund.'; $strShowStatusSort_merge_passesDescr = 'Poet prchod sluovn, kter musel provst adic algoritmus. Pi pli vysok hodnot zvate zven sort_buffer_size.'; $strShowStatusSort_rangeDescr = 'Poet azen, kter byly omezeny rozsahem.'; $strShowStatusSort_rowsDescr = 'Poet azench dek.'; $strShowStatusSort_scanDescr = 'Poet azen provedench prochzenm tabulky.'; -$strShowStatusTable_locks_immediateDescr = 'Poek okamitch zskn zmku tabulky.'; -$strShowStatusTable_locks_waitedDescr = 'Poet ekn na zskn zmku tabulky. Pokud je tato hodnota vysok a mte problmy s vkonem, mli byste optimalizovat dostazy a ppadn rozdlit tabulky nebo pout replikaci.'; +$strShowStatusTable_locks_immediateDescr = 'Poet okamitch zskn zmku tabulky.'; +$strShowStatusTable_locks_waitedDescr = 'Poet ekn na zskn zmku tabulky. Pokud je tato hodnota vysok a mte problmy s vkonem, mli byste optimalizovat dotazy a ppadn rozdlit tabulky nebo pout replikaci.'; $strShowStatusThreads_cachedDescr = 'Poet vlken ve vyrovnvac pamti. spnost vyrovnvac pamti me bt spotna jako Threads_created/Connections. Pokud je tato hodnota erven, mli byste zvit thread_cache_size.'; $strShowStatusThreads_connectedDescr = 'Poet aktuln otevench pipojen.'; $strShowStatusThreads_createdDescr = 'Poet vlken vytvoench pro obsluhu pipojen. Pokud je hodnota pli velk, mete zvtit parametr thread_cache_size. Na platformch, kter maj dobrou implementaci vlken vak toto nem pli velk vliv.'; @@ -863,7 +865,7 @@ $strSlovak = 'Sloventina'; $strSlovenian = 'Slovintina'; $strSmallBigAll = 'Ve mal/velk'; $strSnapToGrid = 'Zachytvat na mku'; -$strSocketProblem = '(nebo nen spvn nastaven lokln socket MySQL serveru)'; +$strSocketProblem = '(nebo nen sprvn nastaven lokln socket MySQL serveru)'; $strSortByKey = 'Setdit podle kle'; $strSorting = 'azen'; $strSort = 'adit'; @@ -934,7 +936,7 @@ $strThisHost = 'Tento pota'; $strThreads = 'Poet vlken'; $strThreadSuccessfullyKilled = 'Vlkno %s bylo spn zabito.'; $strTime = 'as'; -$strTimeoutInfo = 'Pedchoz mport vyerpal veker as, po dalm odesln bude import pokraovat od pozize %d.'; +$strTimeoutInfo = 'Pedchoz mport vyerpal veker as, po dalm odesln bude import pokraovat od pozice %d.'; $strTimeoutNothingParsed = 'Bohuel bhem poslednho pokusu nebyla dn data natena. Toto obvykle znamen, e phpMyAdmin nebude schopen nast tento soubor, pokud nezvte asov limity v PHP.'; $strTimeoutPassed = 'Limit pro bh importu vyprel, prosm odelete formul znovu se stejnm souborem a import bude pokraovat.'; $strToFromPage = 'do/ze strnky'; @@ -948,7 +950,7 @@ $strTraditionalSpanish = 'Tradin panltina'; $strTraffic = 'Provoz'; $strTransactionCoordinator = 'Koordintor transakc'; $strTransformation_application_octetstream__download = 'Zobraz odkaz na sthnut dat. Prvn parametr je jmno souboru, druh jmno sloupce v tabulce obsahujc jmno souboru. Pokud zadte druh parametr, prvn mus bt przdn.'; -$strTransformation_application_octetstream__hex = 'Zobraz data estnctkov. Nepovinn parameter uruje po kolika znacch m bt pidna mezera (vchoz hodnota je 2).'; +$strTransformation_application_octetstream__hex = 'Zobraz data estnctkov. Nepovinn parametr uruje po kolika znacch m bt pidna mezera (vchoz hodnota je 2).'; $strTransformation_image_jpeg__inline = 'Zobraz nhled obrzku s odkazem na obrzek; parametry ka a vka v bodech (pomr stran obrzku zstane zachovn)'; $strTransformation_image_jpeg__link = 'Zobraz odkaz na obrzek (napklad sthnut pole blob).'; $strTransformation_image_png__inline = 'Viz image/jpeg: inline'; @@ -959,6 +961,7 @@ $strTransformation_text_plain__imagelink = 'Zobraz obrzek a odkaz z pole $strTransformation_text_plain__link = 'Zobraz odkaz z pole obsahujcho odkaz. Prvn parametr je prefix URL (napklad „http://mojedomena.cz/“), druh text odkazu.'; $strTransformation_text_plain__sql = 'Zobraz text jako SQL dotaz se zvrazovnm syntaxe.'; $strTransformation_text_plain__substr = 'Zobraz jen st textu. Prvn parametr je posun od zatku (vchoz je 0) a druh uruje dlku textu, kter se m zobrazit, pokud nen uveden, bude zobrazen zbytek textu. Tet parametr uruje, jak text m bt pidn za zkrcen text (vchoz je ...).'; +$strTriggers = 'Spout'; $strTruncateQueries = 'Zobrazit zkrcen dotazy'; $strTurkish = 'Turecky'; $strType = 'Typ'; diff --git a/lang/danish-iso-8859-1.inc.php b/lang/danish-iso-8859-1.inc.php index a2a0752bb8..799d38f7b3 100644 --- a/lang/danish-iso-8859-1.inc.php +++ b/lang/danish-iso-8859-1.inc.php @@ -1031,4 +1031,7 @@ $strYes = 'Ja'; $strZeroRemovesTheLimit = 'Bemrk: Indstilling af disse vrdier til 0 (nul) fjerner begrnsningen.'; $strZip = '"zippet"'; +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/danish-utf-8.inc.php b/lang/danish-utf-8.inc.php index faaa37b0af..a9b2d5f8e5 100644 --- a/lang/danish-utf-8.inc.php +++ b/lang/danish-utf-8.inc.php @@ -1032,4 +1032,7 @@ $strYes = 'Ja'; $strZeroRemovesTheLimit = 'Bemærk: Indstilling af disse værdier til 0 (nul) fjerner begrænsningen.'; $strZip = '"zippet"'; +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/dutch-iso-8859-1.inc.php b/lang/dutch-iso-8859-1.inc.php index a4cf2aba99..6f6f4cad86 100644 --- a/lang/dutch-iso-8859-1.inc.php +++ b/lang/dutch-iso-8859-1.inc.php @@ -91,7 +91,7 @@ $strBzip = '"ge-bzipt"'; $strCalendar = 'Kalender'; $strCannotLogin = 'Kan niet inloggen op de MySQL server'; -$strCantLoad = 'Kan de %s extentie niet laden,<br />Controleer de PHP Configuratie'; +$strCantLoad = 'Kan de [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a]-extensie niet laden. Controleer de PHP configuratie.'; $strCantLoadRecodeIconv = 'Kan iconv of recode extensies niet laden die nodig zijn voor de Karakterset conversie, configureer php om deze extensies toe te laten of schakel Karakterset conversie uit in phpMyAdmin'; $strCantRenameIdxToPrimary = 'Kan index niet naar PRIMARY hernoemen'; $strCantUseRecodeIconv = 'Kan iconv, libiconv en recode_string functies niet gebruiken zolang de extensies geladen moeten worden. Controleer de php configuratie.'; @@ -1053,4 +1053,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/dutch-iso-8859-15.inc.php b/lang/dutch-iso-8859-15.inc.php index 49e165eb53..47219d6f57 100644 --- a/lang/dutch-iso-8859-15.inc.php +++ b/lang/dutch-iso-8859-15.inc.php @@ -91,7 +91,7 @@ $strBzip = '"ge-bzipt"'; $strCalendar = 'Kalender'; $strCannotLogin = 'Kan niet inloggen op de MySQL server'; -$strCantLoad = 'Kan de %s extentie niet laden,<br />Controleer de PHP Configuratie'; +$strCantLoad = 'Kan de [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a]-extensie niet laden. Controleer de PHP configuratie.'; $strCantLoadRecodeIconv = 'Kan iconv of recode extensies niet laden die nodig zijn voor de Karakterset conversie, configureer php om deze extensies toe te laten of schakel Karakterset conversie uit in phpMyAdmin'; $strCantRenameIdxToPrimary = 'Kan index niet naar PRIMARY hernoemen'; $strCantUseRecodeIconv = 'Kan iconv, libiconv en recode_string functies niet gebruiken zolang de extensies geladen moeten worden. Controleer de php configuratie.'; @@ -1053,4 +1053,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/dutch-utf-8.inc.php b/lang/dutch-utf-8.inc.php index 79f081fb77..31f5466d66 100644 --- a/lang/dutch-utf-8.inc.php +++ b/lang/dutch-utf-8.inc.php @@ -92,7 +92,7 @@ $strBzip = '"ge-bzipt"'; $strCalendar = 'Kalender'; $strCannotLogin = 'Kan niet inloggen op de MySQL server'; -$strCantLoad = 'Kan de %s extentie niet laden,<br />Controleer de PHP Configuratie'; +$strCantLoad = 'Kan de [a@http://php.net/%1$s@Documentation][em]%1$s[/em][/a]-extensie niet laden. Controleer de PHP configuratie.'; $strCantLoadRecodeIconv = 'Kan iconv of recode extensies niet laden die nodig zijn voor de Karakterset conversie, configureer php om deze extensies toe te laten of schakel Karakterset conversie uit in phpMyAdmin'; $strCantRenameIdxToPrimary = 'Kan index niet naar PRIMARY hernoemen'; $strCantUseRecodeIconv = 'Kan iconv, libiconv en recode_string functies niet gebruiken zolang de extensies geladen moeten worden. Controleer de php configuratie.'; @@ -1054,4 +1054,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/english-iso-8859-1.inc.php b/lang/english-iso-8859-1.inc.php index 9aa9b33849..5332011ba7 100644 --- a/lang/english-iso-8859-1.inc.php +++ b/lang/english-iso-8859-1.inc.php @@ -276,6 +276,7 @@ $strErrorSaveTable = 'Error saving coordinates for Designer.'; $strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; $strEsperanto = 'Esperanto'; $strEstonian = 'Estonian'; +$strEvent = 'Event'; $strExcelEdition = 'Excel edition'; $strExecuteBookmarked = 'Execute bookmarked query'; $strExplain = 'Explain SQL'; @@ -668,6 +669,7 @@ $strReplaceTable = 'Replace table data with file'; $strReplication = 'Replication'; $strReset = 'Reset'; $strResourceLimits = 'Resource limits'; +$strRestartInsertion = 'Restart insertion with %s rows'; $strReType = 'Re-type'; $strRevokeAndDeleteDescr = 'The users will still have the USAGE privilege until the privileges are reloaded.'; $strRevokeAndDelete = 'Revoke all active privileges from the users and delete them afterwards.'; @@ -959,6 +961,7 @@ $strTransformation_text_plain__imagelink = 'Displays an image and a link; the fi $strTransformation_text_plain__link = 'Displays a link; the field contains the filename. The first option is a URL prefix like "http://www.example.com/". The second option is a title for the link.'; $strTransformation_text_plain__sql = 'Formats text as SQL query with syntax highlighting.'; $strTransformation_text_plain__substr = 'Displays a part of a string. The first option is the number of characters to skip from the beginning of the string (Default 0). The second option is the number of characters to return (Default: until end of string). The third option is the string to append and/or prepend when truncation occurs (Default: "...").'; +$strTriggers = 'Triggers'; $strTruncateQueries = 'Truncate Shown Queries'; $strTurkish = 'Turkish'; $strType = 'Type'; diff --git a/lang/english-iso-8859-15.inc.php b/lang/english-iso-8859-15.inc.php index aaaf36476c..ab0b15a0a9 100644 --- a/lang/english-iso-8859-15.inc.php +++ b/lang/english-iso-8859-15.inc.php @@ -276,6 +276,7 @@ $strErrorSaveTable = 'Error saving coordinates for Designer.'; $strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; $strEsperanto = 'Esperanto'; $strEstonian = 'Estonian'; +$strEvent = 'Event'; $strExcelEdition = 'Excel edition'; $strExecuteBookmarked = 'Execute bookmarked query'; $strExplain = 'Explain SQL'; @@ -668,6 +669,7 @@ $strReplaceTable = 'Replace table data with file'; $strReplication = 'Replication'; $strReset = 'Reset'; $strResourceLimits = 'Resource limits'; +$strRestartInsertion = 'Restart insertion with %s rows'; $strReType = 'Re-type'; $strRevokeAndDeleteDescr = 'The users will still have the USAGE privilege until the privileges are reloaded.'; $strRevokeAndDelete = 'Revoke all active privileges from the users and delete them afterwards.'; @@ -959,6 +961,7 @@ $strTransformation_text_plain__imagelink = 'Displays an image and a link; the fi $strTransformation_text_plain__link = 'Displays a link; the field contains the filename. The first option is a URL prefix like "http://www.example.com/". The second option is a title for the link.'; $strTransformation_text_plain__sql = 'Formats text as SQL query with syntax highlighting.'; $strTransformation_text_plain__substr = 'Displays a part of a string. The first option is the number of characters to skip from the beginning of the string (Default 0). The second option is the number of characters to return (Default: until end of string). The third option is the string to append and/or prepend when truncation occurs (Default: "...").'; +$strTriggers = 'Triggers'; $strTruncateQueries = 'Truncate Shown Queries'; $strTurkish = 'Turkish'; $strType = 'Type'; diff --git a/lang/english-utf-8.inc.php b/lang/english-utf-8.inc.php index 255d660d44..904196d84b 100644 --- a/lang/english-utf-8.inc.php +++ b/lang/english-utf-8.inc.php @@ -277,6 +277,7 @@ $strErrorSaveTable = 'Error saving coordinates for Designer.'; $strEscapeWildcards = 'Wildcards _ and % should be escaped with a \ to use them literally'; $strEsperanto = 'Esperanto'; $strEstonian = 'Estonian'; +$strEvent = 'Event'; $strExcelEdition = 'Excel edition'; $strExecuteBookmarked = 'Execute bookmarked query'; $strExplain = 'Explain SQL'; @@ -669,6 +670,7 @@ $strReplaceTable = 'Replace table data with file'; $strReplication = 'Replication'; $strReset = 'Reset'; $strResourceLimits = 'Resource limits'; +$strRestartInsertion = 'Restart insertion with %s rows'; $strReType = 'Re-type'; $strRevokeAndDeleteDescr = 'The users will still have the USAGE privilege until the privileges are reloaded.'; $strRevokeAndDelete = 'Revoke all active privileges from the users and delete them afterwards.'; @@ -960,6 +962,7 @@ $strTransformation_text_plain__imagelink = 'Displays an image and a link; the fi $strTransformation_text_plain__link = 'Displays a link; the field contains the filename. The first option is a URL prefix like "http://www.example.com/". The second option is a title for the link.'; $strTransformation_text_plain__sql = 'Formats text as SQL query with syntax highlighting.'; $strTransformation_text_plain__substr = 'Displays a part of a string. The first option is the number of characters to skip from the beginning of the string (Default 0). The second option is the number of characters to return (Default: until end of string). The third option is the string to append and/or prepend when truncation occurs (Default: "...").'; +$strTriggers = 'Triggers'; $strTruncateQueries = 'Truncate Shown Queries'; $strTurkish = 'Turkish'; $strType = 'Type'; diff --git a/lang/estonian-iso-8859-1.inc.php b/lang/estonian-iso-8859-1.inc.php index 854e0f9ee0..46cdfb943c 100644 --- a/lang/estonian-iso-8859-1.inc.php +++ b/lang/estonian-iso-8859-1.inc.php @@ -1037,4 +1037,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/estonian-utf-8.inc.php b/lang/estonian-utf-8.inc.php index 594ebb611d..227a201e46 100644 --- a/lang/estonian-utf-8.inc.php +++ b/lang/estonian-utf-8.inc.php @@ -1038,4 +1038,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/finnish-iso-8859-1.inc.php b/lang/finnish-iso-8859-1.inc.php index 88f7b9295a..d1b351ea10 100644 --- a/lang/finnish-iso-8859-1.inc.php +++ b/lang/finnish-iso-8859-1.inc.php @@ -1034,4 +1034,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/finnish-iso-8859-15.inc.php b/lang/finnish-iso-8859-15.inc.php index d0a90b36be..5ffd750ce7 100644 --- a/lang/finnish-iso-8859-15.inc.php +++ b/lang/finnish-iso-8859-15.inc.php @@ -1034,4 +1034,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/finnish-utf-8.inc.php b/lang/finnish-utf-8.inc.php index c89fefce56..04216211cb 100644 --- a/lang/finnish-utf-8.inc.php +++ b/lang/finnish-utf-8.inc.php @@ -1035,4 +1035,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/french-iso-8859-1.inc.php b/lang/french-iso-8859-1.inc.php index 61aa25d98a..f054751872 100644 --- a/lang/french-iso-8859-1.inc.php +++ b/lang/french-iso-8859-1.inc.php @@ -154,6 +154,7 @@ $strConnectionError = 'Connexion impossible: rglages incorrects.'; $strConnections = 'Connexions'; $strConstraintsForDumped = 'Contraintes pour les tables exportes'; $strConstraintsForTable = 'Contraintes pour la table'; +$strControluserFailed = 'La connexion au "controluser" tel que dfini dans votre configuration a chou.'; $strCookiesRequired = 'Vous devez accepter les cookies pour poursuivre.'; $strCopy = 'Copier'; $strCopyDatabaseOK = 'La base de donnes %s a t copie sur %s'; @@ -298,6 +299,7 @@ $strFileNameTemplateDescriptionServer = 'nom de serveur'; $strFileNameTemplateDescriptionTable = 'nom de table'; $strFileNameTemplate = 'Modle de nom de fichier'; $strFileNameTemplateRemember = 'se souvenir du modle'; +$strFiles = 'Fichiers'; $strFileToImport = 'Fichier importer'; $strFixed = 'fixe'; $strFlushPrivilegesNote = 'Note: phpMyAdmin obtient la liste des privilges directement partir des tables MySQL. Le contenu de ces tables peut tre diffrent des privilges effectifs, si des changements manuels ont t apports. Dans ce cas, vous devriez %srecharger les privilges%s avant de continuer.'; @@ -334,6 +336,7 @@ $strHasBeenCreated = 'a t cr(e).'; $strHaveToShow = 'Vous devez choisir au moins une colonne afficher'; $strHebrew = 'hbreu'; $strHelp = 'Aide'; +$strHexForBLOB = 'Utiliser l\'hexadecimal pour les BLOB'; $strHide = 'Cacher'; $strHideShowAll = 'Cacher/montrer tout'; $strHideShowNoRelation = 'Cacher/montrer les tables sans liens'; @@ -358,6 +361,7 @@ $strImportFormat = 'Format du fichier d\'importation'; $strImport = 'Importer'; $strImportSuccessfullyFinished = 'L\'importation s\'est termine avec succs, %d requtes excutes.'; $strIndexes = 'Index'; +$strIndexesSeemEqual = 'Les index suivants semblent quivalents, vous devriez en liminer un.'; $strIndexHasBeenDropped = 'L\'index %s a t effac'; $strIndex = 'Index'; $strIndexName = 'Nom de la clef :'; @@ -483,6 +487,7 @@ $strMyISAMSortBufferSize = 'Taille de la mmoire tampon'; $strMySQLCharset = 'Jeu de caractres pour MySQL'; $strMysqlClientVersion = 'Version du client MySQL'; $strMySQLConnectionCollation = 'Interclassement pour la connexion MySQL'; +$strMysqlLibDiffersServerVersion = 'La version de votre bibliothque MySQL (%s) diffre de la version de votre serveur MySQL (%s). Ceci peut occasionner un comportement imprvisible.'; $strMySQLSaid = 'MySQL a rpondu:'; $strMySQLShowProcess = 'Afficher les processus'; $strMySQLShowStatus = 'Afficher l\'tat du serveur'; @@ -666,6 +671,8 @@ $strRevokeAndDelete = 'Effacer tous les privilges de ces utilisateurs, puis les $strRevokeMessage = 'Vous avez rvoqu les privilges pour %s'; $strRevoke = 'Rvoquer'; $strRomanian = 'roumain'; +$strRoutineReturnType = 'Type retourn'; +$strRoutines = 'Procdures stockes'; $strRowLength = 'Longueur enr.'; $strRows = 'Enregistrements'; $strRowsFrom = 'enregistrement(s) partir de l\'enregistrement n'; @@ -1021,11 +1028,7 @@ $strYes = 'Oui'; $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlve la limite.'; $strZip = '"zipp"'; -$strFiles = 'Files'; //to translate -$strIndexesSeemEqual = 'The following indexes appear to be equal and one of them should be removed:'; //to translate -$strMysqlLibDiffersServerVersion = 'Your PHP MySQL library version %s differs from your MySQL server version %s. This may cause unpredictable behavior.'; //to translate -$strRoutines = 'Routines'; //to translate -$strRoutineReturnType = 'Return type'; //to translate -$strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate -$strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/french-iso-8859-15.inc.php b/lang/french-iso-8859-15.inc.php index 1ca6ec1900..e13bb7a3d3 100644 --- a/lang/french-iso-8859-15.inc.php +++ b/lang/french-iso-8859-15.inc.php @@ -154,6 +154,7 @@ $strConnectionError = 'Connexion impossible: rglages incorrects.'; $strConnections = 'Connexions'; $strConstraintsForDumped = 'Contraintes pour les tables exportes'; $strConstraintsForTable = 'Contraintes pour la table'; +$strControluserFailed = 'La connexion au "controluser" tel que dfini dans votre configuration a chou.'; $strCookiesRequired = 'Vous devez accepter les cookies pour poursuivre.'; $strCopy = 'Copier'; $strCopyDatabaseOK = 'La base de donnes %s a t copie sur %s'; @@ -298,6 +299,7 @@ $strFileNameTemplateDescriptionServer = 'nom de serveur'; $strFileNameTemplateDescriptionTable = 'nom de table'; $strFileNameTemplate = 'Modle de nom de fichier'; $strFileNameTemplateRemember = 'se souvenir du modle'; +$strFiles = 'Fichiers'; $strFileToImport = 'Fichier importer'; $strFixed = 'fixe'; $strFlushPrivilegesNote = 'Note: phpMyAdmin obtient la liste des privilges directement partir des tables MySQL. Le contenu de ces tables peut tre diffrent des privilges effectifs, si des changements manuels ont t apports. Dans ce cas, vous devriez %srecharger les privilges%s avant de continuer.'; @@ -334,6 +336,7 @@ $strHasBeenCreated = 'a t cr(e).'; $strHaveToShow = 'Vous devez choisir au moins une colonne afficher'; $strHebrew = 'hbreu'; $strHelp = 'Aide'; +$strHexForBLOB = 'Utiliser l\'hexadecimal pour les BLOB'; $strHide = 'Cacher'; $strHideShowAll = 'Cacher/montrer tout'; $strHideShowNoRelation = 'Cacher/montrer les tables sans liens'; @@ -358,6 +361,7 @@ $strImportFormat = 'Format du fichier d\'importation'; $strImport = 'Importer'; $strImportSuccessfullyFinished = 'L\'importation s\'est termine avec succs, %d requtes excutes.'; $strIndexes = 'Index'; +$strIndexesSeemEqual = 'Les index suivants semblent quivalents, vous devriez en liminer un.'; $strIndexHasBeenDropped = 'L\'index %s a t effac'; $strIndex = 'Index'; $strIndexName = 'Nom de la clef :'; @@ -483,6 +487,7 @@ $strMyISAMSortBufferSize = 'Taille de la mmoire tampon'; $strMySQLCharset = 'Jeu de caractres pour MySQL'; $strMysqlClientVersion = 'Version du client MySQL'; $strMySQLConnectionCollation = 'Interclassement pour la connexion MySQL'; +$strMysqlLibDiffersServerVersion = 'La version de votre bibliothque MySQL (%s) diffre de la version de votre serveur MySQL (%s). Ceci peut occasionner un comportement imprvisible.'; $strMySQLSaid = 'MySQL a rpondu:'; $strMySQLShowProcess = 'Afficher les processus'; $strMySQLShowStatus = 'Afficher l\'tat du serveur'; @@ -666,6 +671,8 @@ $strRevokeAndDelete = 'Effacer tous les privilges de ces utilisateurs, puis les $strRevokeMessage = 'Vous avez rvoqu les privilges pour %s'; $strRevoke = 'Rvoquer'; $strRomanian = 'roumain'; +$strRoutineReturnType = 'Type retourn'; +$strRoutines = 'Procdures stockes'; $strRowLength = 'Longueur enr.'; $strRows = 'Enregistrements'; $strRowsFrom = 'enregistrement(s) partir de l\'enregistrement n'; @@ -1021,11 +1028,7 @@ $strYes = 'Oui'; $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlve la limite.'; $strZip = '"zipp"'; -$strFiles = 'Files'; //to translate -$strIndexesSeemEqual = 'The following indexes appear to be equal and one of them should be removed:'; //to translate -$strMysqlLibDiffersServerVersion = 'Your PHP MySQL library version %s differs from your MySQL server version %s. This may cause unpredictable behavior.'; //to translate -$strRoutines = 'Routines'; //to translate -$strRoutineReturnType = 'Return type'; //to translate -$strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate -$strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/french-utf-8.inc.php b/lang/french-utf-8.inc.php index 303b3b4cc2..84fb3ffc1f 100644 --- a/lang/french-utf-8.inc.php +++ b/lang/french-utf-8.inc.php @@ -155,6 +155,7 @@ $strConnectionError = 'Connexion impossible: réglages incorrects.'; $strConnections = 'Connexions'; $strConstraintsForDumped = 'Contraintes pour les tables exportées'; $strConstraintsForTable = 'Contraintes pour la table'; +$strControluserFailed = 'La connexion au "controluser" tel que défini dans votre configuration a échoué.'; $strCookiesRequired = 'Vous devez accepter les cookies pour poursuivre.'; $strCopy = 'Copier'; $strCopyDatabaseOK = 'La base de données %s a été copiée sur %s'; @@ -299,6 +300,7 @@ $strFileNameTemplateDescriptionServer = 'nom de serveur'; $strFileNameTemplateDescriptionTable = 'nom de table'; $strFileNameTemplate = 'Modèle de nom de fichier'; $strFileNameTemplateRemember = 'se souvenir du modèle'; +$strFiles = 'Fichiers'; $strFileToImport = 'Fichier à importer'; $strFixed = 'fixe'; $strFlushPrivilegesNote = 'Note: phpMyAdmin obtient la liste des privilèges directement à partir des tables MySQL. Le contenu de ces tables peut être différent des privilèges effectifs, si des changements manuels ont été apportés. Dans ce cas, vous devriez %srecharger les privilèges%s avant de continuer.'; @@ -335,6 +337,7 @@ $strHasBeenCreated = 'a été créé(e).'; $strHaveToShow = 'Vous devez choisir au moins une colonne à afficher'; $strHebrew = 'hébreu'; $strHelp = 'Aide'; +$strHexForBLOB = 'Utiliser l\'hexadecimal pour les BLOB'; $strHide = 'Cacher'; $strHideShowAll = 'Cacher/montrer tout'; $strHideShowNoRelation = 'Cacher/montrer les tables sans liens'; @@ -359,6 +362,7 @@ $strImportFormat = 'Format du fichier d\'importation'; $strImport = 'Importer'; $strImportSuccessfullyFinished = 'L\'importation s\'est terminée avec succès, %d requêtes exécutées.'; $strIndexes = 'Index'; +$strIndexesSeemEqual = 'Les index suivants semblent équivalents, vous devriez en éliminer un.'; $strIndexHasBeenDropped = 'L\'index %s a été effacé'; $strIndex = 'Index'; $strIndexName = 'Nom de la clef :'; @@ -484,6 +488,7 @@ $strMyISAMSortBufferSize = 'Taille de la mémoire tampon'; $strMySQLCharset = 'Jeu de caractères pour MySQL'; $strMysqlClientVersion = 'Version du client MySQL'; $strMySQLConnectionCollation = 'Interclassement pour la connexion MySQL'; +$strMysqlLibDiffersServerVersion = 'La version de votre bibliothèque MySQL (%s) diffère de la version de votre serveur MySQL (%s). Ceci peut occasionner un comportement imprévisible.'; $strMySQLSaid = 'MySQL a répondu:'; $strMySQLShowProcess = 'Afficher les processus'; $strMySQLShowStatus = 'Afficher l\'état du serveur'; @@ -667,6 +672,8 @@ $strRevokeAndDelete = 'Effacer tous les privilèges de ces utilisateurs, puis le $strRevokeMessage = 'Vous avez révoqué les privilèges pour %s'; $strRevoke = 'Révoquer'; $strRomanian = 'roumain'; +$strRoutineReturnType = 'Type retourné'; +$strRoutines = 'Procédures stockées'; $strRowLength = 'Longueur enr.'; $strRows = 'Enregistrements'; $strRowsFrom = 'enregistrement(s) à partir de l\'enregistrement n°'; @@ -1022,11 +1029,7 @@ $strYes = 'Oui'; $strZeroRemovesTheLimit = 'Note: Une valeur de 0 (zero) enlève la limite.'; $strZip = '"zippé"'; -$strFiles = 'Files'; //to translate -$strIndexesSeemEqual = 'The following indexes appear to be equal and one of them should be removed:'; //to translate -$strMysqlLibDiffersServerVersion = 'Your PHP MySQL library version %s differs from your MySQL server version %s. This may cause unpredictable behavior.'; //to translate -$strRoutines = 'Routines'; //to translate -$strRoutineReturnType = 'Return type'; //to translate -$strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate -$strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/galician-iso-8859-1.inc.php b/lang/galician-iso-8859-1.inc.php index cc3d24801b..d202433879 100644 --- a/lang/galician-iso-8859-1.inc.php +++ b/lang/galician-iso-8859-1.inc.php @@ -1034,4 +1034,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/galician-utf-8.inc.php b/lang/galician-utf-8.inc.php index 55f2fa0444..8bedf221c2 100644 --- a/lang/galician-utf-8.inc.php +++ b/lang/galician-utf-8.inc.php @@ -1035,4 +1035,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/georgian-utf-8.inc.php b/lang/georgian-utf-8.inc.php index bcecd45bfe..68769fe777 100644 --- a/lang/georgian-utf-8.inc.php +++ b/lang/georgian-utf-8.inc.php @@ -1058,4 +1058,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/german-iso-8859-1.inc.php b/lang/german-iso-8859-1.inc.php index d4d1517625..d0ae708cf7 100644 --- a/lang/german-iso-8859-1.inc.php +++ b/lang/german-iso-8859-1.inc.php @@ -1034,4 +1034,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/german-iso-8859-15.inc.php b/lang/german-iso-8859-15.inc.php index 269d77be72..05c15921bd 100644 --- a/lang/german-iso-8859-15.inc.php +++ b/lang/german-iso-8859-15.inc.php @@ -1034,4 +1034,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/german-utf-8.inc.php b/lang/german-utf-8.inc.php index 23e8d12c5f..bf1ba4acf2 100644 --- a/lang/german-utf-8.inc.php +++ b/lang/german-utf-8.inc.php @@ -1035,4 +1035,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/greek-iso-8859-7.inc.php b/lang/greek-iso-8859-7.inc.php index b0a5275adc..b9fa017bbd 100644 --- a/lang/greek-iso-8859-7.inc.php +++ b/lang/greek-iso-8859-7.inc.php @@ -1054,4 +1054,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/greek-utf-8.inc.php b/lang/greek-utf-8.inc.php index 22c3ebedf3..6edcff2164 100644 --- a/lang/greek-utf-8.inc.php +++ b/lang/greek-utf-8.inc.php @@ -1055,4 +1055,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/hebrew-iso-8859-8-i.inc.php b/lang/hebrew-iso-8859-8-i.inc.php index 753690f1ba..596d0a02f7 100644 --- a/lang/hebrew-iso-8859-8-i.inc.php +++ b/lang/hebrew-iso-8859-8-i.inc.php @@ -1049,4 +1049,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/hebrew-utf-8.inc.php b/lang/hebrew-utf-8.inc.php index 1f536cb841..e7f7e385a2 100644 --- a/lang/hebrew-utf-8.inc.php +++ b/lang/hebrew-utf-8.inc.php @@ -1050,4 +1050,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/hindi-utf-8.inc.php b/lang/hindi-utf-8.inc.php index 01300acadc..662ba53ff3 100644 --- a/lang/hindi-utf-8.inc.php +++ b/lang/hindi-utf-8.inc.php @@ -1058,4 +1058,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/hungarian-iso-8859-2.inc.php b/lang/hungarian-iso-8859-2.inc.php index f69c0f75dc..85d053294e 100644 --- a/lang/hungarian-iso-8859-2.inc.php +++ b/lang/hungarian-iso-8859-2.inc.php @@ -1049,4 +1049,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/hungarian-utf-8.inc.php b/lang/hungarian-utf-8.inc.php index 9673354d00..5e484a840a 100644 --- a/lang/hungarian-utf-8.inc.php +++ b/lang/hungarian-utf-8.inc.php @@ -1050,4 +1050,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/indonesian-iso-8859-1.inc.php b/lang/indonesian-iso-8859-1.inc.php index 6aae42669c..a308519b39 100644 --- a/lang/indonesian-iso-8859-1.inc.php +++ b/lang/indonesian-iso-8859-1.inc.php @@ -1047,4 +1047,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/indonesian-utf-8.inc.php b/lang/indonesian-utf-8.inc.php index 873a433a4e..c9c1f6e3dc 100644 --- a/lang/indonesian-utf-8.inc.php +++ b/lang/indonesian-utf-8.inc.php @@ -1048,4 +1048,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/italian-iso-8859-1.inc.php b/lang/italian-iso-8859-1.inc.php index ae85622bcd..6dbafc6d8d 100644 --- a/lang/italian-iso-8859-1.inc.php +++ b/lang/italian-iso-8859-1.inc.php @@ -1031,4 +1031,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/italian-iso-8859-15.inc.php b/lang/italian-iso-8859-15.inc.php index d9352f2161..c055a6a4a8 100644 --- a/lang/italian-iso-8859-15.inc.php +++ b/lang/italian-iso-8859-15.inc.php @@ -1031,4 +1031,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/italian-utf-8.inc.php b/lang/italian-utf-8.inc.php index 6be403c1d9..195b0b5749 100644 --- a/lang/italian-utf-8.inc.php +++ b/lang/italian-utf-8.inc.php @@ -1032,4 +1032,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/japanese-euc.inc.php b/lang/japanese-euc.inc.php index 91ebb52c1f..f226121e8d 100644 --- a/lang/japanese-euc.inc.php +++ b/lang/japanese-euc.inc.php @@ -1036,4 +1036,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/japanese-sjis.inc.php b/lang/japanese-sjis.inc.php index 5c71aebb0a..86dc286d41 100644 --- a/lang/japanese-sjis.inc.php +++ b/lang/japanese-sjis.inc.php @@ -1036,4 +1036,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/japanese-utf-8.inc.php b/lang/japanese-utf-8.inc.php index d0c6406b43..da9811f911 100644 --- a/lang/japanese-utf-8.inc.php +++ b/lang/japanese-utf-8.inc.php @@ -1036,4 +1036,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/korean-euc-kr.inc.php b/lang/korean-euc-kr.inc.php index 2bc34bef83..cb3974fa58 100644 --- a/lang/korean-euc-kr.inc.php +++ b/lang/korean-euc-kr.inc.php @@ -1052,4 +1052,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/korean-utf-8.inc.php b/lang/korean-utf-8.inc.php index d75f255667..e8906ef6a3 100644 --- a/lang/korean-utf-8.inc.php +++ b/lang/korean-utf-8.inc.php @@ -1053,4 +1053,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/latvian-utf-8.inc.php b/lang/latvian-utf-8.inc.php index 5792852cf6..451f99e0aa 100644 --- a/lang/latvian-utf-8.inc.php +++ b/lang/latvian-utf-8.inc.php @@ -1055,4 +1055,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/latvian-windows-1257.inc.php b/lang/latvian-windows-1257.inc.php index 6db6db95f7..a8e08dcf03 100644 --- a/lang/latvian-windows-1257.inc.php +++ b/lang/latvian-windows-1257.inc.php @@ -1054,4 +1054,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/lithuanian-utf-8.inc.php b/lang/lithuanian-utf-8.inc.php index e2e0081957..1112494d82 100644 --- a/lang/lithuanian-utf-8.inc.php +++ b/lang/lithuanian-utf-8.inc.php @@ -1048,4 +1048,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/lithuanian-windows-1257.inc.php b/lang/lithuanian-windows-1257.inc.php index ac4fc4c391..80a82eac8c 100644 --- a/lang/lithuanian-windows-1257.inc.php +++ b/lang/lithuanian-windows-1257.inc.php @@ -1047,4 +1047,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/malay-iso-8859-1.inc.php b/lang/malay-iso-8859-1.inc.php index 27f1792ad0..cadf0a4846 100644 --- a/lang/malay-iso-8859-1.inc.php +++ b/lang/malay-iso-8859-1.inc.php @@ -1069,4 +1069,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/malay-utf-8.inc.php b/lang/malay-utf-8.inc.php index e8b9ec951d..dc76a619fc 100644 --- a/lang/malay-utf-8.inc.php +++ b/lang/malay-utf-8.inc.php @@ -1070,4 +1070,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/mongolian-utf-8.inc.php b/lang/mongolian-utf-8.inc.php index 4a418ede2f..b008028d8e 100644 --- a/lang/mongolian-utf-8.inc.php +++ b/lang/mongolian-utf-8.inc.php @@ -1053,4 +1053,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/norwegian-iso-8859-1.inc.php b/lang/norwegian-iso-8859-1.inc.php index 81cdf25674..4dbf73298d 100644 --- a/lang/norwegian-iso-8859-1.inc.php +++ b/lang/norwegian-iso-8859-1.inc.php @@ -1029,4 +1029,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/norwegian-utf-8.inc.php b/lang/norwegian-utf-8.inc.php index d25a455dff..24d0aa9f3c 100644 --- a/lang/norwegian-utf-8.inc.php +++ b/lang/norwegian-utf-8.inc.php @@ -1030,4 +1030,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/persian-utf-8.inc.php b/lang/persian-utf-8.inc.php index 584a7f4d9e..78ad03921c 100644 --- a/lang/persian-utf-8.inc.php +++ b/lang/persian-utf-8.inc.php @@ -1055,4 +1055,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/persian-windows-1256.inc.php b/lang/persian-windows-1256.inc.php index 2b9b57caec..bf8f1e041d 100644 --- a/lang/persian-windows-1256.inc.php +++ b/lang/persian-windows-1256.inc.php @@ -1054,4 +1054,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/polish-iso-8859-2.inc.php b/lang/polish-iso-8859-2.inc.php index d383a0d391..314da21c85 100644 --- a/lang/polish-iso-8859-2.inc.php +++ b/lang/polish-iso-8859-2.inc.php @@ -1025,4 +1025,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/polish-utf-8.inc.php b/lang/polish-utf-8.inc.php index 3926b7832d..b0d861482f 100644 --- a/lang/polish-utf-8.inc.php +++ b/lang/polish-utf-8.inc.php @@ -1026,4 +1026,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/polish-windows-1250.inc.php b/lang/polish-windows-1250.inc.php index 97ba831a2c..f588bb69fd 100644 --- a/lang/polish-windows-1250.inc.php +++ b/lang/polish-windows-1250.inc.php @@ -1025,4 +1025,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/portuguese-iso-8859-1.inc.php b/lang/portuguese-iso-8859-1.inc.php index 0155e4d93e..afada444a5 100644 --- a/lang/portuguese-iso-8859-1.inc.php +++ b/lang/portuguese-iso-8859-1.inc.php @@ -1058,4 +1058,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/portuguese-iso-8859-15.inc.php b/lang/portuguese-iso-8859-15.inc.php index de1af573c8..6941961439 100644 --- a/lang/portuguese-iso-8859-15.inc.php +++ b/lang/portuguese-iso-8859-15.inc.php @@ -1058,4 +1058,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/portuguese-utf-8.inc.php b/lang/portuguese-utf-8.inc.php index 7bd1676c25..cbf11375c1 100644 --- a/lang/portuguese-utf-8.inc.php +++ b/lang/portuguese-utf-8.inc.php @@ -1059,4 +1059,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/romanian-iso-8859-1.inc.php b/lang/romanian-iso-8859-1.inc.php index 8a08602283..e7dbda42fc 100644 --- a/lang/romanian-iso-8859-1.inc.php +++ b/lang/romanian-iso-8859-1.inc.php @@ -1050,4 +1050,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/romanian-utf-8.inc.php b/lang/romanian-utf-8.inc.php index d075624b88..0cabc0ced6 100644 --- a/lang/romanian-utf-8.inc.php +++ b/lang/romanian-utf-8.inc.php @@ -1051,4 +1051,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/russian-cp-866.inc.php b/lang/russian-cp-866.inc.php index 277f573011..c36e0e8f93 100644 --- a/lang/russian-cp-866.inc.php +++ b/lang/russian-cp-866.inc.php @@ -1052,4 +1052,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/russian-koi8-r.inc.php b/lang/russian-koi8-r.inc.php index 29ffd0b931..4ebde07db3 100644 --- a/lang/russian-koi8-r.inc.php +++ b/lang/russian-koi8-r.inc.php @@ -1052,4 +1052,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/russian-utf-8.inc.php b/lang/russian-utf-8.inc.php index bb92511420..be27b5d279 100644 --- a/lang/russian-utf-8.inc.php +++ b/lang/russian-utf-8.inc.php @@ -1053,4 +1053,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/russian-windows-1251.inc.php b/lang/russian-windows-1251.inc.php index cdb358687b..39ae3fb65d 100644 --- a/lang/russian-windows-1251.inc.php +++ b/lang/russian-windows-1251.inc.php @@ -1052,4 +1052,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/serbian_cyrillic-utf-8.inc.php b/lang/serbian_cyrillic-utf-8.inc.php index 8bc4cb2979..62fd81c9c7 100644 --- a/lang/serbian_cyrillic-utf-8.inc.php +++ b/lang/serbian_cyrillic-utf-8.inc.php @@ -1054,4 +1054,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/serbian_cyrillic-windows-1251.inc.php b/lang/serbian_cyrillic-windows-1251.inc.php index 3509c41774..7b26738668 100644 --- a/lang/serbian_cyrillic-windows-1251.inc.php +++ b/lang/serbian_cyrillic-windows-1251.inc.php @@ -1053,4 +1053,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/serbian_latin-utf-8.inc.php b/lang/serbian_latin-utf-8.inc.php index b4368ef4e1..863c1a1195 100644 --- a/lang/serbian_latin-utf-8.inc.php +++ b/lang/serbian_latin-utf-8.inc.php @@ -1054,4 +1054,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/serbian_latin-windows-1250.inc.php b/lang/serbian_latin-windows-1250.inc.php index ec88a36ea6..c2e690756d 100644 --- a/lang/serbian_latin-windows-1250.inc.php +++ b/lang/serbian_latin-windows-1250.inc.php @@ -1053,4 +1053,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/sinhala-utf-8.inc.php b/lang/sinhala-utf-8.inc.php index f114ca5e52..0c662ca4bf 100644 --- a/lang/sinhala-utf-8.inc.php +++ b/lang/sinhala-utf-8.inc.php @@ -1035,4 +1035,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/slovak-iso-8859-2.inc.php b/lang/slovak-iso-8859-2.inc.php index 8b404bdc81..4d15f75788 100644 --- a/lang/slovak-iso-8859-2.inc.php +++ b/lang/slovak-iso-8859-2.inc.php @@ -1032,4 +1032,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/slovak-utf-8.inc.php b/lang/slovak-utf-8.inc.php index 363fded7f0..d1668495b2 100644 --- a/lang/slovak-utf-8.inc.php +++ b/lang/slovak-utf-8.inc.php @@ -1033,4 +1033,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/slovak-windows-1250.inc.php b/lang/slovak-windows-1250.inc.php index 98a6f9db1f..c3fb4b0b69 100644 --- a/lang/slovak-windows-1250.inc.php +++ b/lang/slovak-windows-1250.inc.php @@ -1032,4 +1032,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/slovenian-iso-8859-2.inc.php b/lang/slovenian-iso-8859-2.inc.php index 4a3b7a3860..27712a2fd0 100644 --- a/lang/slovenian-iso-8859-2.inc.php +++ b/lang/slovenian-iso-8859-2.inc.php @@ -1051,4 +1051,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/slovenian-utf-8.inc.php b/lang/slovenian-utf-8.inc.php index 3f6a8e677c..2d2181cbfa 100644 --- a/lang/slovenian-utf-8.inc.php +++ b/lang/slovenian-utf-8.inc.php @@ -1052,4 +1052,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/slovenian-windows-1250.inc.php b/lang/slovenian-windows-1250.inc.php index eb498a36fd..4e92cd88c9 100644 --- a/lang/slovenian-windows-1250.inc.php +++ b/lang/slovenian-windows-1250.inc.php @@ -1051,4 +1051,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/spanish-iso-8859-1.inc.php b/lang/spanish-iso-8859-1.inc.php index 21f8ce3fca..0a32003cca 100644 --- a/lang/spanish-iso-8859-1.inc.php +++ b/lang/spanish-iso-8859-1.inc.php @@ -1027,4 +1027,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/spanish-iso-8859-15.inc.php b/lang/spanish-iso-8859-15.inc.php index 450c4d5c64..3354def066 100644 --- a/lang/spanish-iso-8859-15.inc.php +++ b/lang/spanish-iso-8859-15.inc.php @@ -1027,4 +1027,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/spanish-utf-8.inc.php b/lang/spanish-utf-8.inc.php index 6db58a6fb7..a54229a976 100644 --- a/lang/spanish-utf-8.inc.php +++ b/lang/spanish-utf-8.inc.php @@ -1028,4 +1028,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/swedish-iso-8859-1.inc.php b/lang/swedish-iso-8859-1.inc.php index 73f78b3dc8..49ef39666a 100644 --- a/lang/swedish-iso-8859-1.inc.php +++ b/lang/swedish-iso-8859-1.inc.php @@ -1037,4 +1037,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 7a0a577e15..232e42408c 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1038,4 +1038,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/tatarish-iso-8859-9.inc.php b/lang/tatarish-iso-8859-9.inc.php index 8d3059334e..e2b2ce27df 100644 --- a/lang/tatarish-iso-8859-9.inc.php +++ b/lang/tatarish-iso-8859-9.inc.php @@ -1043,4 +1043,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/tatarish-utf-8.inc.php b/lang/tatarish-utf-8.inc.php index 5b28e6babb..87cd5bc8a7 100644 --- a/lang/tatarish-utf-8.inc.php +++ b/lang/tatarish-utf-8.inc.php @@ -1044,4 +1044,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/thai-tis-620.inc.php b/lang/thai-tis-620.inc.php index 653c682abc..3125ef1837 100644 --- a/lang/thai-tis-620.inc.php +++ b/lang/thai-tis-620.inc.php @@ -1053,4 +1053,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/thai-utf-8.inc.php b/lang/thai-utf-8.inc.php index 60d93d410a..83bedcece1 100644 --- a/lang/thai-utf-8.inc.php +++ b/lang/thai-utf-8.inc.php @@ -1054,4 +1054,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/turkish-iso-8859-9.inc.php b/lang/turkish-iso-8859-9.inc.php index 7b04e4bbb2..998b08f0f5 100644 --- a/lang/turkish-iso-8859-9.inc.php +++ b/lang/turkish-iso-8859-9.inc.php @@ -1037,4 +1037,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/turkish-utf-8.inc.php b/lang/turkish-utf-8.inc.php index 5dd31af27e..559c92f515 100644 --- a/lang/turkish-utf-8.inc.php +++ b/lang/turkish-utf-8.inc.php @@ -1038,4 +1038,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/ukrainian-utf-8.inc.php b/lang/ukrainian-utf-8.inc.php index ea753bee99..b6a1d8dd0a 100644 --- a/lang/ukrainian-utf-8.inc.php +++ b/lang/ukrainian-utf-8.inc.php @@ -1052,4 +1052,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/lang/ukrainian-windows-1251.inc.php b/lang/ukrainian-windows-1251.inc.php index 4d1fdec73c..c07595a189 100644 --- a/lang/ukrainian-windows-1251.inc.php +++ b/lang/ukrainian-windows-1251.inc.php @@ -1051,4 +1051,7 @@ $strRoutines = 'Routines'; //to translate $strRoutineReturnType = 'Return type'; //to translate $strControluserFailed = 'Connection for controluser as defined in your configuration failed.'; //to translate $strHexForBLOB = 'Use hexadecimal for BLOB'; //to translate +$strRestartInsertion = 'Restart insertion with %s rows'; //to translate +$strTriggers = 'Triggers'; //to translate +$strEvent = 'Event'; //to translate ?> diff --git a/libraries/PMA_List_Database.class.php b/libraries/PMA_List_Database.class.php index 3d866bf06c..e416835686 100644 --- a/libraries/PMA_List_Database.class.php +++ b/libraries/PMA_List_Database.class.php @@ -366,7 +366,7 @@ require_once './libraries/PMA_List.class.php'; $return = '<ul id="databaseList" xml:lang="en" dir="ltr">' . "\n"; foreach ($this->getGroupedDetails() as $group => $dbs) { if (count($dbs) > 1) { - $return .= '<li><ul>' . "\n"; + $return .= '<li>' . $group . '<ul>' . "\n"; // wether display db_name cuted by the group part $cut = true; } else { @@ -378,7 +378,7 @@ require_once './libraries/PMA_List.class.php'; if ($db['name'] == $selected) { $return .= ' class="selected"'; } - $return .= '><a title="' . $db['comment'] . ' "href="index.php?' . PMA_generate_common_url($db['name']) . '" target="_parent">'; + $return .= '><a' . (! empty($db['comment']) ? ' title="' . $db['comment'] . '"' : '') . ' href="index.php?' . PMA_generate_common_url($db['name']) . '" target="_parent">'; $return .= ($cut ? $db['disp_name_cut'] : $db['disp_name']) .' (' . $db['num_tables'] . ')'; $return .= '</a></li>' . "\n"; diff --git a/libraries/StorageEngine.class.php b/libraries/StorageEngine.class.php new file mode 100644 index 0000000000..737423aa64 --- /dev/null +++ b/libraries/StorageEngine.class.php @@ -0,0 +1,501 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Library for extracting information about the available storage engines + * + * @version $Id$ + */ + +/** + * defines + */ +define('PMA_ENGINE_SUPPORT_NO', 0); +define('PMA_ENGINE_SUPPORT_DISABLED', 1); +define('PMA_ENGINE_SUPPORT_YES', 2); +define('PMA_ENGINE_SUPPORT_DEFAULT', 3); + +define('PMA_ENGINE_DETAILS_TYPE_PLAINTEXT', 0); +define('PMA_ENGINE_DETAILS_TYPE_SIZE', 1); +define('PMA_ENGINE_DETAILS_TYPE_NUMERIC', 2); //Has no effect yet... +define('PMA_ENGINE_DETAILS_TYPE_BOOLEAN', 3); // 'ON' or 'OFF' + +/** + * base Storage Engine Class + */ +class PMA_StorageEngine +{ + /** + * @var string engine name + */ + var $engine = 'dummy'; + + /** + * @var string engine title/description + */ + var $title = 'PMA Dummy Engine Class'; + + /** + * @var string engine lang description + */ + var $comment = 'If you read this text inside phpMyAdmin, something went wrong...'; + + /** + * @var integer engine supported by current server + */ + var $support = PMA_ENGINE_SUPPORT_NO; + + /** + * returns array of storage engines + * + * @static + * @staticvar array $storage_engines storage engines + * @access public + * @uses PMA_MYSQL_INT_VERSION + * @uses PMA_StorageEngine::getStorageEnginesBefore40102() + * @uses PMA_DBI_fetch_result() + * @return array of storage engines + */ + function getStorageEngines() + { + static $storage_engines = null; + + if (null !== $storage_engines) { + return $storage_engines; + } + + $storage_engines = array(); + + // SHOW STORAGE ENGINES comes with MySQL 4.1.2 + if (PMA_MYSQL_INT_VERSION < 40102) { + $storage_engines = PMA_StorageEngine::getStorageEnginesBefore40102(); + } else { + $storage_engines = PMA_DBI_fetch_result('SHOW STORAGE ENGINES', 'Engine'); + } + + return $storage_engines; + } + + /** + * returns HTML code for storage engine select box + * + * @author rabus + * @static + * @uses PMA_StorageEngine::getStorageEngines() + * @uses strtolower() + * @uses htmlspecialchars() + * @param string $name The name of the select form element + * @param string $id The ID of the form field + * @param string $selected The selected engine + * @param boolean $offerUnavailableEngines + * Should unavailable storage engines be offered? + * @return string html selectbox + */ + function getHtmlSelect($name = 'engine', $id = null, + $selected = null, $offerUnavailableEngines = false) + { + $selected = strtolower($selected); + $output = '<select name="' . $name . '"' + . (empty($id) ? '' : ' id="' . $id . '"') . '>' . "\n"; + + foreach (PMA_StorageEngine::getStorageEngines() as $key => $details) { + if (!$offerUnavailableEngines + && ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED')) { + continue; + } + $output .= ' <option value="' . htmlspecialchars($key). '"' + . (empty($details['Comment']) + ? '' : ' title="' . htmlspecialchars($details['Comment']) . '"') + . ($key == $selected || (empty($selected) && $details['Support'] == 'DEFAULT') + ? ' selected="selected"' : '') . '>' . "\n" + . ' ' . htmlspecialchars($details['Engine']) . "\n" + . ' </option>' . "\n"; + } + $output .= '</select>' . "\n"; + return $output; + } + + /** + * returns array of storage engines for MySQL < 4.1, hard coded + * Emulating SHOW STORAGE ENGINES... + * + * @static + * @access public + * @uses PMA_DBI_query() + * @uses PMA_DBI_fetch_row() + * @uses PMA_DBI_free_result() + * @uses substr() + * @return array of storage engines + */ + function getStorageEnginesBefore40102() + { + $storage_engines = array( + 'myisam' => array( + 'Engine' => 'MyISAM', + 'Support' => 'DEFAULT' + ), + 'merge' => array( + 'Engine' => 'MERGE', + 'Support' => 'YES' + ), + 'heap' => array( + 'Engine' => 'HEAP', + 'Support' => 'YES' + ), + 'memory' => array( + 'Engine' => 'MEMORY', + 'Support' => 'YES' + ) + ); + $known_engines = array( + 'archive' => 'ARCHIVE', + 'bdb' => 'BDB', + 'csv' => 'CSV', + 'innodb' => 'InnoDB', + 'isam' => 'ISAM', + 'gemini' => 'Gemini' + ); + $res = PMA_DBI_query('SHOW VARIABLES LIKE \'have\\_%\';'); + while ($row = PMA_DBI_fetch_row($res)) { + $current = substr($row[0], 5); + if (! empty($known_engines[$current])) { + $storage_engines[$current] = array( + 'Engine' => $known_engines[$current], + 'Support' => $row[1] + ); + } + } + PMA_DBI_free_result($res); + + return $storage_engines; + } + + + /** + * public static final PMA_StorageEngine getEngine() + * + * Loads the corresponding engine plugin, if available. + * + * @uses str_replace() + * @uses file_exists() + * @uses PMA_StorageEngine + * @param string $engine The engine ID + * @return object The engine plugin + */ + function getEngine($engine) + { + $engine = str_replace('/', '', str_replace('.', '', $engine)); + if (file_exists('./libraries/engines/' . $engine . '.lib.php') + && include_once './libraries/engines/' . $engine . '.lib.php') { + $class_name = 'PMA_StorageEngine_' . $engine; + $engine_object = new $class_name($engine); + } else { + $engine_object = new PMA_StorageEngine($engine); + } + return $engine_object; + } + + /** + * return true if given engine name is supported/valid, otherwise false + * + * @static + * @uses PMA_StorageEngine::getStorageEngines() + * @param string $engine name of engine + * @reutrn boolean whether $engine is valid or not + */ + function isValid($engine) + { + $storage_engines = PMA_StorageEngine::getStorageEngines(); + return isset($storage_engines[$engine]); + } + + /** + * returns as HTML table of the engine's server variables + * + * @uses PMA_ENGINE_DETAILS_TYPE_SIZE + * @uses PMA_ENGINE_DETAILS_TYPE_NUMERIC + * @uses PMA_StorageEngine::getVariablesStatus() + * @uses $GLOBALS['strNoDetailsForEngine'] + * @uses PMA_showHint() + * @uses PMA_formatByteDown() + * @uses PMA_formatNumber() + * @uses htmlspecialchars() + * @return string The table that was generated based on the retrieved information + */ + function getHtmlVariables() + { + $odd_row = false; + $ret = ''; + + foreach ($this->getVariablesStatus() as $details) { + $ret .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n" + . ' <td>' . "\n"; + if (!empty($details['desc'])) { + $ret .= ' ' . PMA_showHint($details['desc']) . "\n"; + } + $ret .= ' </td>' . "\n" + . ' <th>' . htmlspecialchars($details['title']) . '</th>' . "\n" + . ' <td class="value">'; + switch ($details['type']) { + case PMA_ENGINE_DETAILS_TYPE_SIZE: + $parsed_size = PMA_formatByteDown($details['value']); + $ret .= $parsed_size[0] . ' ' . $parsed_size[1]; + unset($parsed_size); + break; + case PMA_ENGINE_DETAILS_TYPE_NUMERIC: + $ret .= PMA_formatNumber($details['value']) . ' '; + break; + default: + $ret .= htmlspecialchars($details['value']) . ' '; + } + $ret .= '</td>' . "\n" + . '</tr>' . "\n"; + $odd_row = !$odd_row; + } + + if (! $ret) { + $ret = '<p>' . "\n" + . ' ' . $GLOBALS['strNoDetailsForEngine'] . "\n" + . '</p>' . "\n"; + } else { + $ret = '<table class="data">' . "\n" . $ret . '</table>' . "\n"; + } + + return $ret; + } + + /** + * returns array with detailed info about engine specific server variables + * + * @uses PMA_ENGINE_DETAILS_TYPE_PLAINTEXT + * @uses PMA_StorageEngine::getVariables() + * @uses PMA_StorageEngine::getVariablesLikePattern() + * @uses PMA_MYSQL_INT_VERSION + * @uses PMA_DBI_query() + * @uses PMA_DBI_fetch_assoc() + * @uses PMA_DBI_free_result() + * @return array with detailed info about specific engine server variables + */ + function getVariablesStatus() + { + $variables = $this->getVariables(); + $like = $this->getVariablesLikePattern(); + + if ($like) { + $like = " LIKE '" . $like . "' "; + } else { + $like = ''; + } + + if (PMA_MYSQL_INT_VERSION >= 40102) { + $global = ' GLOBAL '; + } else { + $global = ''; + } + + $mysql_vars = array(); + + $sql_query = 'SHOW ' . $global . ' VARIABLES ' . $like . ';'; + $res = PMA_DBI_query($sql_query); + while ($row = PMA_DBI_fetch_assoc($res)) { + if (isset($variables[$row['Variable_name']])) { + $mysql_vars[$row['Variable_name']] = $variables[$row['Variable_name']]; + } elseif (! $like + && strpos(strtolower($row['Variable_name']), strtolower($this->engine)) !== 0) { + continue; + } + $mysql_vars[$row['Variable_name']]['value'] = $row['Value']; + + if (empty($mysql_vars[$row['Variable_name']]['title'])) { + $mysql_vars[$row['Variable_name']]['title'] = $row['Variable_name']; + } + + if (! isset($mysql_vars[$row['Variable_name']]['type'])) { + $mysql_vars[$row['Variable_name']]['type'] = PMA_ENGINE_DETAILS_TYPE_PLAINTEXT; + } + } + PMA_DBI_free_result($res); + + return $mysql_vars; + } + + /** + * Constructor + * + * @uses PMA_StorageEngine::getStorageEngines() + * @uses PMA_ENGINE_SUPPORT_DEFAULT + * @uses PMA_ENGINE_SUPPORT_YES + * @uses PMA_ENGINE_SUPPORT_DISABLED + * @uses PMA_ENGINE_SUPPORT_NO + * @uses $this->engine + * @uses $this->title + * @uses $this->comment + * @uses $this->support + * @param string $engine The engine ID + */ + function __construct($engine) + { + $storage_engines = PMA_StorageEngine::getStorageEngines(); + if (!empty($storage_engines[$engine])) { + $this->engine = $engine; + $this->title = $storage_engines[$engine]['Engine']; + $this->comment = + (isset($storage_engines[$engine]['Comment']) + ? $storage_engines[$engine]['Comment'] + : ''); + switch ($storage_engines[$engine]['Support']) { + case 'DEFAULT': + $this->support = PMA_ENGINE_SUPPORT_DEFAULT; + break; + case 'YES': + $this->support = PMA_ENGINE_SUPPORT_YES; + break; + case 'DISABLED': + $this->support = PMA_ENGINE_SUPPORT_DISABLED; + break; + case 'NO': + default: + $this->support = PMA_ENGINE_SUPPORT_NO; + } + } + } + + /** + * old PHP 4 style constructor + * @deprecated + * @see PMA_StorageEngine::__construct() + * @uses PMA_StorageEngine::__construct() + * @param string $engine engine name + */ + function PMA_StorageEngine($engine) + { + $this->__construct($engine); + } + + /** + * public String getTitle() + * + * Reveals the engine's title + * @uses $this->title + * @return string The title + */ + function getTitle() + { + return $this->title; + } + + /** + * public String getComment() + * + * Fetches the server's comment about this engine + * @uses $this->comment + * @return string The comment + */ + function getComment() + { + return $this->comment; + } + + /** + * public String getSupportInformationMessage() + * + * @uses $GLOBALS['strDefaultEngine'] + * @uses $GLOBALS['strEngineAvailable'] + * @uses $GLOBALS['strEngineDisabled'] + * @uses $GLOBALS['strEngineUnsupported'] + * @uses $GLOBALS['strEngineUnsupported'] + * @uses PMA_ENGINE_SUPPORT_DEFAULT + * @uses PMA_ENGINE_SUPPORT_YES + * @uses PMA_ENGINE_SUPPORT_DISABLED + * @uses PMA_ENGINE_SUPPORT_NO + * @uses $this->support + * @uses $this->title + * @uses sprintf + * @return string The localized message. + */ + function getSupportInformationMessage() + { + switch ($this->support) { + case PMA_ENGINE_SUPPORT_DEFAULT: + $message = $GLOBALS['strDefaultEngine']; + break; + case PMA_ENGINE_SUPPORT_YES: + $message = $GLOBALS['strEngineAvailable']; + break; + case PMA_ENGINE_SUPPORT_DISABLED: + $message = $GLOBALS['strEngineDisabled']; + break; + case PMA_ENGINE_SUPPORT_NO: + default: + $message = $GLOBALS['strEngineUnsupported']; + } + return sprintf($message, htmlspecialchars($this->title)); + } + + /** + * public string[][] getVariables() + * + * Generates a list of MySQL variables that provide information about this + * engine. This function should be overridden when extending this class + * for a particular engine. + * + * @abstract + * @return Array The list of variables. + */ + function getVariables() + { + return array(); + } + + /** + * returns string with filename for the MySQL helppage + * about this storage engne + * + * @return string mysql helppage filename + */ + function getMysqlHelpPage() + { + return $this->engine . '-storage-engine'; + } + + /** + * public string getVariablesLikePattern() + * + * @abstract + * @return string SQL query LIKE pattern + */ + function getVariablesLikePattern() + { + return false; + } + + /** + * public String[] getInfoPages() + * + * Returns a list of available information pages with labels + * + * @abstract + * @return array The list + */ + function getInfoPages() + { + return array(); + } + + /** + * public String getPage() + * + * Generates the requested information page + * + * @abstract + * @param string $id The page ID + * + * @return string The page + * boolean or false on error. + */ + function getPage($id) + { + return false; + } +} + +?> diff --git a/libraries/Table.class.php b/libraries/Table.class.php index cff9c40d81..717da94d95 100644 --- a/libraries/Table.class.php +++ b/libraries/Table.class.php @@ -330,6 +330,8 @@ class PMA_Table { // a TIMESTAMP does not accept DEFAULT '0' // but DEFAULT 0 works $query .= ' DEFAULT ' . PMA_sqlAddslashes($default); + } elseif ($default && $type == 'BIT') { + $query .= ' DEFAULT b\'' . preg_replace('/[^01]/', '0', $default) . '\''; } else { $query .= ' DEFAULT \'' . PMA_sqlAddslashes($default) . '\''; } diff --git a/libraries/auth/cookie.auth.lib.php b/libraries/auth/cookie.auth.lib.php index d6b251a194..6fff95d3e0 100644 --- a/libraries/auth/cookie.auth.lib.php +++ b/libraries/auth/cookie.auth.lib.php @@ -58,10 +58,13 @@ if (function_exists('mcrypt_encrypt') || PMA_dl('mcrypt')) { * @uses $GLOBALS['strServerChoice'] * @uses $GLOBALS['strGo'] * @uses $GLOBALS['strCookiesRequired'] + * @uses $GLOBALS['strPmaDocumentation'] + * @uses $GLOBALS['pmaThemeImage'] * @uses $cfg['Servers'] * @uses $cfg['LoginCookieRecall'] * @uses $cfg['Lang'] * @uses $cfg['Server'] + * @uses $cfg['ReplaceHelpImg'] * @uses $cfg['blowfish_secret'] * @uses $cfg['AllowArbitraryServer'] * @uses $_COOKIE @@ -179,7 +182,19 @@ if (top != self) { <!-- Login form --> <form method="post" action="index.php" name="login_form"<?php echo $autocomplete; ?> target="_top" class="login"> <fieldset> - <legend><?php echo $GLOBALS['strLogin']; ?></legend> + <legend> +<?php + echo $GLOBALS['strLogin']; + echo '<a href="./Documentation.html" target="documentation" ' . + 'title="' . $GLOBALS['strPmaDocumentation'] . '">'; + if ($GLOBALS['cfg']['ReplaceHelpImg']) { + echo '<img class="icon" src="' . $GLOBALS['pmaThemeImage'] . 'b_help.png" width="11" height="11" alt="' . $GLOBALS['strPmaDocumentation'] . '" />'; + } else { + echo '(*)'; + } + echo '</a>'; +?> +</legend> <?php if ($GLOBALS['cfg']['AllowArbitraryServer']) { ?> <div class="item"> diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 2f76062fff..6d424d5345 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -205,7 +205,7 @@ if (isset($_POST['usesubform'])) { // end check if a subform is submitted // remove quotes added by php -if (get_magic_quotes_gpc()) { +if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { PMA_arrayWalkRecursive($_GET, 'stripslashes', true); PMA_arrayWalkRecursive($_POST, 'stripslashes', true); PMA_arrayWalkRecursive($_COOKIE, 'stripslashes', true); @@ -431,6 +431,12 @@ if (PMA_isValid($_REQUEST['sql_query'])) { $GLOBALS['sql_query'] = $_REQUEST['sql_query']; } +/** + * avoid problems in phpmyadmin.css.php in some cases + * @global string $js_frame + */ +$_REQUEST['js_frame'] = PMA_ifSetOr($_REQUEST['js_frame'], ''); + //$_REQUEST['set_theme'] // checked later in this file LABEL_theme_setup //$_REQUEST['server']; // checked later in this file //$_REQUEST['lang']; // checked by LABEL_loading_language_file diff --git a/libraries/common.lib.php b/libraries/common.lib.php index e8ee75bcb6..fb5296ec7b 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -22,6 +22,11 @@ function PMA_pow($base, $exp, $use_function = false) { static $pow_function = null; + + if ($exp < 0) { + return false; + } + if (null == $pow_function) { if (function_exists('bcpow')) { // BCMath Arbitrary Precision Mathematics Function @@ -49,9 +54,6 @@ function PMA_pow($base, $exp, $use_function = false) case 'pow' : $base = (float) $base; $exp = (int) $exp; - if ($exp < 0) { - return false; - } $pow = pow($base, $exp); break; default: diff --git a/libraries/config.default.php b/libraries/config.default.php index ec1f2202b4..ef6501b429 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2209,6 +2209,7 @@ $cfg['ColumnTypes'] = array( 'LONGTEXT', 'ENUM', 'SET', + 'BIT', 'BOOL' ); diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index bc44d7599b..b20e6aa6f9 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -1164,6 +1164,30 @@ function PMA_DBI_getCompatibilities() return $compats; } +/** + * returns warnings for last query + * + * @uses $GLOBALS['userlink'] + * @uses PMA_DBI_fetch_result() + * @param resource mysql link $link mysql link resource + * @return array warnings + */ +function PMA_DBI_get_warnings($link = null) +{ + if (PMA_MYSQL_INT_VERSION < 40100) { + return array(); + } + + if (empty($link)) { + if (isset($GLOBALS['userlink'])) { + $link = $GLOBALS['userlink']; + } else { + return array(); + } + } + + return PMA_DBI_fetch_result('SHOW WARNINGS', null, null, $link); +} /** * returns true (int > 0) if current user is superuser @@ -1216,4 +1240,40 @@ function PMA_DBI_get_procedure_or_function_def($db, $which, $proc_or_function_na $query = 'SHOW CREATE ' . $which . ' ' . PMA_backquote($db) . '.' . PMA_backquote($proc_or_function_name); return(PMA_DBI_fetch_value($query, 0, $returned_field[$which])); } + +/** + * returns details about the TRIGGERs of a specific table + * + * @uses PMA_DBI_fetch_result() + * @param string $db db name + * @param string $table table name + * + * @return array information about triggers (may be empty) + */ +function PMA_DBI_get_triggers($db, $table) { + + $result = array(); + + // available in INFORMATION_SCHEMA since MySQL 5.0.10 + if (PMA_MYSQL_INT_VERSION >= 50010) { + $triggers = PMA_DBI_fetch_result("SELECT TRIGGER_SCHEMA, TRIGGER_NAME, EVENT_MANIPULATION, ACTION_TIMING, ACTION_STATEMENT, EVENT_OBJECT_SCHEMA, EVENT_OBJECT_TABLE FROM information_schema.TRIGGERS WHERE EVENT_OBJECT_SCHEMA= '" . PMA_sqlAddslashes($db,true) . "' and EVENT_OBJECT_TABLE = '" . PMA_sqlAddslashes($table, true) . "';"); + + if ($triggers) { + $delimiter = '//'; + foreach ($triggers as $trigger) { + $one_result = array(); + $one_result['name'] = $trigger['TRIGGER_NAME']; + $one_result['action_timing'] = $trigger['ACTION_TIMING']; + $one_result['event_manipulation'] = $trigger['EVENT_MANIPULATION']; + + $one_result['full_trigger_name'] = PMA_backquote($trigger['TRIGGER_SCHEMA']) . '.' . PMA_backquote($trigger['TRIGGER_NAME']); + $one_result['drop'] = 'DROP TRIGGER ' . $one_result['full_trigger_name']; + $one_result['create'] = 'CREATE TRIGGER ' . $one_result['full_trigger_name'] . ' ' . $trigger['ACTION_TIMING']. ' ' . $trigger['EVENT_MANIPULATION'] . ' ON ' . PMA_backquote($trigger['EVENT_OBJECT_SCHEMA']) . '.' . PMA_backquote($trigger['EVENT_OBJECT_TABLE']) . "\n" . ' FOR EACH ROW ' . $trigger['ACTION_STATEMENT'] . "\n" . $delimiter . "\n"; + + $result[] = $one_result; + } + } + } + return($result); +} ?> diff --git a/libraries/dbi/mysql.dbi.lib.php b/libraries/dbi/mysql.dbi.lib.php index 951daf05c9..7ccf1f9275 100644 --- a/libraries/dbi/mysql.dbi.lib.php +++ b/libraries/dbi/mysql.dbi.lib.php @@ -83,7 +83,9 @@ function PMA_DBI_connect($user, $password, $is_controluser = FALSE) { if (empty($link) && ! $is_controluser) { if ($is_controluser) { - define('PMA_DBI_CONNECT_FAILED_CONTROLUSER', true); + if (! defined('PMA_DBI_CONNECT_FAILED_CONTROLUSER')) { + define('PMA_DBI_CONNECT_FAILED_CONTROLUSER', true); + } return false; } PMA_auth_fails(); diff --git a/libraries/dbi/mysqli.dbi.lib.php b/libraries/dbi/mysqli.dbi.lib.php index c5b5354b27..a21d49606d 100644 --- a/libraries/dbi/mysqli.dbi.lib.php +++ b/libraries/dbi/mysqli.dbi.lib.php @@ -108,7 +108,9 @@ function PMA_DBI_connect($user, $password, $is_controluser = false) if ($return_value == false) { if ($is_controluser) { - define('PMA_DBI_CONNECT_FAILED_CONTROLUSER', true); + if (! defined('PMA_DBI_CONNECT_FAILED_CONTROLUSER')) { + define('PMA_DBI_CONNECT_FAILED_CONTROLUSER', true); + } return false; } PMA_auth_fails(); @@ -182,22 +184,7 @@ function PMA_DBI_try_query($query, $link = null, $options = 0) if (defined('PMA_MYSQL_INT_VERSION') && PMA_MYSQL_INT_VERSION < 40100) { $query = PMA_convert_charset($query); } - $result = mysqli_query($link, $query, $method); - - if (mysqli_warning_count($link)) { - /** - * @todo check $method ? - */ - $warning_result = mysqli_query($link, 'SHOW WARNINGS'); - if ($warning_result) { - $warning_row = mysqli_fetch_row($warning_result); - $GLOBALS['warning'] = sprintf("%s (%d): %s", $warning_row[0], $warning_row[1], $warning_row[2]); - } - } else { - unset($GLOBALS['warning']); - } - - return $result; + return mysqli_query($link, $query, $method); // From the PHP manual: // "note: returns true on success or false on failure. For SELECT, @@ -560,7 +547,7 @@ function PMA_DBI_get_fields_meta($result) $typeAr = array(); $typeAr[MYSQLI_TYPE_DECIMAL] = 'real'; $typeAr[MYSQLI_TYPE_NEWDECIMAL] = 'real'; - $typeAr[MYSQLI_TYPE_BIT] = 'bool'; + $typeAr[MYSQLI_TYPE_BIT] = 'int'; $typeAr[MYSQLI_TYPE_TINY] = 'int'; $typeAr[MYSQLI_TYPE_SHORT] = 'int'; $typeAr[MYSQLI_TYPE_LONG] = 'int'; diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index a5ceac1058..87bba7da90 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -564,7 +564,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ echo '<input type="hidden" name="disp_direction" value="' . $disp_direction . '" />' . "\n"; echo '<input type="hidden" name="repeat_cells" value="' . $repeat_cells . '" />' . "\n"; echo '<input type="hidden" name="dontlimitchars" value="' . $dontlimitchars . '" />' . "\n"; - echo $GLOBALS['strSortByKey'] . ': <select name="sql_query">' . "\n"; + echo $GLOBALS['strSortByKey'] . ': <select name="sql_query" onchange="this.form.submit();">' . "\n"; $used_index = false; $local_order = (isset($sort_expression) ? $sort_expression : ''); foreach ($indexes_data AS $key => $val) { @@ -585,7 +585,7 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $ echo '<option value="' . htmlspecialchars($unsorted_sql_query) . '"' . ($used_index ? '' : ' selected="selected"') . '>' . $GLOBALS['strNone'] . '</option>'; echo "\n"; echo '</select>' . "\n"; - echo '<input type="submit" value="' . $GLOBALS['strGo'] . '" />'; + echo '<noscript><input type="submit" value="' . $GLOBALS['strGo'] . '" /></noscript>'; echo "\n"; echo '</form>' . "\n"; } @@ -1382,7 +1382,14 @@ function PMA_displayTableBody(&$dt_result, &$is_display, $map, $analyzed_sql) { // loic1: displays special characters from binaries $field_flags = PMA_DBI_field_flags($dt_result, $i); - if (stristr($field_flags, 'BINARY')) { + if (isset($meta->_type) && $meta->_type === MYSQLI_TYPE_BIT) { + $db_value = $row[$i]; + $row[$i] = ''; + for ($j = 0; $j < ceil($meta->length / 8); $j++) { + $row[$i] .= sprintf('%08d', decbin(ord(substr($db_value, $j, 1)))); + } + $row[$i] = substr($row[$i], -$meta->length); + } elseif (stristr($field_flags, 'BINARY')) { $row[$i] = str_replace("\x00", '\0', $row[$i]); $row[$i] = str_replace("\x08", '\b', $row[$i]); $row[$i] = str_replace("\x0a", '\n', $row[$i]); @@ -2077,4 +2084,4 @@ function PMA_displayResultsOperations($the_disp_mode, $analyzed_sql) { echo '</fieldset><br />'; } } -?> +?>
\ No newline at end of file diff --git a/libraries/export/sql.php b/libraries/export/sql.php index ffb6692128..eed19dec72 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -680,6 +680,18 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE, $dump .= $GLOBALS['comment_marker'] . $GLOBALS['strTableStructure'] . ' ' . $formatted_table_name . $crlf . $GLOBALS['comment_marker'] . $crlf; $dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates) . ';' . $crlf; + $triggers = PMA_DBI_get_triggers($db, $table); + if ($triggers) { + $dump .= $crlf . $GLOBALS['comment_marker'] . $crlf . $GLOBALS['comment_marker'] . $GLOBALS['strTriggers'] . ' ' . $formatted_table_name . $crlf + . $GLOBALS['comment_marker'] . $crlf; + $delimiter = '//'; + foreach ($triggers as $trigger) { + $dump .= $trigger['drop'] . ';' . $crlf; + $dump .= 'DELIMITER ' . $delimiter . $crlf; + $dump .= $trigger['create']; + $dump .= 'DELIMITER ;' . $crlf; + } + } break; case 'create_view': $dump .= $GLOBALS['comment_marker'] . $GLOBALS['strStructureForView'] . ' ' . $formatted_table_name . $crlf diff --git a/libraries/header.inc.php b/libraries/header.inc.php index d4f534d1dd..53b4fdc10c 100644 --- a/libraries/header.inc.php +++ b/libraries/header.inc.php @@ -249,7 +249,7 @@ if (empty($GLOBALS['is_header_sent'])) { /** * Displays table comment */ - if (is_array($comment)) { + if (is_array($comment) && ! empty($comment)) { echo '<span class="table_comment"' .' id="span_table_comment">"' .htmlspecialchars(implode(' ', $comment)) diff --git a/libraries/import/docsql.php b/libraries/import/docsql.php index fd669980fc..66600534ac 100644 --- a/libraries/import/docsql.php +++ b/libraries/import/docsql.php @@ -6,6 +6,7 @@ * @version $Id$ */ +require_once './libraries/relation.lib.php'; $cfgRelation = PMA_getRelationsParam(); /** diff --git a/libraries/sanitizing.lib.php b/libraries/sanitizing.lib.php index 8e83f32cb3..388ca13975 100644 --- a/libraries/sanitizing.lib.php +++ b/libraries/sanitizing.lib.php @@ -9,7 +9,6 @@ * Sanitizes $message, taking into account our special codes * for formatting * - * @uses PMA_sanitizeUri() * @uses preg_replace() * @uses strtr() * @param string the message diff --git a/libraries/storage_engines.lib.php b/libraries/storage_engines.lib.php deleted file mode 100644 index 201960b52f..0000000000 --- a/libraries/storage_engines.lib.php +++ /dev/null @@ -1,342 +0,0 @@ -<?php -/* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * Library for extracting information about the available storage engines - * - * @version $Id$ - */ - -/** - * - */ -$GLOBALS['mysql_storage_engines'] = array(); - -if (PMA_MYSQL_INT_VERSION >= 40102) { - /** - * For MySQL >= 4.1.2, the job is easy... - */ - $res = PMA_DBI_query('SHOW STORAGE ENGINES'); - while ($row = PMA_DBI_fetch_assoc($res)) { - $GLOBALS['mysql_storage_engines'][strtolower($row['Engine'])] = $row; - } - PMA_DBI_free_result($res); - unset($res, $row); -} else { - /** - * Emulating SHOW STORAGE ENGINES... - */ - $GLOBALS['mysql_storage_engines'] = array( - 'myisam' => array( - 'Engine' => 'MyISAM', - 'Support' => 'DEFAULT' - ), - 'merge' => array( - 'Engine' => 'MERGE', - 'Support' => 'YES' - ), - 'heap' => array( - 'Engine' => 'HEAP', - 'Support' => 'YES' - ), - 'memory' => array( - 'Engine' => 'MEMORY', - 'Support' => 'YES' - ) - ); - $known_engines = array( - 'archive' => 'ARCHIVE', - 'bdb' => 'BDB', - 'csv' => 'CSV', - 'innodb' => 'InnoDB', - 'isam' => 'ISAM', - 'gemini' => 'Gemini' - ); - $res = PMA_DBI_query('SHOW VARIABLES LIKE \'have\\_%\';'); - while ($row = PMA_DBI_fetch_row($res)) { - $current = substr($row[0], 5); - if (!empty($known_engines[$current])) { - $GLOBALS['mysql_storage_engines'][$current] = array( - 'Engine' => $known_engines[$current], - 'Support' => $row[1] - ); - } - } - PMA_DBI_free_result($res); - unset($known_engines, $res, $row); -} - -/** - * Function for generating the storage engine selection - * - * @author rabus - * @uses $GLOBALS['mysql_storage_engines'] - * @param string $name The name of the select form element - * @param string $id The ID of the form field - * @param boolean $offerUnavailableEngines - * Should unavailable storage engines be offered? - * @param string $selected The selected engine - * @param int $indent The indentation level - * @return string html selectbox - */ -function PMA_generateEnginesDropdown($name = 'engine', $id = null, - $offerUnavailableEngines = false, $selected = null, $indent = 0) -{ - $selected = strtolower($selected); - $spaces = str_repeat(' ', $indent); - $output = $spaces . '<select name="' . $name . '"' - . (empty($id) ? '' : ' id="' . $id . '"') . '>' . "\n"; - - foreach ($GLOBALS['mysql_storage_engines'] as $key => $details) { - if (!$offerUnavailableEngines - && ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED')) { - continue; - } - $output .= $spaces . ' <option value="' . htmlspecialchars($key). '"' - . (empty($details['Comment']) - ? '' : ' title="' . htmlspecialchars($details['Comment']) . '"') - . ($key == $selected || (empty($selected) && $details['Support'] == 'DEFAULT') - ? ' selected="selected"' : '') . '>' . "\n" - . $spaces . ' ' . htmlspecialchars($details['Engine']) . "\n" - . $spaces . ' </option>' . "\n"; - } - $output .= $spaces . '</select>' . "\n"; - return $output; -} - -/** - * defines - */ -define('PMA_ENGINE_SUPPORT_NO', 0); -define('PMA_ENGINE_SUPPORT_DISABLED', 1); -define('PMA_ENGINE_SUPPORT_YES', 2); -define('PMA_ENGINE_SUPPORT_DEFAULT', 3); - -/** - * Abstract Storage Engine Class - */ -class PMA_StorageEngine -{ - /** - * @var string engine name - */ - var $engine = 'dummy'; - - /** - * @var string engine title/description - */ - var $title = 'PMA Dummy Engine Class'; - - /** - * @var string engine lang description - */ - var $comment = 'If you read this text inside phpMyAdmin, something went wrong...'; - - /** - * @var integer engine supported by current server - */ - var $support = PMA_ENGINE_SUPPORT_NO; - - /** - * public static final PMA_StorageEngine getEngine() - * - * Loads the corresponding engine plugin, if available. - * - * @uses str_replace() - * @uses file_exists() - * @uses PMA_StorageEngine - * @param string $engine The engine ID - * @return object The engine plugin - */ - function getEngine($engine) - { - $engine = str_replace('/', '', str_replace('.', '', $engine)); - if (file_exists('./libraries/engines/' . $engine . '.lib.php') - && include_once './libraries/engines/' . $engine . '.lib.php') { - $class_name = 'PMA_StorageEngine_' . $engine; - $engine_object = new $class_name($engine); - } else { - $engine_object = new PMA_StorageEngine($engine); - } - return $engine_object; - } - - /** - * Constructor - * - * @uses $GLOBALS['mysql_storage_engines'] - * @uses PMA_ENGINE_SUPPORT_DEFAULT - * @uses PMA_ENGINE_SUPPORT_YES - * @uses PMA_ENGINE_SUPPORT_DISABLED - * @uses PMA_ENGINE_SUPPORT_NO - * @uses $this->engine - * @uses $this->title - * @uses $this->comment - * @uses $this->support - * @param string $engine The engine ID - */ - function __construct($engine) - { - if (!empty($GLOBALS['mysql_storage_engines'][$engine])) { - $this->engine = $engine; - $this->title = $GLOBALS['mysql_storage_engines'][$engine]['Engine']; - $this->comment = - (isset($GLOBALS['mysql_storage_engines'][$engine]['Comment']) - ? $GLOBALS['mysql_storage_engines'][$engine]['Comment'] - : ''); - switch ($GLOBALS['mysql_storage_engines'][$engine]['Support']) { - case 'DEFAULT': - $this->support = PMA_ENGINE_SUPPORT_DEFAULT; - break; - case 'YES': - $this->support = PMA_ENGINE_SUPPORT_YES; - break; - case 'DISABLED': - $this->support = PMA_ENGINE_SUPPORT_DISABLED; - break; - case 'NO': - default: - $this->support = PMA_ENGINE_SUPPORT_NO; - } - } - } - - /** - * old PHP 4 style constructor - * @deprecated - * @see PMA_StorageEngine::__construct() - * @uses PMA_StorageEngine::__construct() - * @param string $engine engine name - */ - function PMA_StorageEngine($engine) - { - $this->__construct($engine); - } - - /** - * public String getTitle() - * - * Reveals the engine's title - * @uses $this->title - * @return string The title - */ - function getTitle() - { - return $this->title; - } - - /** - * public String getComment() - * - * Fetches the server's comment about this engine - * @uses $this->comment - * @return string The comment - */ - function getComment() - { - return $this->comment; - } - - /** - * public String getSupportInformationMessage() - * - * @uses $GLOBALS['strDefaultEngine'] - * @uses $GLOBALS['strEngineAvailable'] - * @uses $GLOBALS['strEngineDisabled'] - * @uses $GLOBALS['strEngineUnsupported'] - * @uses $GLOBALS['strEngineUnsupported'] - * @uses PMA_ENGINE_SUPPORT_DEFAULT - * @uses PMA_ENGINE_SUPPORT_YES - * @uses PMA_ENGINE_SUPPORT_DISABLED - * @uses PMA_ENGINE_SUPPORT_NO - * @uses $this->support - * @uses $this->title - * @uses sprintf - * @return string The localized message. - */ - function getSupportInformationMessage() - { - switch ($this->support) { - case PMA_ENGINE_SUPPORT_DEFAULT: - $message = $GLOBALS['strDefaultEngine']; - break; - case PMA_ENGINE_SUPPORT_YES: - $message = $GLOBALS['strEngineAvailable']; - break; - case PMA_ENGINE_SUPPORT_DISABLED: - $message = $GLOBALS['strEngineDisabled']; - break; - case PMA_ENGINE_SUPPORT_NO: - default: - $message = $GLOBALS['strEngineUnsupported']; - } - return sprintf($message, htmlspecialchars($this->title)); - } - - /** - * public string[][] getVariables() - * - * Generates a list of MySQL variables that provide information about this - * engine. This function should be overridden when extending this class - * for a particular engine. - * - * @abstract - * @return Array The list of variables. - */ - function getVariables() - { - return array(); - } - - /** - * returns string with filename for the MySQL helppage - * about this storage engne - * - * @return string mysql helppage filename - */ - function getMysqlHelpPage() - { - return $this->engine . '-storage-engine'; - } - - /** - * public string getVariablesLikePattern() - * - * @abstract - * @return string SQL query LIKE pattern - */ - function getVariablesLikePattern() - { - return false; - } - - /** - * public String[] getInfoPages() - * - * Returns a list of available information pages with labels - * - * @abstract - * @return array The list - */ - function getInfoPages() - { - return array(); - } - - /** - * public String getPage() - * - * Generates the requested information page - * - * @abstract - * @param string $id The page ID - * - * @return string The page - * boolean or false on error. - */ - function getPage($id) - { - return false; - } -} - -?> diff --git a/libraries/string.lib.php b/libraries/string.lib.php index 09a5d792c8..2f76bd3f70 100644 --- a/libraries/string.lib.php +++ b/libraries/string.lib.php @@ -13,6 +13,14 @@ * The SQL Parser code relies heavily on these functions. * * @version $Id$ + * @uses PMA_PHP_INT_VERSION + * @uses PMA_dl() + * @uses extension_loaded() + * @uses substr() + * @uses function_exists() + * @uses mb_internal_encoding() + * @uses defined() + * @todo a .lib filename should not have code in main(), split or rename file */ /* Try to load mbstring, unless we're using buggy php version */ @@ -22,8 +30,12 @@ if (PMA_PHP_INT_VERSION != 40203) { } } -/* windows-* and tis-620 are not supported and are not multibyte, - * others can be ignored as they're not multibyte */ +/** + * windows-* and tis-620 are not supported and are not multibyte, + * others can be ignored as they're not multibyte + * + * @global boolean $GLOBALS['using_mb_charset'] + */ $GLOBALS['using_mb_charset'] = substr($GLOBALS['charset'], 0, 8) != 'windows-' && substr($GLOBALS['charset'], 0, 9) != 'iso-8859-' && @@ -46,104 +58,71 @@ if ($GLOBALS['PMA_allow_mbstr']) { // This is for handling input better if (defined('PMA_MULTIBYTE_ENCODING') || $GLOBALS['PMA_allow_mbstr']) { $GLOBALS['PMA_strpos'] = 'mb_strpos'; - $GLOBALS['PMA_strrpos'] = 'mb_strrpos'; + require './libraries/string_mb.lib.php'; } else { $GLOBALS['PMA_strpos'] = 'strpos'; - $GLOBALS['PMA_strrpos'] = 'strrpos'; + require './libraries/string_native.lib.php'; } -/** - * Returns length of string depending on current charset. - * - * @param string string to count - * - * @return int string length - * - * @access public - * - * @author nijel - */ -function PMA_strlen($string) -{ - // windows-* charsets are not multibyte and not supported by mb_* - if (defined('PMA_MULTIBYTE_ENCODING') || $GLOBALS['PMA_allow_mbstr']) { - return mb_strlen($string); - } else { - return strlen($string); - } +if (!@extension_loaded('ctype')) { + PMA_dl('ctype'); } -/** - * Returns substring from string, works depending on current charset. - * - * @param string string to count - * @param int start of substring - * @param int length of substring - * - * @return int substring - * - * @access public - * - * @author nijel - */ -function PMA_substr($string, $start, $length = 2147483647) -{ - if (defined('PMA_MULTIBYTE_ENCODING') || $GLOBALS['PMA_allow_mbstr']) { - return mb_substr($string, $start, $length); - } else { - return substr($string, $start, $length); - } +if (@extension_loaded('ctype')) { + require './libraries/string_type_ctype.lib.php'; +} else { + require './libraries/string_type_native.lib.php'; } - /** * This checks if a string actually exists inside another string * We try to do it in a PHP3-portable way. * We don't care about the position it is in. * + * @uses PMA_STR_pos() * @param string string to search for * @param string string to search in - * * @return boolean whether the needle is in the haystack or not + * @todo rename PMA_STR_inStr() */ function PMA_STR_strInStr($needle, $haystack) { - // $GLOBALS['PMA_strpos']($haystack, $needle) !== FALSE - // return (is_integer($GLOBALS['PMA_strpos']($haystack, $needle))); - return $GLOBALS['PMA_strpos'](' ' . $haystack, $needle); + // PMA_STR_pos($haystack, $needle) !== false + // return (is_integer(PMA_STR_pos($haystack, $needle))); + return (bool) PMA_STR_pos(' ' . $haystack, $needle); } // end of the "PMA_STR_strInStr()" function - /** * Checks if a given character position in the string is escaped or not * + * @uses PMA_strlen() + * @uses PMA_substr() + * @uses max() + * @uses intval() * @param string string to check for * @param integer the character to check for * @param integer starting position in the string - * * @return boolean whether the character is escaped or not */ function PMA_STR_charIsEscaped($string, $pos, $start = 0) { + $pos = max(intval($pos), 0); + $start = max(intval($start), 0); $len = PMA_strlen($string); // Base case: // Check for string length or invalid input or special case of input // (pos == $start) - if (($pos == $start) || ($len <= $pos)) { - return FALSE; + if ($pos <= $start || $len <= max($pos, $start)) { + return false; } - $p = $pos - 1; - $escaped = FALSE; - while (($p >= $start) && (PMA_substr($string, $p, 1) == '\\')) { + $pos--; + $escaped = false; + while ($pos >= $start && PMA_substr($string, $pos, 1) == '\\') { $escaped = !$escaped; - $p--; + $pos--; } // end while - if ($pos < $start) { - // throw error about strings - } - return $escaped; } // end of the "PMA_STR_charIsEscaped()" function @@ -154,166 +133,24 @@ function PMA_STR_charIsEscaped($string, $pos, $start = 0) * @param integer number to check for * @param integer lower bound * @param integer upper bound - * * @return boolean whether the number is in the range or not */ function PMA_STR_numberInRangeInclusive($num, $lower, $upper) { - return (($num >= $lower) && ($num <= $upper)); + return ($num >= $lower && $num <= $upper); } // end of the "PMA_STR_numberInRangeInclusive()" function /** - * Checks if a character is a digit - * - * @param string character to check for - * - * @return boolean whether the character is a digit or not - * - * @see PMA_STR_numberInRangeInclusive() - */ -function PMA_STR_isDigit($c) -{ - $ord_zero = 48; //ord('0'); - $ord_nine = 57; //ord('9'); - $ord_c = ord($c); - - return PMA_STR_numberInRangeInclusive($ord_c, $ord_zero, $ord_nine); -} // end of the "PMA_STR_isDigit()" function - - -/** - * Checks if a character is an hexadecimal digit - * - * @param string character to check for - * - * @return boolean whether the character is an hexadecimal digit or not - * - * @see PMA_STR_numberInRangeInclusive() - */ -function PMA_STR_isHexDigit($c) -{ - $ord_Aupper = 65; //ord('A'); - $ord_Fupper = 70; //ord('F'); - $ord_Alower = 97; //ord('a'); - $ord_Flower = 102; //ord('f'); - $ord_zero = 48; //ord('0'); - $ord_nine = 57; //ord('9'); - $ord_c = ord($c); - - return (PMA_STR_numberInRangeInclusive($ord_c, $ord_zero, $ord_nine) - || PMA_STR_numberInRangeInclusive($ord_c, $ord_Aupper, $ord_Fupper) - || PMA_STR_numberInRangeInclusive($ord_c, $ord_Alower, $ord_Flower)); -} // end of the "PMA_STR_isHexDigit()" function - - -/** - * Checks if a character is an upper alphabetic one - * - * @param string character to check for - * - * @return boolean whether the character is an upper alphabetic one or - * not - * - * @see PMA_STR_numberInRangeInclusive() - */ -function PMA_STR_isUpper($c) -{ - $ord_zero = 65; //ord('A'); - $ord_nine = 90; //ord('Z'); - $ord_c = ord($c); - - return PMA_STR_numberInRangeInclusive($ord_c, $ord_zero, $ord_nine); -} // end of the "PMA_STR_isUpper()" function - - -/** - * Checks if a character is a lower alphabetic one - * - * @param string character to check for - * - * @return boolean whether the character is a lower alphabetic one or - * not - * - * @see PMA_STR_numberInRangeInclusive() - */ -function PMA_STR_isLower($c) -{ - $ord_zero = 97; //ord('a'); - $ord_nine = 122; //ord('z'); - $ord_c = ord($c); - - return PMA_STR_numberInRangeInclusive($ord_c, $ord_zero, $ord_nine); -} // end of the "PMA_STR_isLower()" function - - -/** - * Checks if a character is an alphabetic one - * - * @param string character to check for - * - * @return boolean whether the character is an alphabetic one or not - * - * @see PMA_STR_isUpper() - * @see PMA_STR_isLower() - */ -function PMA_STR_isAlpha($c) -{ - return (PMA_STR_isUpper($c) || PMA_STR_isLower($c)); -} // end of the "PMA_STR_isAlpha()" function - - -/** - * Checks if a character is an alphanumeric one - * - * @param string character to check for - * - * @return boolean whether the character is an alphanumeric one or not - * - * @see PMA_STR_isUpper() - * @see PMA_STR_isLower() - * @see PMA_STR_isDigit() - */ -function PMA_STR_isAlnum($c) -{ - return (PMA_STR_isUpper($c) || PMA_STR_isLower($c) || PMA_STR_isDigit($c)); -} // end of the "PMA_STR_isAlnum()" function - - -/** - * Checks if a character is a space one - * - * @param string character to check for - * - * @return boolean whether the character is a space one or not - * - * @see PMA_STR_numberInRangeInclusive() - */ -function PMA_STR_isSpace($c) -{ - $ord_space = 32; //ord(' ') - $ord_tab = 9; //ord('\t') - $ord_CR = 13; //ord('\n') - $ord_NOBR = 160; //ord('U+00A0); - $ord_c = ord($c); - - return (($ord_c == $ord_space) - || ($ord_c == $ord_NOBR) - || PMA_STR_numberInRangeInclusive($ord_c, $ord_tab, $ord_CR)); -} // end of the "PMA_STR_isSpace()" function - - -/** * Checks if a character is an accented character * - * @note Presently this only works for some character sets. More work - * may be needed to fix it. + * Presently this only works for some character sets. More work may be needed + * to fix it. * + * @uses PMA_STR_numberInRangeInclusive() + * @uses ord() * @param string character to check for - * * @return boolean whether the character is an accented one or not - * - * @see PMA_STR_numberInRangeInclusive() */ function PMA_STR_isAccented($c) { @@ -327,33 +164,35 @@ function PMA_STR_isAccented($c) $ord_c = ord($c); return PMA_STR_numberInRangeInclusive($ord_c, $ord_min1, $ord_max1) - || PMA_STR_numberInRangeInclusive($ord_c, $ord_min2, $ord_max2) - || PMA_STR_numberInRangeInclusive($ord_c, $ord_min2, $ord_max2); + || PMA_STR_numberInRangeInclusive($ord_c, $ord_min2, $ord_max2) + || PMA_STR_numberInRangeInclusive($ord_c, $ord_min2, $ord_max2); } // end of the "PMA_STR_isAccented()" function /** * Checks if a character is an SQL identifier * + * @uses PMA_STR_isAlnum() + * @uses PMA_STR_isAccented() * @param string character to check for * @param boolean whether the dot character is valid or not - * * @return boolean whether the character is an SQL identifier or not - * - * @see PMA_STR_isAlnum() */ -function PMA_STR_isSqlIdentifier($c, $dot_is_valid = FALSE) +function PMA_STR_isSqlIdentifier($c, $dot_is_valid = false) { return (PMA_STR_isAlnum($c) - || PMA_STR_isAccented($c) - || ($c == '_') || ($c == '$') - || (($dot_is_valid != FALSE) && ($c == '.'))); + || PMA_STR_isAccented($c) + || $c == '_' + || $c == '$' + || ($dot_is_valid != false && $c == '.')); } // end of the "PMA_STR_isSqlIdentifier()" function /** * Binary search of a value in a sorted array * + * $arr MUST be sorted, due to binary search + * * @param string string to search for * @param array sorted array to search into * @param integer size of sorted array to search into @@ -362,16 +201,15 @@ function PMA_STR_isSqlIdentifier($c, $dot_is_valid = FALSE) */ function PMA_STR_binarySearchInArr($str, $arr, $arrsize) { - // $arr MUST be sorted, due to binary search $top = $arrsize - 1; $bottom = 0; - $found = FALSE; + $found = false; - while (($top >= $bottom) && ($found == FALSE)) { + while ($top >= $bottom && $found == false) { $mid = intval(($top + $bottom) / 2); $res = strcmp($str, $arr[$mid]); if ($res == 0) { - $found = TRUE; + $found = true; } elseif ($res < 0) { $top = $mid - 1; } else { diff --git a/libraries/string_mb.lib.php b/libraries/string_mb.lib.php new file mode 100644 index 0000000000..74f71b1b70 --- /dev/null +++ b/libraries/string_mb.lib.php @@ -0,0 +1,77 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Specialized String Functions for phpMyAdmin + * + * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net> + * http://www.orbis-terrarum.net/?l=people.robbat2 + * + * Defines a set of function callbacks that have a pure C version available if + * the "ctype" extension is available, but otherwise have PHP versions to use + * (that are slower). + * + * The SQL Parser code relies heavily on these functions. + * + * @version $Id$ + */ + +/** + * Returns length of string depending on current charset. + * + * @uses mb_strlen() + * @param string string to count + * @return int string length + * @access public + * @author nijel + * @todo rename to PM_STR_len() + */ +function PMA_strlen($string) +{ + return mb_strlen($string); +} + +/** + * Returns substring from string, works depending on current charset. + * + * @uses mb_substr() + * @param string string to count + * @param int start of substring + * @param int length of substring + * @return int substring + * @access public + * @author nijel + * @todo rename to PM_STR_sub() + */ +function PMA_substr($string, $start, $length = 2147483647) +{ + return mb_substr($string, $start, $length); +} + +/** + * returns postion of $needle in $haystack or false if not found + * + * @uses mb_strpos() + * @param string $needle + * @param string $haystack + * @return integer position of $needle in $haystack or false + */ +function PMA_STR_pos($haystack, $needle, $offset = 0) +{ + return mb_strpos($haystack, $needle, $offset); +} + +/** + * returns right most postion of $needle in $haystack or false if not found + * + * @uses mb_strrpos() + * @param string $needle + * @param string $haystack + * @return integer position of $needle in $haystack or false + * @todo add workaround for offset for PHP < 5.2.0 + */ +function PMA_STR_rPos($haystack, $needle, $offset = 0) +{ + return mb_strrpos($haystack, $needle); +} + +?> diff --git a/libraries/string_native.lib.php b/libraries/string_native.lib.php new file mode 100644 index 0000000000..4485280467 --- /dev/null +++ b/libraries/string_native.lib.php @@ -0,0 +1,77 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Specialized String Functions for phpMyAdmin + * + * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net> + * http://www.orbis-terrarum.net/?l=people.robbat2 + * + * Defines a set of function callbacks that have a pure C version available if + * the "ctype" extension is available, but otherwise have PHP versions to use + * (that are slower). + * + * The SQL Parser code relies heavily on these functions. + * + * @version $Id$ + */ + +/** + * Returns length of string depending on current charset. + * + * @uses strlen() + * @param string string to count + * @return int string length + * @access public + * @author nijel + * @todo rename to PM_STR_len() + */ +function PMA_strlen($string) +{ + return strlen($string); +} + +/** + * Returns substring from string, works depending on current charset. + * + * @uses substr() + * @param string string to count + * @param int start of substring + * @param int length of substring + * @return int substring + * @access public + * @author nijel + * @todo rename to PM_STR_sub() + */ +function PMA_substr($string, $start, $length = 2147483647) +{ + return substr($string, $start, $length); +} + +/** + * returns postion of $needle in $haystack or false if not found + * + * @uses strpos() + * @param string $needle + * @param string $haystack + * @return integer position of $needle in $haystack or false + */ +function PMA_STR_pos($haystack, $needle, $offset = 0) +{ + return strpos($haystack, $needle, $offset); +} + +/** + * returns right most postion of $needle in $haystack or false if not found + * + * @uses strrpos() + * @param string $needle + * @param string $haystack + * @return integer position of $needle in $haystack or false + * @todo add workaround for PHP < 5.0.0 only first char of $needle is used + */ +function PMA_STR_rPos($haystack, $needle, $offset = 0) +{ + return strrpos($haystack, $needle, $offset); +} + +?> diff --git a/libraries/string_type_ctype.lib.php b/libraries/string_type_ctype.lib.php new file mode 100644 index 0000000000..8285164556 --- /dev/null +++ b/libraries/string_type_ctype.lib.php @@ -0,0 +1,103 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Specialized String Functions for phpMyAdmin + * + * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net> + * http://www.orbis-terrarum.net/?l=people.robbat2 + * + * Defines a set of function callbacks that have a pure C version available if + * the "ctype" extension is available, but otherwise have PHP versions to use + * (that are slower). + * + * The SQL Parser code relies heavily on these functions. + * + * @version $Id$ + */ + +/** + * Checks if a character is an alphanumeric one + * + * @uses ctype_alnum() + * @param string character to check for + * @return boolean whether the character is an alphanumeric one or not + */ +function PMA_STR_isAlnum($c) +{ + return ctype_alnum($c); +} // end of the "PMA_STR_isAlnum()" function + +/** + * Checks if a character is an alphabetic one + * + * @uses ctype_alpha() + * @param string character to check for + * @return boolean whether the character is an alphabetic one or not + */ +function PMA_STR_isAlpha($c) +{ + return ctype_alpha($c); +} // end of the "PMA_STR_isAlpha()" function + +/** + * Checks if a character is a digit + * + * @uses ctype_digit() + * @param string character to check for + * @return boolean whether the character is a digit or not + */ +function PMA_STR_isDigit($c) +{ + return ctype_digit($c); +} // end of the "PMA_STR_isDigit()" function + +/** + * Checks if a character is an upper alphabetic one + * + * @uses ctype_upper() + * @param string character to check for + * @return boolean whether the character is an upper alphabetic one or not + */ +function PMA_STR_isUpper($c) +{ + return ctype_upper($c); +} // end of the "PMA_STR_isUpper()" function + + +/** + * Checks if a character is a lower alphabetic one + * + * @uses ctype_lower() + * @param string character to check for + * @return boolean whether the character is a lower alphabetic one or not + */ +function PMA_STR_isLower($c) +{ + return ctype_lower($c); +} // end of the "PMA_STR_isLower()" function + +/** + * Checks if a character is a space one + * + * @uses ctype_space() + * @param string character to check for + * @return boolean whether the character is a space one or not + */ +function PMA_STR_isSpace($c) +{ + return ctype_space($c); +} // end of the "PMA_STR_isSpace()" function + +/** + * Checks if a character is an hexadecimal digit + * + * @uses ctype_xdigit() + * @param string character to check for + * @return boolean whether the character is an hexadecimal digit or not + */ +function PMA_STR_isHexDigit($c) +{ + return ctype_xdigit($c); +} // end of the "PMA_STR_isHexDigit()" function + +?>
\ No newline at end of file diff --git a/libraries/string_type_native.lib.php b/libraries/string_type_native.lib.php new file mode 100644 index 0000000000..cad7984543 --- /dev/null +++ b/libraries/string_type_native.lib.php @@ -0,0 +1,140 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * Specialized String Functions for phpMyAdmin + * + * Copyright 2002 Robin Johnson <robbat2@users.sourceforge.net> + * http://www.orbis-terrarum.net/?l=people.robbat2 + * + * Defines a set of function callbacks that have a pure C version available if + * the "ctype" extension is available, but otherwise have PHP versions to use + * (that are slower). + * + * The SQL Parser code relies heavily on these functions. + * + * @version $Id$ + */ + +/** + * Checks if a character is an alphanumeric one + * + * @uses PMA_STR_isUpper() + * @uses PMA_STR_isLower() + * @uses PMA_STR_isDigit() + * @param string character to check for + * @return boolean whether the character is an alphanumeric one or not + */ +function PMA_STR_isAlnum($c) +{ + return (PMA_STR_isUpper($c) || PMA_STR_isLower($c) || PMA_STR_isDigit($c)); +} // end of the "PMA_STR_isAlnum()" function + +/** + * Checks if a character is an alphabetic one + * + * @uses PMA_STR_isUpper() + * @uses PMA_STR_isLower() + * @param string character to check for + * @return boolean whether the character is an alphabetic one or not + */ +function PMA_STR_isAlpha($c) +{ + return (PMA_STR_isUpper($c) || PMA_STR_isLower($c)); +} // end of the "PMA_STR_isAlpha()" function + +/** + * Checks if a character is a digit + * + * @uses PMA_STR_numberInRangeInclusive() + * @uses ord() + * @param string character to check for + * @return boolean whether the character is a digit or not + */ +function PMA_STR_isDigit($c) +{ + $ord_zero = 48; //ord('0'); + $ord_nine = 57; //ord('9'); + $ord_c = ord($c); + + return PMA_STR_numberInRangeInclusive($ord_c, $ord_zero, $ord_nine); +} // end of the "PMA_STR_isDigit()" function + +/** + * Checks if a character is an upper alphabetic one + * + * @uses PMA_STR_numberInRangeInclusive() + * @uses ord() + * @param string character to check for + * @return boolean whether the character is an upper alphabetic one or not + */ +function PMA_STR_isUpper($c) +{ + $ord_zero = 65; //ord('A'); + $ord_nine = 90; //ord('Z'); + $ord_c = ord($c); + + return PMA_STR_numberInRangeInclusive($ord_c, $ord_zero, $ord_nine); +} // end of the "PMA_STR_isUpper()" function + +/** + * Checks if a character is a lower alphabetic one + * + * @uses PMA_STR_numberInRangeInclusive() + * @uses ord() + * @param string character to check for + * @return boolean whether the character is a lower alphabetic one or not + */ +function PMA_STR_isLower($c) +{ + $ord_zero = 97; //ord('a'); + $ord_nine = 122; //ord('z'); + $ord_c = ord($c); + + return PMA_STR_numberInRangeInclusive($ord_c, $ord_zero, $ord_nine); +} // end of the "PMA_STR_isLower()" function + +/** + * Checks if a character is a space one + * + * @uses PMA_STR_numberInRangeInclusive() + * @uses ord() + * @param string character to check for + * @return boolean whether the character is a space one or not + */ +function PMA_STR_isSpace($c) +{ + $ord_space = 32; //ord(' ') + $ord_tab = 9; //ord('\t') + $ord_CR = 13; //ord('\n') + $ord_NOBR = 160; //ord('U+00A0); + $ord_c = ord($c); + + return ($ord_c == $ord_space + || $ord_c == $ord_NOBR + || PMA_STR_numberInRangeInclusive($ord_c, $ord_tab, $ord_CR)); +} // end of the "PMA_STR_isSpace()" function + +/** + * Checks if a character is an hexadecimal digit + * + * @uses PMA_STR_numberInRangeInclusive() + * @uses ord() + * @param string character to check for + * @return boolean whether the character is an hexadecimal digit or not + */ +function PMA_STR_isHexDigit($c) +{ + $ord_Aupper = 65; //ord('A'); + $ord_Fupper = 70; //ord('F'); + $ord_Alower = 97; //ord('a'); + $ord_Flower = 102; //ord('f'); + $ord_zero = 48; //ord('0'); + $ord_nine = 57; //ord('9'); + $ord_c = ord($c); + + return (PMA_STR_numberInRangeInclusive($ord_c, $ord_zero, $ord_nine) + || PMA_STR_numberInRangeInclusive($ord_c, $ord_Aupper, $ord_Fupper) + || PMA_STR_numberInRangeInclusive($ord_c, $ord_Alower, $ord_Flower)); +} // end of the "PMA_STR_isHexDigit()" function + +?>
\ No newline at end of file diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index d5edf9b241..ce32b23d59 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -14,7 +14,7 @@ PMA_checkParameters(array('db', 'table', 'action', 'num_fields')); // Get available character sets and storage engines require_once './libraries/mysql_charsets.lib.php'; -require_once './libraries/storage_engines.lib.php'; +require_once './libraries/StorageEngine.class.php'; if (is_int($cfg['DefaultPropDisplay'])) { if ($num_fields <= $cfg['DefaultPropDisplay']) { @@ -670,7 +670,7 @@ if ($action == 'tbl_create.php') { </td> <td width="25"> </td> <td> -<?php echo PMA_generateEnginesDropdown('tbl_type', null, FALSE, (isset($GLOBALS['tbl_type']) ? $GLOBALS['tbl_type'] : null), 3); ?> +<?php echo PMA_StorageEngine::getHtmlSelect('tbl_type', null, (isset($GLOBALS['tbl_type']) ? $GLOBALS['tbl_type'] : null)); ?> </td> <?php if (PMA_MYSQL_INT_VERSION >= 40100) { diff --git a/libraries/tbl_replace_fields.inc.php b/libraries/tbl_replace_fields.inc.php index ae47d3045b..15195c4569 100644 --- a/libraries/tbl_replace_fields.inc.php +++ b/libraries/tbl_replace_fields.inc.php @@ -107,6 +107,9 @@ if (false !== $possibly_uploaded_val) { } break; } + } elseif ($type == 'bit') { + $val = preg_replace('/[^01]/', '0', $val); + $val = "b'" . PMA_sqlAddslashes($val) . "'"; } elseif (! ($type == 'timestamp' && $val == 'CURRENT_TIMESTAMP')) { $val = "'" . PMA_sqlAddslashes($val) . "'"; } diff --git a/libraries/tbl_triggers.lib.php b/libraries/tbl_triggers.lib.php new file mode 100644 index 0000000000..af6f0b235f --- /dev/null +++ b/libraries/tbl_triggers.lib.php @@ -0,0 +1,49 @@ +<?php +/* vim: set expandtab sw=4 ts=4 sts=4: */ +/** + * + * @version $Id$ + */ + +$url_query .= '&goto=tbl_structure.php'; + +$triggers = PMA_DBI_get_triggers($db, $table); + +if ($triggers) { + echo '<div id="tabletriggers">' . "\n"; + echo '<table class="data">' . "\n"; + echo ' <caption class="tblHeaders">' . $strTriggers . '</caption>' . "\n"; + echo sprintf('<tr> + <th>%s</th> + <th> </th> + <th> </th> + <th>%s</th> + <th>%s</th> + </tr>', + $strName, + $strTime, + $strEvent); + $ct=0; + $delimiter = '//'; + foreach ($triggers as $trigger) { + $drop_and_create = $trigger['drop'] . $delimiter . "\n" . $trigger['create'] . "\n"; + + echo sprintf('<tr class="%s"> + <td><b>%s</b></td> + <td>%s</td> + <td>%s</td> + <td>%s</td> + <td>%s</td> + </tr>', + ($ct%2 == 0) ? 'even' : 'odd', + $trigger['name'], + '<a href="tbl_sql.php?' . $url_query . '&sql_query=' . urlencode($drop_and_create) . '&show_query=1&delimiter=' . urlencode($delimiter) . '">' . $titles['Change'] . '</a>', + '<a href="sql.php?' . $url_query . '&sql_query=' . urlencode($trigger['drop']) . '" onclick="return confirmLink(this, \'' . PMA_jsFormat($trigger['drop'], false) . '\')">' . $titles['Drop'] . '</a>', + $trigger['action_timing'], + $trigger['event_manipulation']); + $ct++; + } + echo '</table>'; + echo '</div>' . "\n"; +} +?> diff --git a/scripts/decode_bug.php b/scripts/decode_bug.php index 79a9ae0331..7dea1e249b 100644 --- a/scripts/decode_bug.php +++ b/scripts/decode_bug.php @@ -80,7 +80,7 @@ if (!empty($_POST) && isset($_POST['bug_encoded'])) { } if (!empty($bug_encoded)) { - if (get_magic_quotes_gpc()) { + if (function_exists('get_magic_quotes_gpc') && get_magic_quotes_gpc()) { $bug_encoded = stripslashes($bug_encoded); } diff --git a/scripts/setup.php b/scripts/setup.php index 43cfed9f68..93cab08d95 100644 --- a/scripts/setup.php +++ b/scripts/setup.php @@ -1382,6 +1382,30 @@ switch ($action) { message('error', 'Empty phpMyAdmin control user password while using pmadb!'); $err = TRUE; } + /* Check whether we can connect as control user */ + if (!empty($new_server['controluser']) && !empty($new_server['controlpass'])) { + if ($new_server['extension'] == 'mysql') { + $socket = empty($new_server['socket']) || $new_server['connect_type'] == 'tcp' ? '' : ':' . $new_server['socket']; + $port = empty($new_server['port']) || $new_server['connect_type'] == 'socket' ? '' : ':' . $new_server['port']; + $conn = @mysql_connect($new_server['host'] . $socket . $port, $new_server['controluser'], $new_server['controlpass']); + if ($conn === FALSE) { + message('error', 'Could not connect as control user!'); + $err = TRUE; + } else { + mysql_close($conn); + } + } else { + $socket = empty($new_server['socket']) || $new_server['connect_type'] == 'tcp' ? NULL : $new_server['socket']; + $port = empty($new_server['port']) || $new_server['connect_type'] == 'socket' ? NULL : $new_server['port']; + $conn = @mysqli_connect($new_server['host'], $new_server['controluser'], $new_server['controlpass'], NULL, $port, $socket); + if ($conn === FALSE) { + message('error', 'Could not connect as control user!'); + $err = TRUE; + } else { + mysqli_close($conn); + } + } + } } else { message('warning', 'You didn\'t set phpMyAdmin database, so you can not use all phpMyAdmin features.'); } diff --git a/server_engines.php b/server_engines.php index 4946a45d3e..02ee42713d 100644 --- a/server_engines.php +++ b/server_engines.php @@ -4,6 +4,7 @@ * display list of server enignes and additonal information about them * * @version $Id$ + * @todo falcon storage enginge is not listed under dev.mysql.com/doc/refman but dev.mysql.com/doc/falcon/ */ /** @@ -22,7 +23,7 @@ require_once './libraries/common.inc.php'; * Does the common work */ require './libraries/server_common.inc.php'; -require './libraries/storage_engines.lib.php'; +require './libraries/StorageEngine.class.php'; /** @@ -31,108 +32,10 @@ require './libraries/storage_engines.lib.php'; require './libraries/server_links.inc.php'; /** - * defines - */ -define('PMA_ENGINE_DETAILS_TYPE_PLAINTEXT', 0); -define('PMA_ENGINE_DETAILS_TYPE_SIZE', 1); -define('PMA_ENGINE_DETAILS_TYPE_NUMERIC', 2); //Has no effect yet... -define('PMA_ENGINE_DETAILS_TYPE_BOOLEAN', 3); // 'ON' or 'OFF' - -/** - * Function for displaying the table of an engine's parameters - * - * @param array List of MySQL variables and corresponding localized descriptions. - * The array elements should have the following format: - * $variable => array('title' => $title, 'desc' => $description); - * @param string Prefix for the SHOW VARIABLES query. - * @return string The table that was generated based on the given information. - */ -function PMA_generateEngineDetails($variables, $like = null) { - - /** - * Get the variables! - */ - if (!empty($variables)) { - $sql_query = 'SHOW ' - . (PMA_MYSQL_INT_VERSION >= 40102 ? 'GLOBAL ' : '') - . 'VARIABLES' - . (empty($like) ? '' : ' LIKE \'' . $like . '\'') - . ';'; - $res = PMA_DBI_query($sql_query); - $mysql_vars = array(); - while ($row = PMA_DBI_fetch_row($res)) { - if (isset($variables[$row[0]])) { - $mysql_vars[$row[0]] = $row[1]; - } - } - PMA_DBI_free_result($res); - } - - if (empty($mysql_vars)) { - return '<p>' . "\n" - . ' ' . $GLOBALS['strNoDetailsForEngine'] . "\n" - . '</p>' . "\n"; - } - - $dt_table = '<table class="data">' . "\n"; - $odd_row = false; - $has_content = false; - - foreach ($variables as $var => $details) { - if (!isset($mysql_vars[$var])) { - continue; - } - - if (!isset($details['type'])) { - $details['type'] = PMA_ENGINE_DETAILS_TYPE_PLAINTEXT; - } - $is_num = $details['type'] == PMA_ENGINE_DETAILS_TYPE_SIZE - || $details['type'] == PMA_ENGINE_DETAILS_TYPE_NUMERIC; - - $dt_table .= '<tr class="' . ($odd_row ? 'odd' : 'even') . '">' . "\n" - . ' <td>' . "\n"; - if (!empty($variables[$var]['desc'])) { - $dt_table .= ' ' . PMA_showHint($details['desc']) . "\n"; - } - $dt_table .= ' </td>' . "\n" - . ' <th>' - . htmlspecialchars(empty($details['title']) - ? $var : $details['title']) . "\n" - . ' </th>' . "\n" - . ' <td class="value">'; - switch ($details['type']) { - case PMA_ENGINE_DETAILS_TYPE_SIZE: - $parsed_size = PMA_formatByteDown($mysql_vars[$var]); - $dt_table .= $parsed_size[0] . ' ' . $parsed_size[1]; - unset($parsed_size); - break; - case PMA_ENGINE_DETAILS_TYPE_NUMERIC: - $dt_table .= PMA_formatNumber($mysql_vars[$var]) . ' '; - break; - default: - $dt_table .= htmlspecialchars($mysql_vars[$var]) . ' '; - } - $dt_table .= '</td>' . "\n" - . '</tr>' . "\n"; - $odd_row = !$odd_row; - $has_content = true; - } - - if (!$has_content) { - return ''; - } - - $dt_table .= '</table>' . "\n"; - - return $dt_table; -} - - -/** * Did the user request information about a certain storage engine? */ if (empty($_REQUEST['engine']) - || empty($mysql_storage_engines[$_REQUEST['engine']])) { + || ! PMA_StorageEngine::isValid($_REQUEST['engine'])) { /** * Displays the sub-page heading @@ -163,7 +66,7 @@ if (empty($_REQUEST['engine']) * Listing the storage engines */ $odd_row = true; - foreach ($mysql_storage_engines as $engine => $details) { + foreach (PMA_StorageEngine::getStorageEngines() as $engine => $details) { echo '<tr class="' . ($odd_row ? 'odd' : 'even') . ($details['Support'] == 'NO' || $details['Support'] == 'DISABLED' @@ -242,8 +145,7 @@ if (empty($_REQUEST['engine']) } else { echo '<p> ' . $engine_plugin->getSupportInformationMessage() . "\n" . '</p>' . "\n" - . PMA_generateEngineDetails($engine_plugin->getVariables(), - $engine_plugin->getVariablesLikePattern()); + . $engine_plugin->getHtmlVariables(); } } @@ -291,11 +291,11 @@ if ($is_select) { // see line 141 // Do append a "LIMIT" clause? if (isset($pos) - && (!$cfg['ShowAll'] || $session_max_rows != 'all') - && !($is_count || $is_export || $is_func || $is_analyse) - && isset($analyzed_sql[0]['queryflags']['select_from']) - && !isset($analyzed_sql[0]['queryflags']['offset']) - && !preg_match('@[[:space:]]LIMIT[[:space:]0-9,-]+(;)?$@i', $sql_query)) { + && (!$cfg['ShowAll'] || $session_max_rows != 'all') + && !($is_count || $is_export || $is_func || $is_analyse) + && isset($analyzed_sql[0]['queryflags']['select_from']) + && !isset($analyzed_sql[0]['queryflags']['offset']) + && !preg_match('@[[:space:]]LIMIT[[:space:]0-9,-]+(;)?$@i', $sql_query)) { $sql_limit_to_append = " LIMIT $pos, ".$cfg['MaxRows'] . " "; $full_sql_query = $analyzed_sql[0]['section_before_limit'] . "\n" . $sql_limit_to_append . $analyzed_sql[0]['section_after_limit']; @@ -404,146 +404,146 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { $GLOBALS['session_max_rows'] = 'all'; } elseif ($is_select) { - // c o u n t q u e r y - - // If we are "just browsing", there is only one table, - // and no where clause (or just 'WHERE 1 '), - // so we do a quick count (which uses MaxExactCount) - // because SQL_CALC_FOUND_ROWS - // is not quick on large InnoDB tables - - // but do not count again if we did it previously - // due to $find_real_end == true - - if (!$is_group - && !isset($analyzed_sql[0]['queryflags']['union']) - && !isset($analyzed_sql[0]['table_ref'][1]['table_name']) - && (empty($analyzed_sql[0]['where_clause']) - || $analyzed_sql[0]['where_clause'] == '1 ') - && !isset($find_real_end) - ) { - - // "j u s t b r o w s i n g" - $unlim_num_rows = PMA_Table::countRecords($db, $table, true); - - } else { // n o t " j u s t b r o w s i n g " - - if (PMA_MYSQL_INT_VERSION < 40000) { - - // detect this case: - // SELECT DISTINCT x AS foo, y AS bar FROM sometable - - if (isset($analyzed_sql[0]['queryflags']['distinct'])) { - $count_what = 'DISTINCT '; - $first_expr = true; - foreach ($analyzed_sql[0]['select_expr'] as $part) { - $count_what .= (!$first_expr ? ', ' : '') . $part['expr']; - $first_expr = false; - } - } else { - $count_what = '*'; - } - // this one does not apply to VIEWs - $count_query = 'SELECT COUNT(' . $count_what . ') AS count'; - } + // c o u n t q u e r y - // add the remaining of select expression if there is - // a GROUP BY or HAVING clause - if (PMA_MYSQL_INT_VERSION < 40000 - && $count_what =='*' - && (!empty($analyzed_sql[0]['group_by_clause']) - || !empty($analyzed_sql[0]['having_clause']))) { - $count_query .= ' ,' . $analyzed_sql[0]['select_expr_clause']; - } + // If we are "just browsing", there is only one table, + // and no where clause (or just 'WHERE 1 '), + // so we do a quick count (which uses MaxExactCount) + // because SQL_CALC_FOUND_ROWS + // is not quick on large InnoDB tables - if (PMA_MYSQL_INT_VERSION >= 40000) { - // add select expression after the SQL_CALC_FOUND_ROWS - - // for UNION, just adding SQL_CALC_FOUND_ROWS - // after the first SELECT works. - - // take the left part, could be: - // SELECT - // (SELECT - $count_query = PMA_SQP_formatHtml($parsed_sql, 'query_only', 0, $analyzed_sql[0]['position_of_first_select'] + 1); - $count_query .= ' SQL_CALC_FOUND_ROWS '; - // add everything that was after the first SELECT - $count_query .= PMA_SQP_formatHtml($parsed_sql, 'query_only', $analyzed_sql[0]['position_of_first_select']+1); - // ensure there is no semicolon at the end of the - // count query because we'll probably add - // a LIMIT 1 clause after it - $count_query = rtrim($count_query); - $count_query = rtrim($count_query, ';'); - } else { // PMA_MYSQL_INT_VERSION < 40000 - - if (!empty($analyzed_sql[0]['from_clause'])) { - $count_query .= ' FROM ' . $analyzed_sql[0]['from_clause']; - } - if (!empty($analyzed_sql[0]['where_clause'])) { - $count_query .= ' WHERE ' . $analyzed_sql[0]['where_clause']; - } - if (!empty($analyzed_sql[0]['group_by_clause'])) { - $count_query .= ' GROUP BY ' . $analyzed_sql[0]['group_by_clause']; - } - if (!empty($analyzed_sql[0]['having_clause'])) { - $count_query .= ' HAVING ' . $analyzed_sql[0]['having_clause']; + // but do not count again if we did it previously + // due to $find_real_end == true + + if (!$is_group + && !isset($analyzed_sql[0]['queryflags']['union']) + && !isset($analyzed_sql[0]['table_ref'][1]['table_name']) + && (empty($analyzed_sql[0]['where_clause']) + || $analyzed_sql[0]['where_clause'] == '1 ') + && !isset($find_real_end) + ) { + + // "j u s t b r o w s i n g" + $unlim_num_rows = PMA_Table::countRecords($db, $table, true); + + } else { // n o t " j u s t b r o w s i n g " + + if (PMA_MYSQL_INT_VERSION < 40000) { + + // detect this case: + // SELECT DISTINCT x AS foo, y AS bar FROM sometable + + if (isset($analyzed_sql[0]['queryflags']['distinct'])) { + $count_what = 'DISTINCT '; + $first_expr = true; + foreach ($analyzed_sql[0]['select_expr'] as $part) { + $count_what .= (!$first_expr ? ', ' : '') . $part['expr']; + $first_expr = false; } - } // end if + } else { + $count_what = '*'; + } + // this one does not apply to VIEWs + $count_query = 'SELECT COUNT(' . $count_what . ') AS count'; + } - // if using SQL_CALC_FOUND_ROWS, add a LIMIT to avoid - // long delays. Returned count will be complete anyway. - // (but a LIMIT would disrupt results in an UNION) + // add the remaining of select expression if there is + // a GROUP BY or HAVING clause + if (PMA_MYSQL_INT_VERSION < 40000 + && $count_what =='*' + && (!empty($analyzed_sql[0]['group_by_clause']) + || !empty($analyzed_sql[0]['having_clause']))) { + $count_query .= ' ,' . $analyzed_sql[0]['select_expr_clause']; + } - if (PMA_MYSQL_INT_VERSION >= 40000 - && !isset($analyzed_sql[0]['queryflags']['union'])) { - $count_query .= ' LIMIT 1'; + if (PMA_MYSQL_INT_VERSION >= 40000) { + // add select expression after the SQL_CALC_FOUND_ROWS + + // for UNION, just adding SQL_CALC_FOUND_ROWS + // after the first SELECT works. + + // take the left part, could be: + // SELECT + // (SELECT + $count_query = PMA_SQP_formatHtml($parsed_sql, 'query_only', 0, $analyzed_sql[0]['position_of_first_select'] + 1); + $count_query .= ' SQL_CALC_FOUND_ROWS '; + // add everything that was after the first SELECT + $count_query .= PMA_SQP_formatHtml($parsed_sql, 'query_only', $analyzed_sql[0]['position_of_first_select']+1); + // ensure there is no semicolon at the end of the + // count query because we'll probably add + // a LIMIT 1 clause after it + $count_query = rtrim($count_query); + $count_query = rtrim($count_query, ';'); + } else { // PMA_MYSQL_INT_VERSION < 40000 + + if (!empty($analyzed_sql[0]['from_clause'])) { + $count_query .= ' FROM ' . $analyzed_sql[0]['from_clause']; + } + if (!empty($analyzed_sql[0]['where_clause'])) { + $count_query .= ' WHERE ' . $analyzed_sql[0]['where_clause']; + } + if (!empty($analyzed_sql[0]['group_by_clause'])) { + $count_query .= ' GROUP BY ' . $analyzed_sql[0]['group_by_clause']; + } + if (!empty($analyzed_sql[0]['having_clause'])) { + $count_query .= ' HAVING ' . $analyzed_sql[0]['having_clause']; } + } // end if - // run the count query - - if (PMA_MYSQL_INT_VERSION < 40000) { - if ($cnt_all_result = PMA_DBI_try_query($count_query)) { - if ($is_group && $count_what == '*') { - $unlim_num_rows = @PMA_DBI_num_rows($cnt_all_result); - } else { - $unlim_num_rows = PMA_DBI_fetch_assoc($cnt_all_result); - $unlim_num_rows = $unlim_num_rows['count']; - } - PMA_DBI_free_result($cnt_all_result); + // if using SQL_CALC_FOUND_ROWS, add a LIMIT to avoid + // long delays. Returned count will be complete anyway. + // (but a LIMIT would disrupt results in an UNION) + + if (PMA_MYSQL_INT_VERSION >= 40000 + && !isset($analyzed_sql[0]['queryflags']['union'])) { + $count_query .= ' LIMIT 1'; + } + + // run the count query + + if (PMA_MYSQL_INT_VERSION < 40000) { + if ($cnt_all_result = PMA_DBI_try_query($count_query)) { + if ($is_group && $count_what == '*') { + $unlim_num_rows = @PMA_DBI_num_rows($cnt_all_result); } else { - if (PMA_DBI_getError()) { - - // there are some cases where the generated - // count_query (for MySQL 3) is wrong, - // so we get here. - /** - * @todo use a big unlimited query to get the correct - * number of rows (depending on a config variable?) - */ - $unlim_num_rows = 0; - } + $unlim_num_rows = PMA_DBI_fetch_assoc($cnt_all_result); + $unlim_num_rows = $unlim_num_rows['count']; } + PMA_DBI_free_result($cnt_all_result); } else { - PMA_DBI_try_query($count_query); - // if (mysql_error()) { - // void. - // I tried the case - // (SELECT `User`, `Host`, `Db`, `Select_priv` FROM `db`) - // UNION (SELECT `User`, `Host`, "%" AS "Db", - // `Select_priv` - // FROM `user`) ORDER BY `User`, `Host`, `Db`; - // and although the generated count_query is wrong - // the SELECT FOUND_ROWS() work! (maybe it gets the - // count from the latest query that worked) - // - // another case where the count_query is wrong: - // SELECT COUNT(*), f1 from t1 group by f1 - // and you click to sort on count(*) - // } - $cnt_all_result = PMA_DBI_query('SELECT FOUND_ROWS() as count;'); - list($unlim_num_rows) = PMA_DBI_fetch_row($cnt_all_result); - @PMA_DBI_free_result($cnt_all_result); + if (PMA_DBI_getError()) { + + // there are some cases where the generated + // count_query (for MySQL 3) is wrong, + // so we get here. + /** + * @todo use a big unlimited query to get the correct + * number of rows (depending on a config variable?) + */ + $unlim_num_rows = 0; + } } + } else { + PMA_DBI_try_query($count_query); + // if (mysql_error()) { + // void. + // I tried the case + // (SELECT `User`, `Host`, `Db`, `Select_priv` FROM `db`) + // UNION (SELECT `User`, `Host`, "%" AS "Db", + // `Select_priv` + // FROM `user`) ORDER BY `User`, `Host`, `Db`; + // and although the generated count_query is wrong + // the SELECT FOUND_ROWS() work! (maybe it gets the + // count from the latest query that worked) + // + // another case where the count_query is wrong: + // SELECT COUNT(*), f1 from t1 group by f1 + // and you click to sort on count(*) + // } + $cnt_all_result = PMA_DBI_query('SELECT FOUND_ROWS() as count;'); + list($unlim_num_rows) = PMA_DBI_fetch_row($cnt_all_result); + @PMA_DBI_free_result($cnt_all_result); + } } // end else "just browsing" } else { // not $is_select @@ -561,11 +561,11 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) { } else { // garvin: VOID. No DB/Table gets deleted. } // end if relation-stuff - } // end if ($purge) + } // end if ($purge) // garvin: If a column gets dropped, do relation magic. if (isset($cpurge) && $cpurge == '1' && isset($purgekey) - && strlen($db) && strlen($table) && !empty($purgekey)) { + && strlen($db) && strlen($table) && !empty($purgekey)) { require_once './libraries/relation_cleanup.lib.php'; PMA_relationsCleanupColumn($db, $table, $purgekey); diff --git a/tbl_change.php b/tbl_change.php index b940a1dbfc..2ef6c1b087 100644 --- a/tbl_change.php +++ b/tbl_change.php @@ -454,6 +454,12 @@ foreach ($loop_array as $vrowcount => $vrow) { $vrow[$field] = ''; $special_chars = ''; $data = $vrow[$field]; + } elseif ($row_table_def['True_Type'] == 'bit') { + $special_chars = ''; + for ($j = 0; $j < ceil($len / 8); $j++) { + $special_chars .= sprintf('%08d', decbin(ord(substr($vrow[$field], $j, 1)))); + } + $special_chars = substr($special_chars, -$len); } else { // loic1: special binary "characters" if ($is_binary || $is_blob) { @@ -953,6 +959,11 @@ foreach ($loop_array as $vrowcount => $vrow) { <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="timestamp" /> <?php } + if ($row_table_def['True_Type'] == 'bit') { + ?> + <input type="hidden" name="fields_type<?php echo $field_name_appendix; ?>" value="bit" /> + <?php + } if ($type == 'date' || $type == 'datetime' || substr($type, 0, 9) == 'timestamp') { ?> <script type="text/javascript"> @@ -979,6 +990,22 @@ foreach ($loop_array as $vrowcount => $vrow) { $o_rows++; echo ' </table><br />'; } // end foreach on multi-edit + +if ($insert_mode) { + $tmp = '<select name="insert_rows" id="insert_rows" onchange="this.form.submit();" />' . "\n"; + $option_values = array(1,2,5,10,15,20,30,40); + foreach ($option_values as $value) { + $tmp .= '<option value="' . $value . '"'; + if ($value == $cfg['InsertRows']) { + $tmp .= ' selected="selected"'; + } + $tmp .= '>' . $value . '</option>' . "\n"; + } + $tmp .= '</select>' . "\n"; + echo "\n" . sprintf($strRestartInsertion, $tmp); + unset($tmp); + echo '<noscript><input type="submit" value="' . $strGo . '" /></noscript>' . "\n"; +} ?> <br /> diff --git a/tbl_operations.php b/tbl_operations.php index 4ef05af98d..e9dbcb98a6 100644 --- a/tbl_operations.php +++ b/tbl_operations.php @@ -30,7 +30,7 @@ $cfgRelation = PMA_getRelationsParam(); * Gets available MySQL charsets and storage engines */ require_once './libraries/mysql_charsets.lib.php'; -require_once './libraries/storage_engines.lib.php'; +require_once './libraries/StorageEngine.class.php'; // reselect current db (needed in some cases probably due to // the calling of relation.lib.php) @@ -258,7 +258,7 @@ if (strstr($show_comment, '; InnoDB free') === false) { <tr><td><?php echo $strStorageEngine; ?> <?php echo PMA_showMySQLDocu('Storage_engines', 'Storage_engines'); ?> </td> - <td><?php echo PMA_generateEnginesDropdown('new_tbl_type', null, false, $tbl_type, 4); ?> + <td><?php echo PMA_StorageEngine::getHtmlSelect('new_tbl_type', null, $tbl_type); ?> </td> </tr> diff --git a/tbl_replace.php b/tbl_replace.php index 8b23482fda..9e88fbf704 100644 --- a/tbl_replace.php +++ b/tbl_replace.php @@ -62,6 +62,8 @@ PMA_DBI_select_db($GLOBALS['db']); /** * Initializes some variables */ +$goto_include = false; + if (isset($_REQUEST['dontlimitchars'])) { $url_params['dontlimitchars'] = $_REQUEST['dontlimitchars']; } @@ -77,8 +79,13 @@ if (isset($_REQUEST['disp_direction'])) { if (isset($_REQUEST['repeat_cells'])) { $url_params['repeat_cells'] = (int) $_REQUEST['repeat_cells']; } +if (isset($_REQUEST['insert_rows']) && is_numeric($_REQUEST['insert_rows']) && $_REQUEST['insert_rows'] != $cfg['InsertRows']) { + $cfg['InsertRows'] = $_REQUEST['insert_rows']; + require_once './libraries/header.inc.php'; + require './tbl_change.php'; + exit; +} -$goto_include = false; if (isset($_REQUEST['after_insert']) && in_array($_REQUEST['after_insert'], array('new_insert', 'same_insert', 'edit_next'))) { $url_params['after_insert'] = $_REQUEST['after_insert']; @@ -230,7 +237,10 @@ foreach ($loop_array as $primary_key) { // no need to add column into the valuelist if (strlen($cur_value)) { $query_values[] = $cur_value; - $query_fields[] = PMA_backquote($key); + // first inserted row so prepare the list of fields + if (empty($value_sets)) { + $query_fields[] = PMA_backquote($key); + } } // u p d a t e @@ -311,9 +321,7 @@ foreach ($query as $single_query) { } else { $result = PMA_DBI_query($single_query); } - if (isset($GLOBALS['warning'])) { - $warning_message .= $GLOBALS['warning'] . '[br]'; - } + if (! $result) { $message .= PMA_DBI_getError(); } else { @@ -333,6 +341,12 @@ foreach ($query as $single_query) { } PMA_DBI_free_result($result); } // end if + + foreach (PMA_DBI_get_warnings() as $warning) { + $warning_message .= $warning['Level'] . ': #' . $warning['Code'] + . ' ' . $warning['Message'] . '[br]'; + } + unset($result); } unset($single_query, $query); diff --git a/tbl_sql.php b/tbl_sql.php index 2e5e2a808e..4bce7b98b8 100644 --- a/tbl_sql.php +++ b/tbl_sql.php @@ -35,7 +35,7 @@ require_once './libraries/tbl_links.inc.php'; /** * Query box, bookmark, insert data from textfile */ -PMA_sqlQueryForm(); +PMA_sqlQueryForm(true, false, isset($_REQUEST['delimiter']) ? $_REQUEST['delimiter'] : ';'); /** * Displays the footer diff --git a/tbl_structure.php b/tbl_structure.php index 9de35843e2..7ec59ee7da 100644 --- a/tbl_structure.php +++ b/tbl_structure.php @@ -818,6 +818,9 @@ if ($cfg['ShowStats']) { <?php } // END - Calc Table Space + +require './libraries/tbl_triggers.lib.php'; + echo '<div class="clearfloat"></div>' . "\n"; echo '</div>' . "\n"; diff --git a/test/AllTests.php b/test/AllTests.php index e18e9ed7c1..72b0eba2c5 100644 --- a/test/AllTests.php +++ b/test/AllTests.php @@ -29,6 +29,7 @@ require_once './test/Environment_test.php'; require_once './test/PMA_escapeJsString_test.php'; require_once './test/PMA_isValid_test.php'; require_once './test/PMA_transformation_getOptions_test.php'; +require_once './test/PMA_STR_sub_test.php'; class AllTests { @@ -53,6 +54,7 @@ class AllTests $suite->addTestSuite('PMA_escapeJsString_test'); $suite->addTestSuite('PMA_isValid_test'); $suite->addTestSuite('PMA_transformation_getOptions_test'); + $suite->addTestSuite('PMA_STR_sub_test'); return $suite; } } diff --git a/test/PMA_STR_sub_test.php b/test/PMA_STR_sub_test.php new file mode 100644 index 0000000000..6624090ad7 --- /dev/null +++ b/test/PMA_STR_sub_test.php @@ -0,0 +1,43 @@ +<?php
+/* vim: expandtab sw=4 ts=4 sts=4: */
+/**
+ * tests for PMA_pow()
+ *
+ * @version $Id: PMA_pow_test.php 10140 2007-03-20 08:32:55Z cybot_tm $
+ * @package phpMyAdmin-test
+ */
+
+/**
+ *
+ */
+require_once 'PHPUnit/Framework.php';
+
+$match = array();
+preg_match('@^([0-9]{1,2})(?:.([0-9]{1,2})(?:.([0-9]{1,2}))?)?@',
+ phpversion(), $match);
+if (isset($match) && ! empty($match[1])) {
+ if (! isset($match[2])) {
+ $match[2] = 0;
+ }
+ if (! isset($match[3])) {
+ $match[3] = 0;
+ }
+ define('PMA_PHP_INT_VERSION',
+ (int) sprintf('%d%02d%02d', $match[1], $match[2], $match[3]));
+} else {
+ define('PMA_PHP_INT_VERSION', 0);
+}
+
+$GLOBALS['charset'] = 'UTF-8';
+
+require_once './libraries/string.lib.php';
+
+class PMA_STR_sub_test extends PHPUnit_Framework_TestCase
+{
+ public function testMultiByte()
+ {
+ $this->assertEquals('čšě',
+ PMA_substr('čšěčščěš', 0, 3));
+ }
+}
+?>
\ No newline at end of file |