diff --git a/ChangeLog b/ChangeLog index 8401fd438..a4f0b9e25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,7 +5,16 @@ phpMyAdmin - ChangeLog $Id$ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyAdmin/ChangeLog $ -3.2.1.0 (not yet released) +3.2.2.0 (not yet released) +- bug #2825293 [structure] Default value for a BIT column +- bug [display] Red arrows were reversed in the list of tables +- bug #2813879 [export] Duplicate empty lines when exporting without comments +- bug #2825919 [export] Trigger export with database name +- bug #2823996 [data] Cannot edit row with no PK and a BIT field +- bug [export] Exporting results of a query which contains a LIMIT clause + inside a subquery + +3.2.1.0 (2009-08-09) - bug #2799009 Login with ipv6 IP address breaks redirect - bug #2796066 [priv] Inconsistent display of databases list - bug #2802870 [display] Incorrect overhead value for InnoDB @@ -24,6 +33,15 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA - bug #2819944 [setup] Incorrect mention of designer_coords - bug #2821757 [insert] "Insert another new row" no longer worked + [lang] Norwegian update, thanks to Sven-Erik Andersen +- bug [core] PMA_pow() can support negative exponents in the pow() case ++ [lang] Brazilian Portuguese update, thanks to Fabio Bucior - fabiobucior +- patch #2822384 [docs] Missing auth_type in docs-example, + thanks to Jürgen Wind - windkiel +- patch #2819728 [display] Slider effect jumping to top of page, + thanks to Jan Radem - summsel +- bug [display] Incorrect computation of overhead stats in server view + for tables under the InnoDB engine ++ [lang] Swedish update, thanks to Björn T. Hallberg 3.2.0.1 (2009-06-30) - [security] XSS: Insufficient output sanitizing in bookmarks diff --git a/Documentation.html b/Documentation.html index 3c692704f..ddbada8c1 100644 --- a/Documentation.html +++ b/Documentation.html @@ -10,7 +10,7 @@ - phpMyAdmin 3.2.1-dev - Documentation + phpMyAdmin 3.2.2-dev - Documentation @@ -18,7 +18,7 @@ @@ -235,6 +235,7 @@ $i=0; $i++; $cfg['Servers'][$i]['user'] = 'root'; $cfg['Servers'][$i]['password'] = 'cbb74bc'; // use here your password +$cfg['Servers'][$i]['auth_type'] = 'config'; ?> For a full explanation of possible configuration values, see the diff --git a/README b/README index ac2ea4d4f..6db8cdda2 100644 --- a/README +++ b/README @@ -5,7 +5,7 @@ phpMyAdmin - Readme A set of PHP-scripts to manage MySQL over the web. - Version 3.2.1-dev + Version 3.2.2-dev ----------------- http://www.phpmyadmin.net/ diff --git a/db_structure.php b/db_structure.php index f2a246a55..4a06801ae 100644 --- a/db_structure.php +++ b/db_structure.php @@ -117,7 +117,6 @@ function PMA_TableHeader($db_is_information_schema = false) $GLOBALS['structure_tbl_col_cnt'] = $cnt + $action_colspan + 3; } // end function PMA_TableHeader() - /** * Creates a clickable column header for table information * @@ -130,7 +129,7 @@ function PMA_SortableTableHeader($title, $sort) // Set some defaults $requested_sort = 'table'; $requested_sort_order = 'ASC'; - $sort_order = 'ASC'; + $future_sort_order = 'ASC'; // If the user requested a sort if (isset($_REQUEST['sort'])) { @@ -148,14 +147,20 @@ function PMA_SortableTableHeader($title, $sort) // If this column was requested to be sorted. if ($requested_sort == $sort) { if ($requested_sort_order == 'ASC') { - $sort_order = 'DESC'; - $order_img = ' '. $GLOBALS['strDescending'] . ''; - $order_link_params['onmouseover'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }'; - $order_link_params['onmouseout'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }'; - } else { + $future_sort_order = 'DESC'; + // current sort order is ASC $order_img = ' '. $GLOBALS['strAscending'] . ''; + // but on mouse over, show the reverse order (DESC) $order_link_params['onmouseover'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }'; + // on mouse out, show current sort order (ASC) $order_link_params['onmouseout'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }'; + } else { + // current sort order is DESC + $order_img = ' '. $GLOBALS['strDescending'] . ''; + // but on mouse over, show the reverse order (ASC) + $order_link_params['onmouseover'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_asc.png\'; }'; + // on mouse out, show current sort order (DESC) + $order_link_params['onmouseout'] = 'if(document.getElementById(\'sort_arrow\')){ document.getElementById(\'sort_arrow\').src=\'' . $GLOBALS['pmaThemeImage'] . 's_desc.png\'; }'; } } @@ -165,10 +170,11 @@ function PMA_SortableTableHeader($title, $sort) $url = 'db_structure.php'.PMA_generate_common_url($_url_params); // We set the position back to 0 every time they sort. - $url .= "&pos=0&sort=$sort&sort_order=$sort_order"; + $url .= "&pos=0&sort=$sort&sort_order=$future_sort_order"; return PMA_linkOrButton($url, $title . $order_img, $order_link_params); -} +} // end function PMA_SortableTableHeader() + $titles = array(); if (true == $cfg['PropertiesIconic']) { diff --git a/lang/brazilian_portuguese-utf-8.inc.php b/lang/brazilian_portuguese-utf-8.inc.php index 38edf0c4a..f83a59a48 100644 --- a/lang/brazilian_portuguese-utf-8.inc.php +++ b/lang/brazilian_portuguese-utf-8.inc.php @@ -1,6 +1,7 @@ */ +/* contribution by: Fabio Bucior */ $charset = 'utf-8'; $text_dir = 'ltr'; // ('ltr' da esquerda para direita, 'rtl' da direita para esquerda) @@ -24,6 +25,7 @@ $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.'; $strAccessDeniedExplanation = 'phpMyAdmin tentou se conectar no servidor MySQL e a conxão foi recusada. Você deve checar o servidor, nome de usuário e senha no config.inc.php e se certificar que correspondam com as informações fornecidas pelo administrador do servidor MySQL.'; $strAction = 'Ação'; +$strActions = 'Ações'; $strAddAutoIncrement = 'Adicionar valor AUTO_INCREMENT'; $strAddClause = 'Adicionar %s'; $strAddConstraints = 'Adicionar restrições'; @@ -49,6 +51,7 @@ $strAllowInterrupt = 'Permitir interromper a importação caso se detecte que o $strAllTableSameWidth = 'mostrar todas as tabelas com o mesmo tamanho?'; $strAll = 'Todos'; $strAlterOrderBy = 'Alterar tabela ordenada por'; +$strAnalyze = 'Analizar'; $strAnalyzeTable = 'Analizar tabela'; $strAnd = 'E'; $strAndThen = 'e então'; @@ -129,6 +132,7 @@ $strCharsetOfFile = 'Conjunto de caracteres do arquivo'; $strCharsetsAndCollations = 'Conjuntos de caracteres e Collations'; $strCharsets = 'Conjuntos de caracteres'; $strCheckAll = 'Marcar todos'; +$strCheck = 'Checar'; $strCheckOverhead = 'Verificar sobre-carga'; $strCheckPrivsLong = 'Verificar privilégios para a Banco de Dados "%s".'; $strCheckPrivs = 'Verificar privilégios'; @@ -139,6 +143,7 @@ $strCollation = 'Collation'; $strColumnNames = 'Nome das colunas'; $strColumnPrivileges = 'Privilégios específicos da coluna'; $strCommand = 'Comando'; +$strComment = 'Cometário'; $strComments = 'Comentários'; $strCompatibleHashing = 'Compatível com MySQL 4.0'; $strCompleteInserts = 'Inserções completas'; @@ -185,6 +190,7 @@ $strDanish = 'Dinamarquês'; $strDatabase = 'Banco de Dados'; $strDatabaseEmpty = 'O nome do Banco de Dados está em branco!'; $strDatabaseExportOptions = 'Opções de exportação do Banco de Dados'; +$strDatabaseHasBeenCreated = 'Banco de dados %1$s foi criado.'; $strDatabaseHasBeenDropped = 'Banco de Dados %s foi eliminado.'; $strDatabases = 'Banco de Dados'; $strDatabasesDropped = 'Banco de Dados %s foi eliminado com sucesso!'; @@ -220,6 +226,7 @@ $strDescending = 'Descendente'; $strDescription = 'Descrição'; $strDesigner = 'Designer'; $strDesignerHelpDisplayField = 'O campo de exibição está em rosa. Para ajustar/desajustar um campo como campo de exibição, clique no ícone "Escolher campo para exibição", então clique no nome do campo apropriado.'; +$strDetails = 'Detalhes...'; $strDictionary = 'dicionário'; $strDirectLinks = 'Links diretos'; $strDirtyPages = 'Páginas sujas'; @@ -267,6 +274,7 @@ $strEscapeWildcards = 'Coringas _ e % precisam ser precedidos com uma \ para ser $strEsperanto = 'Esperanto'; $strEstonian = 'Estoniano'; $strEvent = 'Evento'; +$strEvents = 'Eventos'; $strExcelEdition = 'Edição do Excel'; $strExecuteBookmarked = 'Executar consulta marcada'; $strExplain = 'Explicar SQL'; @@ -299,6 +307,7 @@ $strFlushQueryCache = 'Nivelar cache da consulta'; //está correto isso? $strFlushTable = 'Limpar a tabela ("LIMPAR")'; $strFlushTables = 'Nivelar (fechar) todas as tabelas'; //está correto isso? $strFontSize = 'Tamanho da fonte'; +$strForeignKeyError = 'Erro ao criar chave externa no %1$s (check data types)'; $strFormat = 'Formato'; $strFormEmpty = 'Faltando valores no formulário!'; $strFreePages = 'Páginas livres'; @@ -351,6 +360,7 @@ $strImportFormat = 'Formato do arquivo importado'; $strImport = 'Importar'; $strImportSuccessfullyFinished = 'Importação finalizada com sucesso, %d consultas executadas.'; $strIndexes = 'Índices'; +$strIndexesSeemEqual = 'A indexação %1$s e %2$s parecem ser iguais ou uma delas pode ter sido removida.'; $strIndexHasBeenDropped = 'Índice %s foi eliminado'; $strIndex = 'Índice'; $strIndexName = 'Nome do índice:'; @@ -367,7 +377,9 @@ $strInnoDBPages = 'páginas'; $strInnodbStat = 'Status do InnoDB'; $strInsecureMySQL = 'O seu arquivo de configuração contém configurações (root sem senha) que correspondem à conta privilegiada padrão do MySQL. O servidor MySQL rodando com esse padrão estará aberto a invasões, você realmente deveria corrigir este furo de segurança.'; $strInsertAsNewRow = 'Inserir como um novo registro'; +$strInsertedRowId = 'Id da linha inserida: %1$d'; $strInsert = 'Inserir'; +$strInterface = 'Interface'; // Não há tradução clara... $strInternalRelationAdded = 'Adicionado relacionamento Interno'; $strInternalRelations = 'Relações internas'; $strInUse = 'em uso'; @@ -518,17 +530,23 @@ $strOpenDocumentText = 'Abrir Documento de Texto'; $strOpenNewWindow = 'Abrir nova janela do phpMyAdmin'; $strOperations = 'Operações'; $strOperator = 'Operador'; +$strOptimize = 'Otimizar'; $strOptimizeTable = 'Otimizar tabela'; $strOptions = 'Opções'; $strOr = 'Ou'; $strOverhead = 'Sobrecarga'; $strOverwriteExisting = 'Sobrescrever arquivo(s) existente(s)'; +$strPacked = 'Pacote'; $strPageNumber = 'Numero da página:'; $strPagesToBeFlushed = 'Páginas para serem niveladas'; $strPaperSize = 'Tamanho do papel'; $strPartialImport = 'Importação parcial'; $strPartialText = 'Textos parciais'; +$strPartitionDefinition = 'Definição da PARTIÇÃO'; +$strPartitioned = 'Particionado'; +$strPartitionMaintenance = 'Manutenção da partição'; +$strPartition = 'Partição %s'; $strPasswordChanged = 'A senha para %s foi modificada com sucesso.'; $strPasswordEmpty = 'A senhas está em branco!'; $strPasswordHashing = 'Hashing da senha'; // Hashing nao tem traducao @@ -573,6 +591,7 @@ $strPrivDescCreateView = 'Permitir criar novas visões.'; $strPrivDescDelete = 'Permitir apagar dados.'; $strPrivDescDropDb = 'Permitir eliminar Banco de Dados e tabelas.'; $strPrivDescDropTbl = 'Permitir eliminar tabelas.'; +$strPrivDescEvent = 'Permitir iniciar eventos no cronograma de eventos'; $strPrivDescExecute5 = 'Permitir executar stored routines.'; $strPrivDescExecute = 'Permitir rodar "stored procedures"; Sem efeitos nesta versão do MySQL.'; $strPrivDescFile = 'Permitir importar dados e exportar dados em arquivos.'; @@ -584,6 +603,7 @@ $strPrivDescMaxConnections = 'Limitar o numero de novas conexões que o usuário $strPrivDescMaxQuestions = 'Limitar o número de consultas que podem ser enviadas ao servidor por hora.'; $strPrivDescMaxUpdates = 'Limitar o número de comandos que alteram Bancos de Dados ou tabelas que o usuário pode executar por hora.'; $strPrivDescMaxUserConnections = 'Limitar o número de conexões simultâneas que o usuário pode ter.'; +$strPrivDescProcess = 'Permitir visualizar processos de todos os usuários'; $strPrivDescReferences = 'Sem efeitos nesta versão do MySQL.'; $strPrivDescReload = 'Permitir recarregar configurações do servidor e descarregar o cache do servidor.'; $strPrivDescReplClient = 'Permitir que o usuário pergunte onde estão os escravos / mestres.'; @@ -593,6 +613,7 @@ $strPrivDescShowDb = 'Permitir acesso completo à lista de Bancos de Dados.'; $strPrivDescShowView = 'Permitir executar consultas SHOW CREATE VIEW.'; $strPrivDescShutdown = 'Permitir desligar o servidor.'; $strPrivDescSuper = 'Permitir conectar, se o numero máximo de conexões for alcançado; Necessário para muitas operações administrativas, como setar variáveis globais e matar processos de outros usuários.'; +$strPrivDescTrigger = 'Permitir criar e e largar em cadeia'; //será que ta certo? $strPrivDescUpdate = 'Permitir modificar dados.'; $strPrivDescUsage = 'Sem privilégios.'; $strPrivileges = 'Privilégios'; @@ -600,6 +621,7 @@ $strPrivilegesReloaded = 'Os privilégios foram recarregados com sucesso.'; $strProcedures = 'Procedimentos'; $strProcesses = 'Processos'; $strProcesslist = 'Lista de processos'; +$strProfiling = 'Perfil'; $strProtocolVersion = 'Versão do Protocolo'; $strPutColNames = 'Colocar nome do campo na primeira linha'; @@ -617,11 +639,13 @@ $strQueryType = 'Tipo de consulta'; $strQueryWindowLock = 'Não sobrescrever esta consulta fora desta janela'; $strReadRequests = 'Leitura requisitada'; +$strRebuild = 'Reconstruir'; $strReceived = 'Recebido'; $strRecommended = 'recomendado'; $strRecords = 'Registros'; $strReferentialIntegrity = 'Verificar integridade referencial:'; $strRefresh = 'Atualizar'; +$strRelationalKey = 'Chave de relação'; $strRelationalSchema = 'Esquema relacional'; $strRelationDeleted = 'Relacionamento apagado'; $strRelationNotWorking = 'Os recursos adicionais para trabalhar com tabelas linkadas foram desativadas. Para descobrir o motivo clique %saqui%s.'; @@ -631,10 +655,12 @@ $strRelationView = 'Ver relações'; $strReloadingThePrivileges = 'Recarregando os privilégios'; $strReloadPrivileges = 'Recarregar privilégios'; $strReload = 'Recarregar'; +$strRemovePartitioning = 'Remover partição'; $strRemoveSelectedUsers = 'Remover os usuários selecionados'; $strRenameDatabaseOK = 'O Banco de Dados %s foi renomeado para %s'; $strRenameTableOK = 'Tabela %s renomeada para %s'; $strRenameTable = 'Renomear a tabela para '; +$strRepair = 'Reparar'; $strRepairTable = 'Reparar tabela'; $strReplaceNULLBy = 'Substituir NULL por'; $strReplaceTable = 'Substituir os dados da tabela pelos do arquivo'; @@ -651,7 +677,10 @@ $strRomanian = 'Romêno'; $strRoutineReturnType = 'Tipo de returno'; $strRoutines = 'Rotinas'; $strRowLength = 'Tamanho do registro'; +$strRowsAffected = '%1$d linha(s) afetadas.'; +$strRowsDeleted = '%1$d linhas(s) excluídas.'; $strRowsFrom = 'registro(s) começando de'; +$strRowsInserted = '%1$d linha(s) inseridas.'; $strRowSize = ' Tamanho do registro '; $strRowsModeFlippedHorizontal = 'horizontal (cabeçalhos rotacionados)'; $strRowsModeHorizontal = 'horizontal'; @@ -670,6 +699,7 @@ $strSavePosition = 'Salvar posição'; $strSave = 'Salvar'; $strScaleFactorSmall = 'A escala é muito pequena para ajustar o esquema em uma página'; $strSearchFormTitle = 'Procurar no Banco de Dados'; +$strSearchInField = 'Dentro do campo:'; $strSearchInTables = 'Dentro da(s) tabela(s):'; $strSearchNeedle = 'Palavra(s) ou valor(es) para procurar (coringa: "%"):'; $strSearchOption1 = 'pelo menos uma das palavras'; @@ -873,14 +903,19 @@ $strStructure = 'Estrutura'; $strStructureForView = 'Estrutura para visualizar'; $strSubmit = 'Submeter'; $strSuccess = 'Seu comando SQL foi executado com sucesso'; +$strSuhosin = 'Servidor rodando com \'Suhosin\'. Verifique a %sdocumentation%s para possíveis razões do erro.'; $strSum = 'Soma'; $strSwedish = 'Suéco'; +$strSwekeyAuthenticating = 'Autenticando...'; +$strSwekeyAuthFailed = 'Falha na autenticação de hardware'; $strSwitchToDatabase = 'Mudar para o Banco de Dados copiado'; $strSwitchToTable = 'Mudar para a tabela copiada'; $strTableAlreadyExists = 'Tabela %s já existe!'; +$strTableAlteredSuccessfully = 'A tabela %1$s foi alterada com sucesso'; $strTableComments = 'Comentários da tabela'; $strTableEmpty = 'O Nome da Tabela está vazio!'; +$strTableHasBeenCreated = 'A tabela %1$s foi criada.'; $strTableHasBeenDropped = 'Tabela %s foi eliminada'; $strTableHasBeenEmptied = 'Tabela %s foi esvaziada'; $strTableHasBeenFlushed = 'Tabela %s foi limpa'; @@ -896,6 +931,7 @@ $strTakeIt = 'tome'; $strTblPrivileges = 'Privilégios específicos da tabela'; $strTempData = 'Dados temporários'; $strTextAreaLength = ' Por causa da sua largura,
esse campo pode não ser editável '; +$strTexyText = 'Texy! texto'; // Texy?? $strThai = 'Thailandês'; $strThemeDefaultNotFound = 'Tema padrão %s não encontrado!'; $strThemeNoPreviewAvailable = 'Nenhuma pré-visualização disponível.'; @@ -969,7 +1005,7 @@ $strUserOverview = 'Avaliação dos usuários'; $strUsersDeleted = 'Os usuários selecionados foram apagados com sucesso.'; $strUsersHavingAccessToDb = 'Usuários que têm acesso à "%s"'; $strUser = 'Usuário'; -$strUseTabKey = 'Usar a teclar TAB para se mover de valor em valor, ou CTRL+setas para mover em qualquer direção'; +$strUseTabKey = 'Usar a tecla TAB para se mover de valor em valor, ou CTRL+setas para mover em qualquer direção'; $strUseTables = 'Usar tabelas'; $strUseTextField = 'Usar campo texto'; $strUseThisValue = 'Usar este valor'; @@ -1003,76 +1039,10 @@ $strYes = 'Sim'; $strZeroRemovesTheLimit = 'Nota: Ajustar essa opção para 0 (zero) remove os limites.'; $strZip = '"compactado com zip"'; -$strProfiling = 'Profiling'; //to translate -$strPartitionDefinition = 'PARTITION definition'; //to translate -$strPrivDescTrigger = 'Allows creating and dropping triggers'; //to translate -$strPrivDescEvent = 'Allows to set up events for the event scheduler'; //to translate -$strPrivDescProcess = 'Allows viewing processes of all users'; //to translate -$strPartitioned = 'partitioned'; //to translate -$strTableAlteredSuccessfully = 'Table %1$s has been altered successfully'; //to translate -$strDatabaseHasBeenCreated = 'Database %1$s has been created.'; //to translate -$strTableHasBeenCreated = 'Table %1$s has been created.'; //to translate -$strForeignKeyError = 'Error creating foreign key on %1$s (check data types)'; //to translate -$strRowsDeleted = '%1$d row(s) deleted.'; //to translate -$strRowsAffected = '%1$d row(s) affected.'; //to translate -$strRowsInserted = '%1$d row(s) inserted.'; //to translate -$strInsertedRowId = 'Inserted row id: %1$d'; //to translate -$strIndexesSeemEqual = 'The indexes %1$s and %2$s seem to be equal and one of them could possibly be removed.'; //to translate -$strPartitionMaintenance = 'Partition maintenance'; //to translate -$strPartition = 'Partition %s'; //to translate -$strAnalyze = 'Analyze'; //to translate -$strCheck = 'Check'; //to translate -$strOptimize = 'Optimize'; //to translate -$strRebuild = 'Rebuild'; //to translate -$strRepair = 'Repair'; //to translate -$strRemovePartitioning = 'Remove partitioning'; //to translate -$strSearchInField = 'Inside field:'; //to translate -$strTexyText = 'Texy! text'; //to translate -$strDetails = 'Details...'; //to translate -$strComment = 'Comment'; //to translate -$strPacked = 'Packed'; //to translate -$strActions = 'Actions'; //to translate -$strInterface = 'Interface'; //to translate -$strSuhosin = 'Server running with Suhosin. Please refer to %sdocumentation%s for possible issues.'; //to translate -$strEvents = 'Events'; //to translate -$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate -$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate -$strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate -$strRelationalKey = 'Relational key'; //to translate -$strRelationalDisplayField = 'Relational display field'; //to translate -$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate -$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate -$strSwekeyAuthFailed = 'Hardware authentication failed'; //to translate -$strSwekeyAuthenticating = 'Authenticating...'; //to translate -$strPBXTIndexCacheSize = 'Index cache size'; //to translate -$strPBXTRecordCacheSize = 'Record cache size'; //to translate -$strPBXTLogCacheSize = 'Log cache size'; //to translate -$strPBXTLogFileThreshold = 'Log file threshold'; //to translate -$strPBXTTransactionBufferSize = 'Transaction buffer size'; //to translate -$strPBXTCheckpointFrequency = 'Checkpoint frequency'; //to translate -$strPBXTDataLogThreshold = 'Data log threshold'; //to translate -$strPBXTGarbageThreshold = 'Garbage threshold'; //to translate -$strPBXTLogBufferSize = 'Log buffer size'; //to translate -$strPBXTDataFileGrowSize = 'Data file grow size'; //to translate -$strPBXTRowFileGrowSize = 'Row file grow size'; //to translate -$strPBXTRowFileGrowSizeDesc = 'The grow size of the row pointer (.xtr) files.'; //to translate -$strPBXTDataFileGrowSizeDesc = 'The grow size of the handle data (.xtd) files.'; //to translate -$strPBXTLogBufferSizeDesc = 'The size of the buffer used when writing a data log. The default is 256MB. The engine allocates one buffer per thread, but only if the thread is required to write a data log.'; //to translate -$strPBXTGarbageThresholdDesc = 'The percentage of garbage in a data log file before it is compacted. This is a value between 1 and 99. The default is 50.'; //to translate -$strPBXTDataLogThresholdDesc = 'The maximum size of a data log file. The default value is 64MB. PBXT can create a maximum of 32000 data logs, which are used by all tables. So the value of this variable can be increased to increase the total amount of data that can be stored in the database.'; //to translate -$strPBXTCheckpointFrequencyDesc = 'The amount of data written to the transaction log before a checkpoint is performed. The default value is 24MB.'; //to translate -$strPBXTTransactionBufferSizeDesc = 'The size of the global transaction log buffer (the engine allocates 2 buffers of this size). The default is 1MB.'; //to translate -$strPBXTLogFileThresholdDesc = 'The size of a transaction log before rollover, and a new log is created. The default value is 16MB.'; //to translate -$strPBXTLogCacheSizeDesc = 'The amount of memory allocated to the transaction log cache used to cache on transaction log data. The default is 16MB.'; //to translate -$strPBXTRecordCacheSizeDesc = 'This is the amount of memory allocated to the record cache used to cache table data. The default value is 32MB. This memory is used to cache changes to the handle data (.xtd) and row pointer (.xtr) files.'; //to translate -$strPBXTIndexCacheSizeDesc = 'This is the amount of memory allocated to the index cache. Default value is 32MB. The memory allocated here is used only for caching index pages.'; //to translate -$strPBXTLogFileCount = 'Log file count'; //to translate -$strPBXTLogFileCountDesc = 'This is the number of transaction log files (pbxt/system/xlog*.xt) the system will maintain. If the number of logs exceeds this value then old logs will be deleted, otherwise they are renamed and given the next highest number.'; //to translate +// To translate: +$strAndSmall = 'and'; //to translate $strAsDefined = 'As defined:'; //to translate -$strWiki = 'Wiki'; //to translate -$strWebServer = 'Web server'; //to translate -$strPHPExtension = 'PHP extension'; //to translate -$strCustomColor = 'Custom color'; //to translate + $strBLOBRepository = 'BLOB Repository'; //to translate $strBLOBRepositoryDamaged = 'Damaged'; //to translate $strBLOBRepositoryDisableAreYouSure = 'Are you sure you want to disable all BLOB references for database %s?'; //to translate @@ -1085,377 +1055,424 @@ $strBLOBRepositoryRemove = 'Remove BLOB Repository Reference'; //to translate $strBLOBRepositoryRepair = 'Repair'; //to translate $strBLOBRepositoryStatus = 'Status'; //to translate $strBLOBRepositoryUpload = 'Upload to BLOB repository'; //to translate -$strViewImage = 'View image'; //to translate -$strPlayAudio = 'Play audio'; //to translate -$strViewVideo = 'View video'; //to translate + +$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate +$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"'; //to translate +$strCustomColor = 'Custom color'; //to translate + +$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate $strDownloadFile = 'Download file'; //to translate + +$strForeignKeyRelationAdded = 'FOREIGN KEY relation added'; //to translate + +$strGetMoreThemes = 'Get more themes!'; //to translate + +$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate + +$strInternalAndForeign = 'An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'; //to translate + +$strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate $strLogServerHelp = 'You can enter hostname/IP address and port separated by space.'; //to translate -$strShowKeys = 'Only show keys'; //to translate -$strSetupServersAdd = 'Add a new server'; //to translate -$strSetupServersEdit = 'Edit server'; //to translate -$strSetupFormset_features = 'Features'; //to translate -$strSetupFormset_left_frame = 'Customize navigation frame'; //to translate -$strSetupFormset_main_frame = 'Customize main frame'; //to translate -$strSetupFormset_import = 'Customize import defaults'; //to translate -$strSetupFormset_export = 'Customize export options'; //to translate -$strSetupFormset_customization = 'Customization'; //to translate -$strSetupTrue = 'yes'; //to translate -$strSetupFalse = 'no'; //to translate -$strSetupDisplay = 'Display'; //to translate -$strSetupDownload = 'Download'; //to translate -$strSetupClear = 'Clear'; //to translate -$strSetupLoad = 'Load'; //to translate -$strSetupRestoreDefaultValue = 'Restore default value'; //to translate -$strSetupSetValue = 'Set value: %s'; //to translate -$strSetupWarning = 'Warning'; //to translate -$strSetupIgnoreErrors = 'Ignore errors'; //to translate -$strSetupRevertErroneousFields = 'Try to revert erroneous fields to their default values'; //to translate -$strSetupShowForm = 'Show form'; //to translate -$strSetupOverview = 'Overview'; //to translate -$strSetupShowHiddenMessages = 'Show hidden messages (#MSG_COUNT)'; //to translate -$strSetupNoServers = 'There are no configured servers'; //to translate -$strSetupNewServer = 'New server'; //to translate -$strSetupDefaultLanguage = 'Default language'; //to translate -$strSetupDefaultServer = 'Default server'; //to translate -$strSetupLetUserChoose = 'let the user choose'; //to translate -$strSetupOptionNone = '- none -'; //to translate -$strSetupEndOfLine = 'End of line'; //to translate -$strSetupConfigurationFile = 'Configuration file'; //to translate -$strSetupHomepageLink = 'phpMyAdmin homepage'; //to translate -$strSetupDonateLink = 'Donate'; //to translate -$strSetupVersionCheckLink = 'Check for latest version'; //to translate + +$strNoneDefault = 'None'; //to translate + +$strPBXTCheckpointFrequency = 'Checkpoint frequency'; //to translate +$strPBXTCheckpointFrequencyDesc = 'The amount of data written to the transaction log before a checkpoint is performed. The default value is 24MB.'; //to translate +$strPBXTDataFileGrowSize = 'Data file grow size'; //to translate +$strPBXTDataFileGrowSizeDesc = 'The grow size of the handle data (.xtd) files.'; //to translate +$strPBXTDataLogThreshold = 'Data log threshold'; //to translate +$strPBXTDataLogThresholdDesc = 'The maximum size of a data log file. The default value is 64MB. PBXT can create a maximum of 32000 data logs, which are used by all tables. So the value of this variable can be increased to increase the total amount of data that can be stored in the database.'; //to translate +$strPBXTGarbageThresholdDesc = 'The percentage of garbage in a data log file before it is compacted. This is a value between 1 and 99. The default is 50.'; //to translate +$strPBXTGarbageThreshold = 'Garbage threshold'; //to translate +$strPBXTIndexCacheSizeDesc = 'This is the amount of memory allocated to the index cache. Default value is 32MB. The memory allocated here is used only for caching index pages.'; //to translate +$strPBXTIndexCacheSize = 'Index cache size'; //to translate +$strPBXTLogBufferSizeDesc = 'The size of the buffer used when writing a data log. The default is 256MB. The engine allocates one buffer per thread, but only if the thread is required to write a data log.'; //to translate +$strPBXTLogBufferSize = 'Log buffer size'; //to translate +$strPBXTLogCacheSizeDesc = 'The amount of memory allocated to the transaction log cache used to cache on transaction log data. The default is 16MB.'; //to translate +$strPBXTLogCacheSize = 'Log cache size'; //to translate +$strPBXTLogFileCountDesc = 'This is the number of transaction log files (pbxt/system/xlog*.xt) the system will maintain. If the number of logs exceeds this value then old logs will be deleted, otherwise they are renamed and given the next highest number.'; //to translate +$strPBXTLogFileCount = 'Log file count'; //to translate +$strPBXTLogFileThresholdDesc = 'The size of a transaction log before rollover, and a new log is created. The default value is 16MB.'; //to translate +$strPBXTLogFileThreshold = 'Log file threshold'; //to translate +$strPBXTRecordCacheSizeDesc = 'This is the amount of memory allocated to the record cache used to cache table data. The default value is 32MB. This memory is used to cache changes to the handle data (.xtd) and row pointer (.xtr) files.'; //to translate +$strPBXTRecordCacheSize = 'Record cache size'; //to translate +$strPBXTRowFileGrowSizeDesc = 'The grow size of the row pointer (.xtr) files.'; //to translate +$strPBXTRowFileGrowSize = 'Row file grow size'; //to translate +$strPBXTTransactionBufferSizeDesc = 'The size of the global transaction log buffer (the engine allocates 2 buffers of this size). The default is 1MB.'; //to translate +$strPBXTTransactionBufferSize = 'Transaction buffer size'; //to translate +$strPHPExtension = 'PHP extension'; //to translate +$strPlayAudio = 'Play audio'; //to translate + +$strRelationalDisplayField = 'Relational display field'; //to translate +$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate +$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate +$strReplicationStatus_master = 'Master status'; //to translate +$strReplicationStatus = 'Replication status'; //to translate +$strReplicationStatus_slave = 'Slave status'; //to translate + +$strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'; //to translate +$strSetupAllowAnywhereRecoding_name = 'Allow character set conversion'; //to translate +$strSetupAllowArbitraryServer_desc = 'If enabled user can enter any MySQL server in login form for cookie auth'; //to translate +$strSetupAllowArbitraryServerMsg = 'This [a@?page=form&formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'; //to translate +$strSetupAllowArbitraryServer_name = 'Allow login to any MySQL server'; //to translate +$strSetupAllowUserDropDatabase_name = 'Show "Drop database" link to normal users'; //to translate +$strSetupBlowfishSecretCharsMsg = 'Key should contain letters, numbers [em]and[/em] special characters'; //to translate +$strSetupblowfish_secret_desc = 'Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication'; //to translate +$strSetupBlowfishSecretLengthMsg = 'Key is too short, it should have at least 8 characters'; //to translate +$strSetupBlowfishSecretMsg = 'You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.'; //to translate +$strSetupblowfish_secret_name = 'Blowfish secret'; //to translate +$strSetupBrowseMarkerEnable_desc = 'Highlight selected rows'; //to translate +$strSetupBrowseMarkerEnable_name = 'Row marker'; //to translate +$strSetupBrowsePointerEnable_desc = 'Highlight row pointed by the mouse cursor'; //to translate +$strSetupBrowsePointerEnable_name = 'Highlight pointer'; //to translate +$strSetupBZipDump_desc = 'Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for import and export operations'; //to translate +$strSetupBZipDump_name = 'Bzip2'; //to translate +$strSetupBZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; //to translate $strSetupCannotLoadConfig = 'Cannot load or save configuration'; //to translate $strSetupCannotLoadConfigMsg = 'Please create web server writable folder [em]config[/em] in phpMyAdmin top level directory as described in [a@../Documentation.html#setup_script]documentation[/a]. Otherwise you will be only able to download or display it.'; //to translate -$strSetupInsecureConnection = 'Insecure connection'; //to translate -$strSetupInsecureConnectionMsg2 = 'If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.'; //to translate -$strSetupVersionCheck = 'Version check'; //to translate -$strSetupVersionCheckWrapperError = 'Neither URL wrapper nor CURL is available. Version check is not possible.'; //to translate -$strSetupVersionCheckDataError = 'Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.'; //to translate -$strSetupVersionCheckInvalid = 'Got invalid version string from server'; //to translate -$strSetupVersionCheckUnparsable = 'Unparsable version string'; //to translate -$strSetupVersionCheckNewAvailableSvn = 'You are using subversion version, run [kbd]svn update[/kbd] :-)[br]The latest stable version is %s, released on %s.'; //to translate -$strSetupVersionCheckNone = 'No newer stable version is available'; //to translate -$strSetupServerSecurityInfoMsg = 'If you feel this is necessary, use additional protection settings - [a@?page=servers&mode=edit&id=%1$d#tab_Server_config]host authentication[/a] settings and [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'; //to translate -$strSetupServerSslMsg = 'You should use SSL connections if your web server supports it'; //to translate -$strSetupServerExtensionMsg = 'You should use mysqli for performance reasons'; //to translate -$strSetupBlowfishSecretLengthMsg = 'Key is too short, it should have at least 8 characters'; //to translate -$strSetupForceSSLMsg = 'This [a@?page=form&formset=features#tab_Security]option[/a] should be enabled if your web server supports it'; //to translate -$strSetupAllowArbitraryServerMsg = 'This [a@?page=form&formset=features#tab_Security]option[/a] should be disabled as it allows attackers to bruteforce login to any MySQL server. If you feel this is necessary, use [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'; //to translate -$strSetupLoginCookieValidityMsg = '[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.'; //to translate +$strSetupCharEditing_desc = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields'; //to translate +$strSetupCharEditing_name = 'CHAR fields editing'; //to translate +$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas'; //to translate +$strSetupCharTextareaCols_name = 'CHAR textarea columns'; //to translate +$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas'; //to translate +$strSetupCharTextareaRows_name = 'CHAR textarea rows'; //to translate +$strSetupCheckConfigurationPermissions_name = 'Check config file permissions'; //to translate +$strSetupClear = 'Clear'; //to translate +$strSetupCompressOnFly_desc = 'Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature'; //to translate +$strSetupCompressOnFly_name = 'Compress on the fly'; //to translate +$strSetupConfigurationFile = 'Configuration file'; //to translate +$strSetupConfirm_desc = 'Whether a warning ("Are your really sure...") should be displayed when you\'re about to lose data'; //to translate +$strSetupConfirm_name = 'Confirm DROP queries'; //to translate +$strSetupDefaultCharset_desc = 'Default character set used for conversions'; //to translate +$strSetupDefaultCharset_name = 'Default character set'; //to translate +$strSetupDefaultLanguage = 'Default language'; //to translate +$strSetupDefaultServer = 'Default server'; //to translate +$strSetupDefaultTabDatabase_desc = 'Tab that is displayed when entering a database'; //to translate +$strSetupDefaultTabDatabase_name = 'Default database tab'; //to translate +$strSetupDefaultTabServer_desc = 'Tab that is displayed when entering a server'; //to translate +$strSetupDefaultTabServer_name = 'Default server tab'; //to translate +$strSetupDefaultTabTable_desc = 'Tab that is displayed when entering a table'; //to translate +$strSetupDefaultTabTable_name = 'Default table tab'; //to translate $strSetupDirectoryNotice = 'This value should be double checked to ensure that this directory is neither world accessible nor readable or writable by other users on your server.'; //to translate -$strSetupGZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; //to translate -$strSetupBZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]Bzip2 compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; //to translate -$strSetupZipDumpImportWarning = '[a@?page=form&formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.'; //to translate -$strSetupZipDumpExportWarning = '[a@?page=form&formset=features#tab_Import_export]Zip compression[/a] requires functions (%s) which are unavailable on this system.'; //to translate -$strSetuperror_form = 'Submitted form contains errors'; //to translate -$strSetuperror_missing_field_data = 'Missing data for %s'; //to translate -$strSetuperror_incorrect_port = 'Not a valid port number'; //to translate -$strSetuperror_incorrect_value = 'Incorrect value'; //to translate -$strSetuperror_incorrect_ip_address = 'Incorrect IP address: %s'; //to translate -$strSetuperror_nan_p = 'Not a positive number'; //to translate -$strSetuperror_nan_nneg = 'Not a non-negative number'; //to translate -$strSetuperror_empty_pmadb_user = 'Empty phpMyAdmin control user while using pmadb'; //to translate +$strSetupDisplayDatabasesList_desc = 'Show database listing as a list instead of a drop down'; //to translate +$strSetupDisplayDatabasesList_name = 'Display databases as a list'; //to translate +$strSetupDisplay = 'Display'; //to translate +$strSetupDisplayServersList_desc = 'Show server listing as a list instead of a drop down'; //to translate +$strSetupDisplayServersList_name = 'Display servers as a list'; //to translate +$strSetupDonateLink = 'Donate'; //to translate +$strSetupDownload = 'Download'; //to translate +$strSetupEndOfLine = 'End of line'; //to translate +$strSetuperror_connection = 'Could not connect to MySQL server'; //to translate $strSetuperror_empty_pmadb_password = 'Empty phpMyAdmin control user password while using pmadb'; //to translate -$strSetuperror_empty_user_for_config_auth = 'Empty username while using config authentication method'; //to translate +$strSetuperror_empty_pmadb_user = 'Empty phpMyAdmin control user while using pmadb'; //to translate $strSetuperror_empty_signon_session = 'Empty signon session name while using signon authentication method'; //to translate $strSetuperror_empty_signon_url = 'Empty signon URL while using signon authentication method'; //to translate -$strSetuperror_connection = 'Could not connect to MySQL server'; //to translate -$strSetupForm_Server = 'Basic settings'; //to translate -$strSetupForm_Server_desc = 'Enter server connection parameters'; //to translate -$strSetupForm_Server_login_options = 'Signon login options'; //to translate -$strSetupForm_Server_login_options_desc = 'Enter login options for signon authentication'; //to translate -$strSetupForm_Server_config = 'Server configuration'; //to translate -$strSetupForm_Server_config_desc = 'Advanced server configuration, do not change these options unless you know what they are for'; //to translate -$strSetupForm_Server_pmadb = 'PMA database'; //to translate -$strSetupForm_Server_pmadb_desc = 'Configure phpMyAdmin database to gain access to additional features, see [a@../Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation'; //to translate -$strSetupForm_Import_export = 'Import / export'; //to translate -$strSetupForm_Import_export_desc = 'Set import and export directories and compression options'; //to translate -$strSetupForm_Security = 'Security'; //to translate -$strSetupForm_Security_desc = 'Please note that phpMyAdmin is just a user interface and its features do not limit MySQL'; //to translate -$strSetupForm_Sql_queries = 'SQL queries'; //to translate -$strSetupForm_Sql_queries_desc = 'SQL queries settings, for SQL Query box options see [a@?page=form&formset=main_frame#tab_Sql_box]Navigation frame[/a] settings'; //to translate -$strSetupForm_Other_core_settings = 'Other core settings'; //to translate -$strSetupForm_Other_core_settings_desc = 'Settings that didn\'t fit enywhere else'; //to translate -$strSetupForm_Left_frame = 'Navigation frame'; //to translate -$strSetupForm_Left_frame_desc = 'Customize appearance of the navigation frame'; //to translate -$strSetupForm_Left_servers = 'Servers'; //to translate -$strSetupForm_Left_servers_desc = 'Servers display options'; //to translate -$strSetupForm_Left_databases = 'Databases'; //to translate -$strSetupForm_Left_databases_desc = 'Databases display options'; //to translate -$strSetupForm_Left_tables = 'Tables'; //to translate -$strSetupForm_Left_tables_desc = 'Tables display options'; //to translate -$strSetupForm_Main_frame = 'Main frame'; //to translate -$strSetupForm_Startup = 'Startup'; //to translate -$strSetupForm_Startup_desc = 'Customize startup page'; //to translate -$strSetupForm_Browse = 'Browse mode'; //to translate -$strSetupForm_Browse_desc = 'Customize browse mode'; //to translate -$strSetupForm_Edit = 'Edit mode'; //to translate -$strSetupForm_Edit_desc = 'Customize edit mode'; //to translate -$strSetupForm_Tabs = 'Tabs'; //to translate -$strSetupForm_Tabs_desc = 'Choose how you want tabs to work'; //to translate -$strSetupForm_Sql_box = 'SQL Query box'; //to translate -$strSetupForm_Sql_box_desc = 'Customize links shown in SQL Query boxes'; //to translate -$strSetupForm_Import_defaults = 'Import defaults'; //to translate -$strSetupForm_Import_defaults_desc = 'Customize default common import options'; //to translate -$strSetupForm_Export_defaults = 'Export defaults'; //to translate -$strSetupForm_Export_defaults_desc = 'Customize default export options'; //to translate -$strSetupForm_Query_window = 'Query window'; //to translate -$strSetupForm_Query_window_desc = 'Customize query window options'; //to translate -$strSetupServers_verbose_name = 'Verbose name of this server'; //to translate -$strSetupServers_host_name = 'Server hostname'; //to translate -$strSetupServers_port_name = 'Server port'; //to translate -$strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default'; //to translate -$strSetupServers_socket_name = 'Server socket'; //to translate -$strSetupServers_socket_desc = 'Socket on which MySQL server is listening, leave empty for default'; //to translate -$strSetupServers_ssl_name = 'Use SSL'; //to translate -$strSetupServers_ssl_desc = ''; //to translate -$strSetupServers_connect_type_name = 'Connection type'; //to translate -$strSetupServers_connect_type_desc = 'How to connect to server, keep tcp if unsure'; //to translate -$strSetupServers_extension_name = 'PHP extension to use'; //to translate -$strSetupServers_compress_name = 'Compress connection'; //to translate -$strSetupServers_compress_desc = 'Compress connection to MySQL server'; //to translate -$strSetupServers_auth_type_name = 'Authentication type'; //to translate -$strSetupServers_auth_type_desc = 'Authentication method to use'; //to translate -$strSetupServers_user_name = 'User for config auth'; //to translate -$strSetupServers_user_desc = 'Leave empty if not using config auth'; //to translate -$strSetupServers_password_name = 'Password for config auth'; //to translate -$strSetupServers_password_desc = 'Leave empty if not using config auth'; //to translate -$strSetupServers_nopassword_name = 'Connect without password'; //to translate -$strSetupServers_nopassword_desc = 'Try to connect without password'; //to translate -$strSetupServers_SignonSession_name = 'Signon session name'; //to translate -$strSetupServers_SignonSession_desc = 'See [a@http://wiki.phpmyadmin.net/pma/auth_types#signon]authentication types[/a] for an example'; //to translate -$strSetupServers_SignonURL_name = 'Signon URL'; //to translate -$strSetupServers_LogoutURL_name = 'Logout URL'; //to translate -$strSetupServers_auth_swekey_config_name = 'SweKey config file'; //to translate -$strSetupServers_only_db_name = 'Show only listed databases'; //to translate -$strSetupServers_only_db_desc = 'You can use MySQL wildcard characters (% and _), escape them if you want to use their literal instances, i.e. use \'my\_db\' and not \'my_db\''; //to translate -$strSetupServers_hide_db_name = 'Hide databases'; //to translate -$strSetupServers_hide_db_desc = 'Hide databases matching regular expression (PCRE)'; //to translate -$strSetupServers_AllowRoot_name = 'Allow root login'; //to translate -$strSetupServers_DisableIS_name = 'Disable use of INFORMATION_SCHEMA'; //to translate -$strSetupServers_DisableIS_desc = 'More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]'; //to translate -$strSetupServers_AllowDeny_order_name = 'Host authentication order'; //to translate -$strSetupServers_AllowDeny_order_desc = 'Leave blank if not used'; //to translate -$strSetupServers_AllowDeny_rules_name = 'Host authentication rules'; //to translate -$strSetupServers_AllowDeny_rules_desc = 'Leave blank for defaults'; //to translate -$strSetupServers_ShowDatabasesCommand_name = 'SHOW DATABASES command'; //to translate -$strSetupServers_ShowDatabasesCommand_desc = 'SQL command to fetch available databases'; //to translate -$strSetupServers_CountTables_name = 'Count tables'; //to translate -$strSetupServers_CountTables_desc = 'Count tables when showing database list'; //to translate -$strSetupServers_pmadb_name = 'PMA database'; //to translate -$strSetupServers_pmadb_desc = 'Database used for relations, bookmarks, and PDF features. See [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] for complete information. Leave blank for no support. Suggested: [kbd]phpmyadmin[/kbd]'; //to translate -$strSetupServers_controluser_name = 'Control user'; //to translate -$strSetupServers_controluser_desc = 'A special MySQL user configured with limited permissions, more information available on [a@http://wiki.phpmyadmin.net/pma/controluser]wiki[/a]'; //to translate -$strSetupServers_controlpass_name = 'Control user password'; //to translate -$strSetupServers_verbose_check_name = 'Verbose check'; //to translate -$strSetupServers_verbose_check_desc = 'Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance'; //to translate -$strSetupServers_bookmarktable_name = 'Bookmark table'; //to translate -$strSetupServers_bookmarktable_desc = 'Leave blank for no [a@http://wiki.phpmyadmin.net/pma/bookmark]bookmark[/a] support, suggested: [kbd]pma_bookmark[/kbd]'; //to translate -$strSetupServers_relation_name = 'Relation table'; //to translate -$strSetupServers_relation_desc = 'Leave blank for no [a@http://wiki.phpmyadmin.net/pma/relation]relation-links[/a] support, suggested: [kbd]pma_relation[/kbd]'; //to translate -$strSetupServers_table_info_name = 'Display fields table'; //to translate -$strSetupServers_table_info_desc = 'Table to describe the display fields, leave blank for no support; suggested: [kbd]pma_table_info[/kbd]'; //to translate -$strSetupServers_table_coords_name = 'PDF schema: table coordinates'; //to translate -$strSetupServers_table_coords_desc = 'Leave blank for no PDF schema support, suggested: [kbd]pma_table_coords[/kbd]'; //to translate -$strSetupServers_pdf_pages_name = 'PDF schema: pages table'; //to translate -$strSetupServers_pdf_pages_desc = 'Leave blank for no PDF schema support, suggested: [kbd]pma_pdf_pages[/kbd]'; //to translate -$strSetupServers_column_info_name = 'Column information table'; //to translate -$strSetupServers_column_info_desc = 'Leave blank for no column comments/mime types, suggested: [kbd]pma_column_info[/kbd]'; //to translate -$strSetupServers_history_name = 'SQL query history table'; //to translate -$strSetupServers_history_desc = 'Leave blank for no SQL query history support, suggested: [kbd]pma_history[/kbd]'; //to translate -$strSetupServers_designer_coords_name = 'Designer table'; //to translate -$strSetupServers_designer_coords_desc = 'Leave blank for no Designer support, suggested: [kbd]pma_designer_coords[/kbd]'; //to translate -$strSetupUploadDir_name = 'Upload directory'; //to translate -$strSetupUploadDir_desc = 'Directory on server where you can upload files for import'; //to translate -$strSetupSaveDir_name = 'Save directory'; //to translate -$strSetupSaveDir_desc = 'Directory where exports can be saved on server'; //to translate -$strSetupAllowAnywhereRecoding_name = 'Allow character set conversion'; //to translate -$strSetupDefaultCharset_name = 'Default character set'; //to translate -$strSetupDefaultCharset_desc = 'Default character set used for conversions'; //to translate -$strSetupRecodingEngine_name = 'Recoding engine'; //to translate -$strSetupRecodingEngine_desc = 'Select which functions will be used for character set conversion'; //to translate -$strSetupIconvExtraParams_name = 'Extra parameters for iconv'; //to translate -$strSetupZipDump_name = 'ZIP'; //to translate -$strSetupZipDump_desc = 'Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression for import and export operations'; //to translate -$strSetupGZipDump_name = 'GZip'; //to translate -$strSetupGZipDump_desc = 'Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import and export operations'; //to translate -$strSetupBZipDump_name = 'Bzip2'; //to translate -$strSetupBZipDump_desc = 'Enable [a@http://en.wikipedia.org/wiki/Bzip2]bzip2[/a] compression for import and export operations'; //to translate -$strSetupCompressOnFly_name = 'Compress on the fly'; //to translate -$strSetupCompressOnFly_desc = 'Compress gzip/bzip2 exports on the fly without the need for much memory; if you encounter problems with created gzip/bzip2 files disable this feature'; //to translate -$strSetupblowfish_secret_name = 'Blowfish secret'; //to translate -$strSetupblowfish_secret_desc = 'Secret passphrase used for encrypting cookies in [kbd]cookie[/kbd] authentication'; //to translate -$strSetupForceSSL_name = 'Force SSL connection'; //to translate -$strSetupForceSSL_desc = 'Force secured connection while using phpMyAdmin'; //to translate -$strSetupCheckConfigurationPermissions_name = 'Check config file permissions'; //to translate -$strSetupTrustedProxies_name = 'List of trusted proxies for IP allow/deny'; //to translate -$strSetupTrustedProxies_desc = 'Input proxies as [kbd]IP: trusted HTTP header[/kbd]. The following example specifies that phpMyAdmin should trust a HTTP_X_FORWARDED_FOR (X-Forwarded-For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: HTTP_X_FORWARDED_FOR[/kbd]'; //to translate -$strSetupAllowUserDropDatabase_name = 'Show "Drop database" link to normal users'; //to translate -$strSetupAllowArbitraryServer_name = 'Allow login to any MySQL server'; //to translate -$strSetupAllowArbitraryServer_desc = 'If enabled user can enter any MySQL server in login form for cookie auth'; //to translate -$strSetupLoginCookieRecall_name = 'Recall user name'; //to translate -$strSetupLoginCookieRecall_desc = 'Define whether the previous login should be recalled or not in cookie authentication mode'; //to translate -$strSetupLoginCookieValidity_name = 'Login cookie validity'; //to translate -$strSetupLoginCookieValidity_desc = 'Define how long (in seconds) a login cookie is valid'; //to translate -$strSetupLoginCookieStore_name = 'Login cookie store'; //to translate -$strSetupLoginCookieDeleteAll_name = 'Delete all cookies on logout'; //to translate -$strSetupShowSQL_name = 'Show SQL queries'; //to translate -$strSetupShowSQL_desc = 'Defines whether SQL queries generated by phpMyAdmin should be displayed'; //to translate -$strSetupConfirm_name = 'Confirm DROP queries'; //to translate -$strSetupConfirm_desc = 'Whether a warning ("Are your really sure...") should be displayed when you\'re about to lose data'; //to translate -$strSetupQueryHistoryDB_name = 'Permanent query history'; //to translate -$strSetupQueryHistoryDB_desc = 'Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).'; //to translate -$strSetupQueryHistoryMax_name = 'Query history length'; //to translate -$strSetupQueryHistoryMax_desc = 'How many queries are kept in history'; //to translate -$strSetupIgnoreMultiSubmitErrors_name = 'Ignore multiple statement errors'; //to translate -$strSetupVerboseMultiSubmit_name = 'Verbose multiple statements'; //to translate -$strSetupVerboseMultiSubmit_desc = 'Show affected rows of each statement on multiple-statement queries. See libraries/import.lib.php for defaults on how many queries a statement may contain.'; //to translate -$strSetupMaxDbList_name = 'Maximum databases'; //to translate -$strSetupMaxDbList_desc = 'Maximum number of databases displayed in left frame and database list'; //to translate -$strSetupMaxTableList_name = 'Maximum tables'; //to translate -$strSetupMaxTableList_desc = 'Maximum number of tables displayed in table list'; //to translate -$strSetupMaxCharactersInDisplayedSQL_name = 'Maximum displayed SQL length'; //to translate -$strSetupMaxCharactersInDisplayedSQL_desc = 'Maximum number of characters used when a SQL query is displayed'; //to translate -$strSetupOBGzip_name = 'GZip output buffering'; //to translate -$strSetupOBGzip_desc = 'use GZip output buffering for increased speed in HTTP transfers'; //to translate -$strSetupPersistentConnections_name = 'Persistent connections'; //to translate -$strSetupPersistentConnections_desc = 'Use persistent connections to MySQL databases'; //to translate -$strSetupExecTimeLimit_name = 'Maximum execution time'; //to translate +$strSetuperror_empty_user_for_config_auth = 'Empty username while using config authentication method'; //to translate +$strSetuperror_form = 'Submitted form contains errors'; //to translate +$strSetuperror_incorrect_ip_address = 'Incorrect IP address: %s'; //to translate +$strSetuperror_incorrect_port = 'Not a valid port number'; //to translate +$strSetuperror_incorrect_value = 'Incorrect value'; //to translate +$strSetuperror_missing_field_data = 'Missing data for %s'; //to translate +$strSetuperror_nan_nneg = 'Not a non-negative number'; //to translate +$strSetuperror_nan_p = 'Not a positive number'; //to translate $strSetupExecTimeLimit_desc = 'Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no limit)'; //to translate -$strSetupMemoryLimit_name = 'Memory limit'; //to translate -$strSetupMemoryLimit_desc = 'The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)'; //to translate -$strSetupSkipLockedTables_name = 'Skip locked tables'; //to translate -$strSetupSkipLockedTables_desc = 'Mark used tables and make it possible to show databases with locked tables'; //to translate -$strSetupUseDbSearch_name = 'Use database search'; //to translate -$strSetupUseDbSearch_desc = 'Allow for searching inside the entire database'; //to translate -$strSetupLeftFrameLight_name = 'Use light version'; //to translate -$strSetupLeftFrameLight_desc = 'Disable this if you want to see all databases at once'; //to translate -$strSetupLeftDisplayLogo_name = 'Display logo'; //to translate -$strSetupLeftDisplayLogo_desc = 'Show logo in left frame'; //to translate -$strSetupLeftLogoLink_name = 'Logo link URL'; //to translate -$strSetupLeftLogoLinkWindow_name = 'Logo link target'; //to translate -$strSetupLeftLogoLinkWindow_desc = 'Open the linked page in the main window ([kbd]main[/kbd]) or in a new one ([kbd]new[/kbd])'; //to translate -$strSetupLeftDefaultTabTable_name = 'Target for quick access icon'; //to translate -$strSetupLeftPointerEnable_name = 'Enable highlighting'; //to translate -$strSetupLeftPointerEnable_desc = 'Highlight server under the mouse cursor'; //to translate -$strSetupLeftDisplayServers_name = 'Display servers selection'; //to translate -$strSetupLeftDisplayServers_desc = 'Display server choice at the top of the left frame'; //to translate -$strSetupDisplayServersList_name = 'Display servers as a list'; //to translate -$strSetupDisplayServersList_desc = 'Show server listing as a list instead of a drop down'; //to translate -$strSetupDisplayDatabasesList_name = 'Display databases as a list'; //to translate -$strSetupDisplayDatabasesList_desc = 'Show database listing as a list instead of a drop down'; //to translate -$strSetupLeftFrameDBTree_name = 'Display databases in a tree'; //to translate -$strSetupLeftFrameDBTree_desc = 'Only light version; display databases in a tree (determined by the separator defined below)'; //to translate -$strSetupLeftFrameDBSeparator_name = 'Database tree separator'; //to translate -$strSetupLeftFrameDBSeparator_desc = 'String that separates databases into different tree levels'; //to translate -$strSetupShowTooltipAliasDB_name = 'Display database comment instead of its name'; //to translate -$strSetupShowTooltipAliasDB_desc = 'If tooltips are enabled and a database comment is set, this will flip the comment and the real name'; //to translate -$strSetupLeftFrameTableSeparator_name = 'Table tree separator'; //to translate -$strSetupLeftFrameTableSeparator_desc = 'String that separates tables into different tree levels'; //to translate -$strSetupLeftFrameTableLevel_name = 'Maximum table tree depth'; //to translate -$strSetupShowTooltip_name = 'Display table comments in tooltips'; //to translate -$strSetupShowTooltipAliasTB_name = 'Display table comment instead of its name'; //to translate -$strSetupShowTooltipAliasTB_desc = 'When setting this to [kbd]nested[/kbd], the alias of the table name is only used to split/nest the tables according to the $cfg[\'LeftFrameTableSeparator\'] directive, so only the folder is called like the alias, the table name itself stays unchanged'; //to translate -$strSetupShowStats_name = 'Show statistics'; //to translate -$strSetupShowStats_desc = 'Allow to display database and table statistics (eg. space usage)'; //to translate -$strSetupShowPhpInfo_name = 'Show phpinfo() link'; //to translate -$strSetupShowPhpInfo_desc = 'Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output'; //to translate -$strSetupShowServerInfo_name = 'Show detailed MySQL server information'; //to translate -$strSetupShowChgPassword_name = 'Show password change form'; //to translate -$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly'; //to translate -$strSetupShowCreateDb_name = 'Show create database form'; //to translate -$strSetupSuggestDBName_name = 'Suggest new database name'; //to translate -$strSetupSuggestDBName_desc = 'Suggest a database name on the "Create Database" form (if possible) or keep the text field empty'; //to translate -$strSetupNavigationBarIconic_name = 'Iconic navigation bar'; //to translate -$strSetupNavigationBarIconic_desc = 'Use only icons, only text or both'; //to translate -$strSetupShowAll_name = 'Allow to display all the rows'; //to translate -$strSetupShowAll_desc = 'Whether a user should be displayed a "show all (records)" button'; //to translate -$strSetupMaxRows_name = 'Maximum number of rows to display'; //to translate -$strSetupMaxRows_desc = 'Number of rows displayed when browsing a result set. If the result set contains more rows, "Previous" and "Next" links will be shown.'; //to translate -$strSetupOrder_name = 'Default sorting order'; //to translate -$strSetupOrder_desc = '[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise'; //to translate -$strSetupBrowsePointerEnable_name = 'Highlight pointer'; //to translate -$strSetupBrowsePointerEnable_desc = 'Highlight row pointed by the mouse cursor'; //to translate -$strSetupBrowseMarkerEnable_name = 'Row marker'; //to translate -$strSetupBrowseMarkerEnable_desc = 'Highlight selected rows'; //to translate -$strSetupProtectBinary_name = 'Protect binary fields'; //to translate -$strSetupProtectBinary_desc = 'Disallow BLOB and BINARY fields from editing'; //to translate -$strSetupShowFunctionFields_name = 'Show function fields'; //to translate -$strSetupShowFunctionFields_desc = 'Display the function fields in edit/insert mode'; //to translate -$strSetupCharEditing_name = 'CHAR fields editing'; //to translate -$strSetupCharEditing_desc = 'Defines which type of editing controls should be used for CHAR and VARCHAR fields; [kbd]input[/kbd] - allows limiting of input length, [kbd]textarea[/kbd] - allows newlines in fields'; //to translate -$strSetupCharTextareaCols_name = 'CHAR textarea columns'; //to translate -$strSetupCharTextareaCols_desc = 'Number of columns for CHAR/VARCHAR textareas'; //to translate -$strSetupCharTextareaRows_name = 'CHAR textarea rows'; //to translate -$strSetupCharTextareaRows_desc = 'Number of rows for CHAR/VARCHAR textareas'; //to translate -$strSetupInsertRows_name = 'Number of inserted rows'; //to translate -$strSetupInsertRows_desc = 'How many rows can be inserted at one time'; //to translate -$strSetupForeignKeyDropdownOrder_name = 'Foreign key dropdown order'; //to translate -$strSetupForeignKeyDropdownOrder_desc = 'Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is the referenced data, [kbd]id[/kbd] is the key value'; //to translate -$strSetupForeignKeyMaxLimit_name = 'Foreign key limit'; //to translate -$strSetupForeignKeyMaxLimit_desc = 'A dropdown will be used if fewer items are present'; //to translate -$strSetupLightTabs_name = 'Light tabs'; //to translate -$strSetupLightTabs_desc = 'Use less graphically intense tabs'; //to translate -$strSetupPropertiesIconic_name = 'Iconic table operations'; //to translate -$strSetupPropertiesIconic_desc = 'Use only icons, only text or both'; //to translate -$strSetupDefaultTabServer_name = 'Default server tab'; //to translate -$strSetupDefaultTabServer_desc = 'Tab that is displayed when entering a server'; //to translate -$strSetupDefaultTabDatabase_name = 'Default database tab'; //to translate -$strSetupDefaultTabDatabase_desc = 'Tab that is displayed when entering a database'; //to translate -$strSetupDefaultTabTable_name = 'Default table tab'; //to translate -$strSetupDefaultTabTable_desc = 'Tab that is displayed when entering a table'; //to translate -$strSetupQueryWindowDefTab_name = 'Default query window tab'; //to translate -$strSetupQueryWindowDefTab_desc = 'Tab displayed when opening a new query window'; //to translate -$strSetupSQLQuery_Edit_name = 'Edit'; //to translate -$strSetupSQLQuery_Explain_name = 'Explain SQL'; //to translate -$strSetupSQLQuery_ShowAsPHP_name = 'Create PHP Code'; //to translate -$strSetupSQLQuery_Validate_name = 'Validate SQL'; //to translate -$strSetupSQLQuery_Refresh_name = 'Refresh'; //to translate -$strSetupImport_format_name = 'Format of imported file'; //to translate -$strSetupImport_allow_interrupt_name = 'Partial import: allow interrupt'; //to translate -$strSetupImport_allow_interrupt_desc = 'Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.'; //to translate -$strSetupImport_skip_queries_name = 'Partial import: skip queries'; //to translate -$strSetupImport_skip_queries_desc = 'Number of records (queries) to skip from start'; //to translate -$strSetupExport_format_name = 'Format'; //to translate -$strSetupExport_compression_name = 'Compression'; //to translate +$strSetupExecTimeLimit_name = 'Maximum execution time'; //to translate $strSetupExport_asfile_name = 'Save as file'; //to translate $strSetupExport_charset_name = 'Character set of the file'; //to translate +$strSetupExport_compression_name = 'Compression'; //to translate +$strSetupExport_file_template_database_name = 'Database name template'; //to translate +$strSetupExport_file_template_server_name = 'Server name template'; //to translate +$strSetupExport_file_template_table_name = 'Table name template'; //to translate +$strSetupExport_format_name = 'Format'; //to translate $strSetupExport_onserver_name = 'Save on server'; //to translate $strSetupExport_onserver_overwrite_name = 'Overwrite existing file(s)'; //to translate $strSetupExport_remember_file_template_name = 'Remember file name template'; //to translate -$strSetupExport_file_template_table_name = 'Table name template'; //to translate -$strSetupExport_file_template_database_name = 'Database name template'; //to translate -$strSetupExport_file_template_server_name = 'Server name template'; //to translate -$strSetupBlowfishSecretCharsMsg = 'Key should contain letters, numbers [em]and[/em] special characters'; //to translate -$strSetupBlowfishSecretMsg = 'You didn\'t have blowfish secret set and have enabled cookie authentication, so a key was automatically generated for you. It is used to encrypt cookies; you don\'t need to remember it.'; //to translate +$strSetupFalse = 'no'; //to translate +$strSetupForceSSL_desc = 'Force secured connection while using phpMyAdmin'; //to translate +$strSetupForceSSLMsg = 'This [a@?page=form&formset=features#tab_Security]option[/a] should be enabled if your web server supports it'; //to translate +$strSetupForceSSL_name = 'Force SSL connection'; //to translate +$strSetupForeignKeyDropdownOrder_desc = 'Sort order for items in a foreign-key dropdown box; [kbd]content[/kbd] is the referenced data, [kbd]id[/kbd] is the key value'; //to translate +$strSetupForeignKeyDropdownOrder_name = 'Foreign key dropdown order'; //to translate +$strSetupForeignKeyMaxLimit_desc = 'A dropdown will be used if fewer items are present'; //to translate +$strSetupForeignKeyMaxLimit_name = 'Foreign key limit'; //to translate +$strSetupForm_Browse = 'Browse mode'; //to translate +$strSetupForm_Browse_desc = 'Customize browse mode'; //to translate +$strSetupForm_Edit_desc = 'Customize edit mode'; //to translate +$strSetupForm_Edit = 'Edit mode'; //to translate +$strSetupForm_Export_defaults_desc = 'Customize default export options'; //to translate +$strSetupForm_Export_defaults = 'Export defaults'; //to translate +$strSetupForm_Import_defaults_desc = 'Customize default common import options'; //to translate +$strSetupForm_Import_defaults = 'Import defaults'; //to translate +$strSetupForm_Import_export_desc = 'Set import and export directories and compression options'; //to translate +$strSetupForm_Import_export = 'Import / export'; //to translate +$strSetupForm_Left_databases = 'Databases'; //to translate +$strSetupForm_Left_databases_desc = 'Databases display options'; //to translate +$strSetupForm_Left_frame_desc = 'Customize appearance of the navigation frame'; //to translate +$strSetupForm_Left_frame = 'Navigation frame'; //to translate +$strSetupForm_Left_servers_desc = 'Servers display options'; //to translate +$strSetupForm_Left_servers = 'Servers'; //to translate +$strSetupForm_Left_tables_desc = 'Tables display options'; //to translate +$strSetupForm_Left_tables = 'Tables'; //to translate +$strSetupForm_Main_frame = 'Main frame'; //to translate +$strSetupForm_Other_core_settings_desc = 'Settings that didn\'t fit enywhere else'; //to translate +$strSetupForm_Other_core_settings = 'Other core settings'; //to translate +$strSetupForm_Query_window_desc = 'Customize query window options'; //to translate +$strSetupForm_Query_window = 'Query window'; //to translate +$strSetupForm_Security_desc = 'Please note that phpMyAdmin is just a user interface and its features do not limit MySQL'; //to translate +$strSetupForm_Security = 'Security'; //to translate +$strSetupForm_Server = 'Basic settings'; //to translate +$strSetupForm_Server_config_desc = 'Advanced server configuration, do not change these options unless you know what they are for'; //to translate +$strSetupForm_Server_config = 'Server configuration'; //to translate +$strSetupForm_Server_desc = 'Enter server connection parameters'; //to translate +$strSetupForm_Server_login_options_desc = 'Enter login options for signon authentication'; //to translate +$strSetupForm_Server_login_options = 'Signon login options'; //to translate +$strSetupForm_Server_pmadb_desc = 'Configure phpMyAdmin database to gain access to additional features, see [a@../Documentation.html#linked-tables]linked-tables infrastructure[/a] in documentation'; //to translate +$strSetupForm_Server_pmadb = 'PMA database'; //to translate +$strSetupFormset_customization = 'Customization'; //to translate +$strSetupFormset_export = 'Customize export options'; //to translate +$strSetupFormset_features = 'Features'; //to translate +$strSetupFormset_import = 'Customize import defaults'; //to translate +$strSetupFormset_left_frame = 'Customize navigation frame'; //to translate +$strSetupFormset_main_frame = 'Customize main frame'; //to translate +$strSetupForm_Sql_box_desc = 'Customize links shown in SQL Query boxes'; //to translate +$strSetupForm_Sql_box = 'SQL Query box'; //to translate +$strSetupForm_Sql_queries_desc = 'SQL queries settings, for SQL Query box options see [a@?page=form&formset=main_frame#tab_Sql_box]Navigation frame[/a] settings'; //to translate +$strSetupForm_Sql_queries = 'SQL queries'; //to translate +$strSetupForm_Startup_desc = 'Customize startup page'; //to translate +$strSetupForm_Startup = 'Startup'; //to translate +$strSetupForm_Tabs_desc = 'Choose how you want tabs to work'; //to translate +$strSetupForm_Tabs = 'Tabs'; //to translate +$strSetupGZipDump_desc = 'Enable [a@http://en.wikipedia.org/wiki/Gzip]gzip[/a] compression for import and export operations'; //to translate +$strSetupGZipDump_name = 'GZip'; //to translate +$strSetupGZipDumpWarning = '[a@?page=form&formset=features#tab_Import_export]GZip compression and decompression[/a] requires functions (%s) which are unavailable on this system.'; //to translate +$strSetupHomepageLink = 'phpMyAdmin homepage'; //to translate +$strSetupIconvExtraParams_name = 'Extra parameters for iconv'; //to translate +$strSetupIgnoreErrors = 'Ignore errors'; //to translate $strSetupIgnoreMultiSubmitErrors_desc = 'If enabled, phpMyAdmin continues computing multiple-statement queries even if one of the queries failed'; //to translate +$strSetupIgnoreMultiSubmitErrors_name = 'Ignore multiple statement errors'; //to translate +$strSetupImport_allow_interrupt_desc = 'Allow interrupt of import in case script detects it is close to time limit. This might be good way to import large files, however it can break transactions.'; //to translate +$strSetupImport_allow_interrupt_name = 'Partial import: allow interrupt'; //to translate $strSetupImport_format_desc = 'Default format; be aware that this list depends on location (database, table) and only SQL is always available'; //to translate +$strSetupImport_format_name = 'Format of imported file'; //to translate +$strSetupImport_skip_queries_desc = 'Number of records (queries) to skip from start'; //to translate +$strSetupImport_skip_queries_name = 'Partial import: skip queries'; //to translate +$strSetupInsecureConnection = 'Insecure connection'; //to translate $strSetupInsecureConnectionMsg1 = 'You are not using a secure connection; all data (including potentially sensitive information, like passwords) is transferred unencrypted!'; //to translate +$strSetupInsecureConnectionMsg2 = 'If your server is also configured to accept HTTPS requests follow [a@%s]this link[/a] to use a secure connection.'; //to translate +$strSetupInsertRows_desc = 'How many rows can be inserted at one time'; //to translate +$strSetupInsertRows_name = 'Number of inserted rows'; //to translate +$strSetupLeftDefaultTabTable_name = 'Target for quick access icon'; //to translate +$strSetupLeftDisplayLogo_desc = 'Show logo in left frame'; //to translate +$strSetupLeftDisplayLogo_name = 'Display logo'; //to translate +$strSetupLeftDisplayServers_desc = 'Display server choice at the top of the left frame'; //to translate +$strSetupLeftDisplayServers_name = 'Display servers selection'; //to translate +$strSetupLeftFrameDBSeparator_desc = 'String that separates databases into different tree levels'; //to translate +$strSetupLeftFrameDBSeparator_name = 'Database tree separator'; //to translate +$strSetupLeftFrameDBTree_desc = 'Only light version; display databases in a tree (determined by the separator defined below)'; //to translate +$strSetupLeftFrameDBTree_name = 'Display databases in a tree'; //to translate +$strSetupLeftFrameLight_desc = 'Disable this if you want to see all databases at once'; //to translate +$strSetupLeftFrameLight_name = 'Use light version'; //to translate +$strSetupLeftFrameTableLevel_name = 'Maximum table tree depth'; //to translate +$strSetupLeftFrameTableSeparator_desc = 'String that separates tables into different tree levels'; //to translate +$strSetupLeftFrameTableSeparator_name = 'Table tree separator'; //to translate +$strSetupLeftLogoLink_name = 'Logo link URL'; //to translate +$strSetupLeftLogoLinkWindow_desc = 'Open the linked page in the main window ([kbd]main[/kbd]) or in a new one ([kbd]new[/kbd])'; //to translate +$strSetupLeftLogoLinkWindow_name = 'Logo link target'; //to translate +$strSetupLeftPointerEnable_desc = 'Highlight server under the mouse cursor'; //to translate +$strSetupLeftPointerEnable_name = 'Enable highlighting'; //to translate +$strSetupLetUserChoose = 'let the user choose'; //to translate +$strSetupLightTabs_desc = 'Use less graphically intense tabs'; //to translate +$strSetupLightTabs_name = 'Light tabs'; //to translate +$strSetupLoad = 'Load'; //to translate $strSetupLoginCookieDeleteAll_desc = 'If TRUE, logout deletes cookies for all servers; when set to FALSE, logout only occurs for the current server. Setting this to FALSE makes it easy to forget to log out from other servers when connected to multiple servers.'; //to translate +$strSetupLoginCookieDeleteAll_name = 'Delete all cookies on logout'; //to translate +$strSetupLoginCookieRecall_desc = 'Define whether the previous login should be recalled or not in cookie authentication mode'; //to translate +$strSetupLoginCookieRecall_name = 'Recall user name'; //to translate $strSetupLoginCookieStore_desc = 'Define how long (in seconds) a login cookie should be stored in browser. The default of 0 means that it will be kept for the existing session only, and will be deleted as soon as you close the browser window. This is recommended for non-trusted environments.'; //to translate +$strSetupLoginCookieStore_name = 'Login cookie store'; //to translate +$strSetupLoginCookieValidity_desc = 'Define how long (in seconds) a login cookie is valid'; //to translate +$strSetupLoginCookieValidityMsg = '[a@?page=form&formset=features#tab_Security]Login cookie validity[/a] should be should be set to 1800 seconds (30 minutes) at most. Values larger than 1800 may pose a security risk such as impersonation.'; //to translate +$strSetupLoginCookieValidity_name = 'Login cookie validity'; //to translate +$strSetupMaxCharactersInDisplayedSQL_desc = 'Maximum number of characters used when a SQL query is displayed'; //to translate +$strSetupMaxCharactersInDisplayedSQL_name = 'Maximum displayed SQL length'; //to translate +$strSetupMaxDbList_desc = 'Maximum number of databases displayed in left frame and database list'; //to translate +$strSetupMaxDbList_name = 'Maximum databases'; //to translate +$strSetupMaxRows_desc = 'Number of rows displayed when browsing a result set. If the result set contains more rows, "Previous" and "Next" links will be shown.'; //to translate +$strSetupMaxRows_name = 'Maximum number of rows to display'; //to translate +$strSetupMaxTableList_desc = 'Maximum number of tables displayed in table list'; //to translate +$strSetupMaxTableList_name = 'Maximum tables'; //to translate +$strSetupMemoryLimit_desc = 'The number of bytes a script is allowed to allocate, eg. [kbd]32M[/kbd] ([kbd]0[/kbd] for no limit)'; //to translate +$strSetupMemoryLimit_name = 'Memory limit'; //to translate +$strSetupNavigationBarIconic_desc = 'Use only icons, only text or both'; //to translate +$strSetupNavigationBarIconic_name = 'Iconic navigation bar'; //to translate +$strSetupNewServer = 'New server'; //to translate +$strSetupNoServers = 'There are no configured servers'; //to translate +$strSetupOBGzip_desc = 'use GZip output buffering for increased speed in HTTP transfers'; //to translate +$strSetupOBGzip_name = 'GZip output buffering'; //to translate +$strSetupOptionNone = '- none -'; //to translate +$strSetupOrder_desc = '[kbd]SMART[/kbd] - i.e. descending order for fields of type TIME, DATE, DATETIME and TIMESTAMP, ascending order otherwise'; //to translate +$strSetupOrder_name = 'Default sorting order'; //to translate +$strSetupOverview = 'Overview'; //to translate +$strSetupPersistentConnections_desc = 'Use persistent connections to MySQL databases'; //to translate +$strSetupPersistentConnections_name = 'Persistent connections'; //to translate +$strSetupPropertiesIconic_desc = 'Use only icons, only text or both'; //to translate +$strSetupPropertiesIconic_name = 'Iconic table operations'; //to translate +$strSetupProtectBinary_desc = 'Disallow BLOB and BINARY fields from editing'; //to translate +$strSetupProtectBinary_name = 'Protect binary fields'; //to translate +$strSetupQueryHistoryDB_desc = 'Enable if you want DB-based query history (requires pmadb). If disabled, this utilizes JS-routines to display query history (lost by window close).'; //to translate +$strSetupQueryHistoryDB_name = 'Permanent query history'; //to translate +$strSetupQueryHistoryMax_desc = 'How many queries are kept in history'; //to translate +$strSetupQueryHistoryMax_name = 'Query history length'; //to translate +$strSetupQueryWindowDefTab_desc = 'Tab displayed when opening a new query window'; //to translate +$strSetupQueryWindowDefTab_name = 'Default query window tab'; //to translate +$strSetupRecodingEngine_desc = 'Select which functions will be used for character set conversion'; //to translate +$strSetupRecodingEngine_name = 'Recoding engine'; //to translate +$strSetupRestoreDefaultValue = 'Restore default value'; //to translate +$strSetupRevertErroneousFields = 'Try to revert erroneous fields to their default values'; //to translate +$strSetupSaveDir_desc = 'Directory where exports can be saved on server'; //to translate +$strSetupSaveDir_name = 'Save directory'; //to translate $strSetupServerAuthConfigMsg = 'You set the [kbd]config[/kbd] authentication type and included username and password for auto-login, which is not a desirable option for live hosts. Anyone who knows or guesses your phpMyAdmin URL can directly access your phpMyAdmin panel. Set [a@?page=servers&mode=edit&id=%1$d#tab_Server]authentication type[/a] to [kbd]cookie[/kbd] or [kbd]http[/kbd].'; //to translate -$strSetupServers_extension_desc = 'What PHP extension to use; you should use mysqli if supported'; //to translate -$strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.'; //to translate +$strSetupServerExtensionMsg = 'You should use mysqli for performance reasons'; //to translate +$strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate +$strSetupServersAdd = 'Add a new server'; //to translate +$strSetupServers_AllowDeny_order_desc = 'Leave blank if not used'; //to translate +$strSetupServers_AllowDeny_order_name = 'Host authentication order'; //to translate +$strSetupServers_AllowDeny_rules_desc = 'Leave blank for defaults'; //to translate +$strSetupServers_AllowDeny_rules_name = 'Host authentication rules'; //to translate +$strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate +$strSetupServers_AllowRoot_name = 'Allow root login'; //to translate $strSetupServers_auth_swekey_config_desc = 'The path for the config file for [a@http://swekey.com]SweKey hardware authentication[/a] (not located in your document root; suggested: /etc/swekey.conf)'; //to translate -$strSessionGCWarning = 'Your PHP parameter [a@http://php.net/manual/en/session.configuration.php#ini.session.gc-maxlifetime@]session.gc_maxlifetime[/a] is lower that cookie validity configured in phpMyAdmin, because of this, your login will expire sooner than configured in phpMyAdmin.'; //to translate -$strSetupServers_host_desc = 'Hostname where MySQL server is running'; //to translate -$strSetupServers_verbose_desc = 'A user-friendly description of this server. Leave blank to display the hostname instead.'; //to translate -$strCreateUserDatabasePrivileges = 'Grant all privileges on database "%s"'; //to translate +$strSetupServers_auth_swekey_config_name = 'SweKey config file'; //to translate +$strSetupServers_auth_type_desc = 'Authentication method to use'; //to translate +$strSetupServers_auth_type_name = 'Authentication type'; //to translate +$strSetupServers_bookmarktable_desc = 'Leave blank for no [a@http://wiki.cihar.com/pma/bookmark]bookmark[/a] support, default: [kbd]pma_bookmark[/kbd]'; //to translate +$strSetupServers_bookmarktable_name = 'Bookmark table'; //to translate +$strSetupServers_column_info_desc = 'Leave blank for no column comments/mime types, default: [kbd]pma_column_info[/kbd]'; //to translate +$strSetupServers_column_info_name = 'Column information table'; //to translate +$strSetupServers_compress_desc = 'Compress connection to MySQL server'; //to translate +$strSetupServers_compress_name = 'Compress connection'; //to translate +$strSetupServers_connect_type_desc = 'How to connect to server, keep tcp if unsure'; //to translate +$strSetupServers_connect_type_name = 'Connection type'; //to translate +$strSetupServers_controlpass_name = 'Control user password'; //to translate +$strSetupServers_controluser_desc = 'A special MySQL user configured with limited permissions, more information available on [a@http://wiki.cihar.com/pma/controluser]wiki[/a]'; //to translate +$strSetupServers_controluser_name = 'Control user'; //to translate +$strSetupServers_CountTables_desc = 'Count tables when showing database list'; //to translate +$strSetupServers_CountTables_name = 'Count tables'; //to translate +$strSetupServers_designer_coords_desc = 'Leave blank for no Designer support, default: [kbd]designer_coords[/kbd]'; //to translate +$strSetupServers_designer_coords_name = 'Designer table'; //to translate +$strSetupServers_DisableIS_desc = 'More information on [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug tracker[/a] and [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]'; //to translate +$strSetupServers_DisableIS_name = 'Disable use of INFORMATION_SCHEMA'; //to translate +$strSetupServerSecurityInfoMsg = 'If you feel this is necessary, use additional protection settings - [a@?page=servers&mode=edit&id=%1$d#tab_Server_config]host authentication[/a] settings and [a@?page=form&formset=features#tab_Security]trusted proxies list[/a]. However, IP-based protection may not be reliable if your IP belongs to an ISP where thousands of users, including you, are connected to.'; //to translate +$strSetupServersEdit = 'Edit server'; //to translate +$strSetupServers_extension_desc = 'What PHP extension to use; you should use mysqli if supported'; //to translate +$strSetupServers_extension_name = 'PHP extension to use'; //to translate +$strSetupServers_hide_db_desc = 'Hide databases matching regular expression (PCRE)'; //to translate +$strSetupServers_hide_db_name = 'Hide databases'; //to translate +$strSetupServers_history_desc = 'Leave blank for no SQL query history support, default: [kbd]pma_history[/kbd]'; //to translate +$strSetupServers_history_name = 'SQL query history table'; //to translate +$strSetupServers_host_desc = ''; //to translate +$strSetupServers_host_name = 'Server hostname'; //to translate +$strSetupServers_LogoutURL_name = 'Logout URL'; //to translate +$strSetupServers_nopassword_desc = 'Try to connect without password'; //to translate +$strSetupServers_nopassword_name = 'Connect without password'; //to translate +$strSetupServers_only_db_desc = 'You can use MySQL wildcard characters (% and _), escape them if you want to use their literal instances, i.e. use \'my\_db\' and not \'my_db\''; //to translate +$strSetupServers_only_db_name = 'Show only listed databases'; //to translate +$strSetupServers_password_desc = 'Leave empty if not using config auth'; //to translate +$strSetupServers_password_name = 'Password for config auth'; //to translate +$strSetupServers_pdf_pages_desc = 'Leave blank for no PDF schema support, default: [kbd]pma_pdf_pages[/kbd]'; //to translate +$strSetupServers_pdf_pages_name = 'PDF schema: pages table'; //to translate +$strSetupServers_pmadb_desc = 'Database used for relations, bookmarks, and PDF features. See [a@http://wiki.cihar.com/pma/pmadb]pmadb[/a] for complete information. Leave blank for no support. Default: [kbd]phpmyadmin[/kbd]'; //to translate +$strSetupServers_pmadb_name = 'PMA database'; //to translate +$strSetupServers_port_desc = 'Port on which MySQL server is listening, leave empty for default'; //to translate +$strSetupServers_port_name = 'Server port'; //to translate +$strSetupServers_relation_desc = 'Leave blank for no [a@http://wiki.cihar.com/pma/relation]relation-links[/a] support, default: [kbd]pma_relation[/kbd]'; //to translate +$strSetupServers_relation_name = 'Relation table'; //to translate +$strSetupServers_ShowDatabasesCommand_desc = 'SQL command to fetch available databases'; //to translate +$strSetupServers_ShowDatabasesCommand_name = 'SHOW DATABASES command'; //to translate +$strSetupServers_SignonSession_desc = 'See [a@http://wiki.cihar.com/pma/auth_types#signon]authentication types[/a] for an example'; //to translate +$strSetupServers_SignonSession_name = 'Signon session name'; //to translate +$strSetupServers_SignonURL_name = 'Signon URL'; //to translate +$strSetupServerSslMsg = 'You should use SSL connections if your web server supports it'; //to translate +$strSetupServers_socket_desc = 'Socket on which MySQL server is listening, leave empty for default'; //to translate +$strSetupServers_socket_name = 'Server socket'; //to translate +$strSetupServers_ssl_desc = ''; //to translate +$strSetupServers_ssl_name = 'Use SSL'; //to translate +$strSetupServers_table_coords_desc = 'Leave blank for no PDF schema support, default: [kbd]pma_table_coords[/kbd]'; //to translate +$strSetupServers_table_coords_name = 'PDF schema: table coordinates'; //to translate +$strSetupServers_table_info_desc = 'Table to describe the display fields, leave blank for no support; default: [kbd]pma_table_info[/kbd]'; //to translate +$strSetupServers_table_info_name = 'Display fields table'; //to translate +$strSetupServers_user_desc = 'Leave empty if not using config auth'; //to translate +$strSetupServers_user_name = 'User for config auth'; //to translate +$strSetupServers_verbose_check_desc = 'Disable if you know that your pma_* tables are up to date. This prevents compatibility checks and thereby increases performance'; //to translate +$strSetupServers_verbose_check_name = 'Verbose check'; //to translate +$strSetupServers_verbose_desc = 'Hostname where MySQL server is running'; //to translate +$strSetupServers_verbose_name = 'Verbose name of this server'; //to translate +$strSetupSetValue = 'Set value: %s'; //to translate +$strSetupShowAll_desc = 'Whether a user should be displayed a "show all (records)" button'; //to translate +$strSetupShowAll_name = 'Allow to display all the rows'; //to translate +$strSetupShowChgPassword_desc = 'Please note that enabling this has no effect with [kbd]config[/kbd] authentication mode because the password is hard coded in the configuration file; this does not limit the ability to execute the same command directly'; //to translate +$strSetupShowChgPassword_name = 'Show password change form'; //to translate +$strSetupShowCreateDb_name = 'Show create database form'; //to translate +$strSetupShowForm = 'Show form'; //to translate +$strSetupShowFunctionFields_desc = 'Display the function fields in edit/insert mode'; //to translate +$strSetupShowFunctionFields_name = 'Show function fields'; //to translate +$strSetupShowHiddenMessages = 'Show hidden messages (#MSG_COUNT)'; //to translate +$strSetupShowPhpInfo_desc = 'Shows link to [a@http://php.net/manual/function.phpinfo.php]phpinfo()[/a] output'; //to translate +$strSetupShowPhpInfo_name = 'Show phpinfo() link'; //to translate +$strSetupShowServerInfo_name = 'Show detailed MySQL server information'; //to translate +$strSetupShowSQL_desc = 'Defines whether SQL queries generated by phpMyAdmin should be displayed'; //to translate +$strSetupShowSQL_name = 'Show SQL queries'; //to translate +$strSetupShowStats_desc = 'Allow to display database and table statistics (eg. space usage)'; //to translate +$strSetupShowStats_name = 'Show statistics'; //to translate +$strSetupShowTooltipAliasDB_desc = 'If tooltips are enabled and a database comment is set, this will flip the comment and the real name'; //to translate +$strSetupShowTooltipAliasDB_name = 'Display database comment instead of its name'; //to translate +$strSetupShowTooltipAliasTB_desc = 'When setting this to [kbd]nested[/kbd], the alias of the table name is only used to split/nest the tables according to the $cfg[\'LeftFrameTableSeparator\'] directive, so only the folder is called like the alias, the table name itself stays unchanged'; //to translate +$strSetupShowTooltipAliasTB_name = 'Display table comment instead of its name'; //to translate +$strSetupShowTooltip_name = 'Display table comments in tooltips'; //to translate +$strSetupSkipLockedTables_desc = 'Mark used tables and make it possible to show databases with locked tables'; //to translate +$strSetupSkipLockedTables_name = 'Skip locked tables'; //to translate +$strSetupSQLQuery_Edit_name = 'Edit'; //to translate +$strSetupSQLQuery_Explain_name = 'Explain SQL'; //to translate +$strSetupSQLQuery_Refresh_name = 'Refresh'; //to translate +$strSetupSQLQuery_ShowAsPHP_name = 'Create PHP Code'; //to translate +$strSetupSQLQuery_Validate_name = 'Validate SQL'; //to translate +$strSetupSuggestDBName_desc = 'Suggest a database name on the "Create Database" form (if possible) or keep the text field empty'; //to translate +$strSetupSuggestDBName_name = 'Suggest new database name'; //to translate +$strSetupTrue = 'yes'; //to translate +$strSetupTrustedProxies_desc = 'Input proxies as [kbd]IP: trusted HTTP header[/kbd]. The following example specifies that phpMyAdmin should trust a HTTP_X_FORWARDED_FOR (X-Forwarded-For) header coming from the proxy 1.2.3.4:[br][kbd]1.2.3.4: HTTP_X_FORWARDED_FOR[/kbd]'; //to translate +$strSetupTrustedProxies_name = 'List of trusted proxies for IP allow/deny'; //to translate +$strSetupUploadDir_desc = 'Directory on server where you can upload files for import'; //to translate +$strSetupUploadDir_name = 'Upload directory'; //to translate +$strSetupUseDbSearch_desc = 'Allow for searching inside the entire database'; //to translate +$strSetupUseDbSearch_name = 'Use database search'; //to translate +$strSetupVerboseMultiSubmit_desc = 'Show affected rows of each statement on multiple-statement queries. See libraries/import.lib.php for defaults on how many queries a statement may contain.'; //to translate +$strSetupVerboseMultiSubmit_name = 'Verbose multiple statements'; //to translate +$strSetupVersionCheckDataError = 'Reading of version failed. Maybe you\'re offline or the upgrade server does not respond.'; //to translate +$strSetupVersionCheckInvalid = 'Got invalid version string from server'; //to translate +$strSetupVersionCheckLink = 'Check for latest version'; //to translate +$strSetupVersionCheckNewAvailable = 'A newer version of phpMyAdmin is available and you should consider upgrading. The newest version is %s, released on %s.'; //to translate +$strSetupVersionCheckNewAvailableSvn = 'You are using subversion version, run [kbd]svn update[/kbd] :-)[br]The latest stable version is %s, released on %s.'; //to translate +$strSetupVersionCheckNone = 'No newer stable version is available'; //to translate +$strSetupVersionCheckUnparsable = 'Unparsable version string'; //to translate +$strSetupVersionCheck = 'Version check'; //to translate +$strSetupVersionCheckWrapperError = 'Neither URL wrapper nor CURL is available. Version check is not possible.'; //to translate +$strSetupWarning = 'Warning'; //to translate +$strSetupZipDump_desc = 'Enable [a@http://en.wikipedia.org/wiki/ZIP_(file_format)]ZIP[/a] compression for import and export operations'; //to translate +$strSetupZipDumpExportWarning = '[a@?page=form&formset=features#tab_Import_export]Zip compression[/a] requires functions (%s) which are unavailable on this system.'; //to translate +$strSetupZipDumpImportWarning = '[a@?page=form&formset=features#tab_Import_export]Zip decompression[/a] requires functions (%s) which are unavailable on this system.'; //to translate +$strSetupZipDump_name = 'ZIP'; //to translate $strShowBinaryContents = 'Show binary contents'; //to translate $strShowBLOBContents = 'Show BLOB contents'; //to translate +$strShowKeys = 'Only show keys'; //to translate $strStatic = 'static'; //to translate -$strLoginWithoutPassword = 'Login without a password is forbidden by configuration (see AllowNoPassword)'; //to translate -$strSetupServerNoPasswordMsg = 'You allow for connecting to the server without a password.'; //to translate -$strSetupServers_AllowNoPassword_name = 'Allow logins without a password'; //to translate -$strHostTableExplanation = 'When Host table is used, this field is ignored and values stored in Host table are used instead.'; //to translate -$strGetMoreThemes = 'Get more themes!'; //to translate -$strNoneDefault = 'None'; //to translate -$strConfigDirectoryWarning = 'Directory [code]config[/code], which is used by the setup script, still exists in your phpMyAdmin directory. You should remove it once phpMyAdmin has been configured.'; //to translate -$strRemoveCRLF = 'Remove CRLF characters within fields'; //to translate -$strDoNotAutoIncrementZeroValues = 'Do not use AUTO_INCREMENT for zero values'; //to translate -$strAndSmall = 'and'; //to translate -$strReplicationStatus = 'Replication status'; //to translate -$strReplicationStatusInfo = 'This MySQL server works as %s in replication process. For further information about replication status on the server, please visit the replication section.'; //to translate -$strReplicationStatus_master = 'Master status'; //to translate -$strReplicationStatus_slave = 'Slave status'; //to translate +$strSwekeyNoKeyId = 'File %s does not contain any key id'; //to translate +$strSwekeyNoKey = 'No valid authentication key plugged'; //to translate + +$strViewHasAtLeast = 'This view has at least this number of rows. Please refer to %sdocumentation%s.'; //to translate +$strViewImage = 'View image'; //to translate +$strViewVideo = 'View video'; //to translate + +$strWebServer = 'Web server'; //to translate +$strWiki = 'Wiki'; //to translate + ?> diff --git a/lang/swedish-utf-8.inc.php b/lang/swedish-utf-8.inc.php index 8aa1a9d00..dbee871c5 100644 --- a/lang/swedish-utf-8.inc.php +++ b/lang/swedish-utf-8.inc.php @@ -1026,9 +1026,9 @@ $strSetupServers_auth_swekey_config_desc = 'Sökväg till konfigurationsfilen f $strSetupServers_auth_swekey_config_name = 'SweKey konfigurationsfil'; $strSetupServers_auth_type_desc = 'Autentiseringsmetod att använda'; $strSetupServers_auth_type_name = 'Typ av autentisering'; -$strSetupServers_bookmarktable_desc = 'Lämna tomt för inget stöd för [a@http://wiki.phpmyadmin.net/pma/bookmark]bokmärken[/a], standard: [kbd]pma_bookmark[/kbd]'; +$strSetupServers_bookmarktable_desc = 'Lämna tomt för inget stöd för [a@http://wiki.phpmyadmin.net/pma/bookmark]bokmärken[/a], förslag: [kbd]pma_bookmark[/kbd]'; $strSetupServers_bookmarktable_name = 'Tabell för bokmärken'; -$strSetupServers_column_info_desc = 'Lämna tomt för inget stöd för kolumnkommentarer/mime-typer, standard: [kbd]pma_column_info[/kbd]'; +$strSetupServers_column_info_desc = 'Lämna tomt för inget stöd för kolumnkommentarer/mime-typer, förslag: [kbd]pma_column_info[/kbd]'; $strSetupServers_column_info_name = 'Tabell för kolumninformation'; $strSetupServers_compress_desc = 'Komprimera anslutning till MySQL-servern'; $strSetupServers_compress_name = 'Komprimera anslutning'; @@ -1039,7 +1039,7 @@ $strSetupServers_controluser_desc = 'En speciell MySQL-användare konfigurerad m $strSetupServers_controluser_name = 'Kontrollanvändare'; $strSetupServers_CountTables_desc = 'Räkna tabeller vid visning av databaslista'; $strSetupServers_CountTables_name = 'Räkna tabeller'; -$strSetupServers_designer_coords_desc = 'Lämna tomt för inget stöd för Designer, standard: [kbd]pma_designer_coords[/kbd]'; +$strSetupServers_designer_coords_desc = 'Lämna tomt för inget stöd för Designer, förslag: [kbd]pma_designer_coords[/kbd]'; $strSetupServers_designer_coords_name = 'Tabell för Designer'; $strSetupServers_DisableIS_desc = 'Mer information på [a@http://sf.net/support/tracker.php?aid=1849494]PMA bug tracker[/a] och [a@http://bugs.mysql.com/19588]MySQL Bugs[/a]'; $strSetupServers_DisableIS_name = 'Inaktivera användning av INFORMATION_SCHEMA'; @@ -1049,7 +1049,7 @@ $strSetupServers_extension_desc = 'Vilket PHP-tillägg som ska användas; du bö $strSetupServers_extension_name = 'PHP-tillägg att använda'; $strSetupServers_hide_db_desc = 'Dölj databaser som matchar reguljärt uttryck (PCRE)'; $strSetupServers_hide_db_name = 'Dölj databaser'; -$strSetupServers_history_desc = 'Lämna tomt för inget stöd för SQL-frågehistorik, standard: [kbd]pma_history[/kbd]'; +$strSetupServers_history_desc = 'Lämna tomt för inget stöd för SQL-frågehistorik, förslag: [kbd]pma_history[/kbd]'; $strSetupServers_history_name = 'Tabell för SQL-frågehistorik'; $strSetupServers_host_desc = 'Värdnamn där MySQL-servern körs'; $strSetupServers_host_name = 'Serverns värdnamn'; @@ -1060,13 +1060,13 @@ $strSetupServers_only_db_desc = 'Du kan använda MySQL:s jokertecken (% och _), $strSetupServers_only_db_name = 'Visa endast listade databaser'; $strSetupServers_password_desc = 'Lämna tomt om inte autentisering config används'; $strSetupServers_password_name = 'Löseenord för autentisering config'; -$strSetupServers_pdf_pages_desc = 'Lämna tomt för inget stöd för PDF-schema, standard: [kbd]pma_pdf_pages[/kbd]'; +$strSetupServers_pdf_pages_desc = 'Lämna tomt för inget stöd för PDF-schema, förslag: [kbd]pma_pdf_pages[/kbd]'; $strSetupServers_pdf_pages_name = 'PDF-schema: Tabell för sidor'; -$strSetupServers_pmadb_desc = 'Databas som används för relationer, bokmärken och PDF-funktioner. Se [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] för komplett information. Lämna tomt för utan stöd. Standard: [kbd]phpmyadmin[/kbd]'; +$strSetupServers_pmadb_desc = 'Databas som används för relationer, bokmärken och PDF-funktioner. Se [a@http://wiki.phpmyadmin.net/pma/pmadb]pmadb[/a] för komplett information. Lämna tomt för utan stöd. Förslag: [kbd]phpmyadmin[/kbd]'; $strSetupServers_pmadb_name = 'PMA databas'; $strSetupServers_port_desc = 'Port som MySQL-servern lyssnar på, lämna tomt för standard'; $strSetupServers_port_name = 'Serverport'; -$strSetupServers_relation_desc = 'Lämna tomt för inget stöd för [a@http://wiki.phpmyadmin.net/pma/relation]relationslänkar[/a], standard: [kbd]pma_relation[/kbd]'; +$strSetupServers_relation_desc = 'Lämna tomt för inget stöd för [a@http://wiki.phpmyadmin.net/pma/relation]relationslänkar[/a], förslag: [kbd]pma_relation[/kbd]'; $strSetupServers_relation_name = 'Tabell för relationer'; $strSetupServers_ShowDatabasesCommand_desc = 'SQL-kommando för att hämta tillgängliga databaser'; $strSetupServers_ShowDatabasesCommand_name = 'SHOW DATABASES-kommando'; @@ -1078,9 +1078,9 @@ $strSetupServers_socket_desc = 'Sockel som MySQL-servern lyssnar på, lämna tom $strSetupServers_socket_name = 'Serversockel'; $strSetupServers_ssl_desc = ''; $strSetupServers_ssl_name = 'Använd SSL'; -$strSetupServers_table_coords_desc = 'Lämna tomt för inget stöd för PDF-schema, standard: [kbd]pma_table_coords[/kbd]'; +$strSetupServers_table_coords_desc = 'Lämna tomt för inget stöd för PDF-schema, förslag: [kbd]pma_table_coords[/kbd]'; $strSetupServers_table_coords_name = 'PDF-schema: tabellkoordinater'; -$strSetupServers_table_info_desc = 'Tabell för att beskriva fält att visa, lämna tomt för inget stöd; standard: [kbd]pma_table_info[/kbd]'; +$strSetupServers_table_info_desc = 'Tabell för att beskriva fält att visa, lämna tomt för inget stöd; förslag: [kbd]pma_table_info[/kbd]'; $strSetupServers_table_info_name = 'Tabell för visa fält'; $strSetupServers_user_desc = 'Lämna tomt om inte autentisering config används'; $strSetupServers_user_name = 'Användare för autentisering config'; @@ -1457,5 +1457,4 @@ $strYes = 'Ja'; $strZeroRemovesTheLimit = 'Anm: Genom att sätta dessa alternativ till 0 (noll) tas begränsningarna bort.'; $strZip = '"zippad"'; - ?> diff --git a/libraries/Config.class.php b/libraries/Config.class.php index 8f43c1708..bb61437a3 100644 --- a/libraries/Config.class.php +++ b/libraries/Config.class.php @@ -92,7 +92,7 @@ class PMA_Config */ function checkSystem() { - $this->set('PMA_VERSION', '3.2.1-dev'); + $this->set('PMA_VERSION', '3.2.2-dev'); /** * @deprecated */ diff --git a/libraries/common.lib.php b/libraries/common.lib.php index 25c6f0052..c131fcafd 100644 --- a/libraries/common.lib.php +++ b/libraries/common.lib.php @@ -24,10 +24,6 @@ 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 @@ -44,6 +40,9 @@ function PMA_pow($base, $exp, $use_function = false) if (! $use_function) { $use_function = $pow_function; } + if ($exp < 0 && 'pow' != $use_function) { + return false; + } switch ($use_function) { case 'bcpow' : @@ -1449,8 +1448,9 @@ function PMA_formatNumber($value, $length = 3, $comma = 0, $only_down = false) } // end for } elseif (!$only_down && (float) $value !== 0.0) { for ($d = -8; $d <= 8; $d++) { - if (isset($units[$d]) && $value <= $li * PMA_pow(1000, $d-1)) { - $value = round($value / (PMA_pow(1000, $d) / $dh)) /$dh; + // force using pow() because of the negative exponent + if (isset($units[$d]) && $value <= $li * PMA_pow(1000, $d-1, 'pow')) { + $value = round($value / (PMA_pow(1000, $d, 'pow') / $dh)) /$dh; $unit = $units[$d]; break 1; } // end if @@ -1899,6 +1899,7 @@ function PMA_checkParameters($params, $die = true, $request = true) * @uses PMA_DBI_field_flags() * @uses PMA_backquote() * @uses PMA_sqlAddslashes() + * @uses PMA_printable_bit_value() * @uses stristr() * @uses bin2hex() * @uses preg_replace() @@ -1990,6 +1991,8 @@ function PMA_getUniqueCondition($handle, $fields_cnt, $fields_meta, $row, $force // this blob won't be part of the final condition $condition = ''; } + } elseif ($meta->type == 'bit') { + $condition .= "= b'" . PMA_printable_bit_value($row[$i], $meta->length) . "' AND"; } else { $condition .= '= \'' . PMA_sqlAddslashes($row[$i], false, true) . '\' AND'; @@ -2419,7 +2422,7 @@ window.addEvent('domready', function(){ var anchor = new Element('a', { 'id': 'toggle_', - 'href': '#', + 'href': 'javascript:void(0)', 'events': { 'click': function(){ mySlide.toggle(); @@ -2546,6 +2549,18 @@ function PMA_printable_bit_value($value, $length) { return $printable; } +/** + * Converts a BIT type default value + * for example, b'010' becomes 010 + * + * @uses strtr() + * @param string $bit_default_value + * @return string the converted value + */ +function PMA_convert_bit_default_value($bit_default_value) { + return strtr($bit_default_value, array("b" => "", "'" => "")); +} + /** * Extracts the various parts from a field type spec * diff --git a/libraries/database_interface.lib.php b/libraries/database_interface.lib.php index e5f248d5d..dfe7a09c1 100644 --- a/libraries/database_interface.lib.php +++ b/libraries/database_interface.lib.php @@ -616,8 +616,13 @@ function PMA_DBI_get_databases_full($database = null, $force_stats = false, += $row['Max_data_length']; $databases[$database_name]['SCHEMA_INDEX_LENGTH'] += $row['Index_length']; - $databases[$database_name]['SCHEMA_DATA_FREE'] - += $row['Data_free']; + + // for InnoDB, this does not contain the number of + // overhead bytes but the total free space + if ('InnoDB' != $row['Engine']) { + $databases[$database_name]['SCHEMA_DATA_FREE'] + += $row['Data_free']; + } $databases[$database_name]['SCHEMA_LENGTH'] += $row['Data_length'] + $row['Index_length']; } @@ -1330,9 +1335,11 @@ function PMA_DBI_get_triggers($db, $table) $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']); + // do not prepend the schema name; this way, importing the + // definition into another schema will work + $one_result['full_trigger_name'] = PMA_backquote($trigger['TRIGGER_NAME']); $one_result['drop'] = 'DROP TRIGGER IF EXISTS ' . $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"; + $one_result['create'] = 'CREATE TRIGGER ' . $one_result['full_trigger_name'] . ' ' . $trigger['ACTION_TIMING']. ' ' . $trigger['EVENT_MANIPULATION'] . ' ON ' . PMA_backquote($trigger['EVENT_OBJECT_TABLE']) . "\n" . ' FOR EACH ROW ' . $trigger['ACTION_STATEMENT'] . "\n" . $delimiter . "\n"; $result[] = $one_result; } diff --git a/libraries/export/sql.php b/libraries/export/sql.php index 443030b08..a0bedf75f 100644 --- a/libraries/export/sql.php +++ b/libraries/export/sql.php @@ -131,7 +131,7 @@ if (! isset($sql_backquotes)) { } /** - * Outputs comment + * Possibly outputs comment * * @param string Text of comment * @@ -139,7 +139,7 @@ if (! isset($sql_backquotes)) { */ function PMA_exportComment($text = '') { - if ($GLOBALS['sql_include_comments']) { + if (isset($GLOBALS['sql_include_comments']) && $GLOBALS['sql_include_comments']) { // see http://dev.mysql.com/doc/refman/5.0/en/ansi-diff-comments.html return '--' . (empty($text) ? '' : ' ') . $text . $GLOBALS['crlf']; } else { @@ -147,6 +147,21 @@ function PMA_exportComment($text = '') } } +/** + * Possibly outputs CRLF + * + * @return string $crlf or nothing + */ +function PMA_possibleCRLF() +{ + + if (isset($GLOBALS['sql_include_comments']) && $GLOBALS['sql_include_comments']) { + return $GLOBALS['crlf']; + } else { + return ''; + } +} + /** * Outputs export footer * @@ -162,11 +177,11 @@ function PMA_exportFooter() $foot = ''; if (isset($GLOBALS['sql_disable_fk'])) { - $foot .= $crlf . 'SET FOREIGN_KEY_CHECKS=1;' . $crlf; + $foot .= 'SET FOREIGN_KEY_CHECKS=1;' . $crlf; } if (isset($GLOBALS['sql_use_transaction'])) { - $foot .= $crlf . 'COMMIT;' . $crlf; + $foot .= 'COMMIT;' . $crlf; } // restore connection settings @@ -211,7 +226,8 @@ function PMA_exportHeader() $head .= PMA_exportComment($GLOBALS['strGenTime'] . ': ' . PMA_localisedDate()) . PMA_exportComment($GLOBALS['strServerVersion'] . ': ' . substr(PMA_MYSQL_INT_VERSION, 0, 1) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 1, 2) . '.' . (int) substr(PMA_MYSQL_INT_VERSION, 3)) - . PMA_exportComment($GLOBALS['strPHPVersion'] . ': ' . phpversion()); + . PMA_exportComment($GLOBALS['strPHPVersion'] . ': ' . phpversion()) + . PMA_possibleCRLF(); if (isset($GLOBALS['sql_header_comment']) && !empty($GLOBALS['sql_header_comment'])) { // '\n' is not a newline (like "\n" would be), it's the characters @@ -225,20 +241,20 @@ function PMA_exportHeader() } if (isset($GLOBALS['sql_disable_fk'])) { - $head .= $crlf . 'SET FOREIGN_KEY_CHECKS=0;' . $crlf; + $head .= 'SET FOREIGN_KEY_CHECKS=0;' . $crlf; } /* We want exported AUTO_INCREMENT fields to have still same value, do this only for recent MySQL exports */ if (!isset($GLOBALS['sql_compatibility']) || $GLOBALS['sql_compatibility'] == 'NONE') { - $head .= $crlf . 'SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";' . $crlf; + $head .= 'SET SQL_MODE="NO_AUTO_VALUE_ON_ZERO";' . $crlf; } if (isset($GLOBALS['sql_use_transaction'])) { - $head .= $crlf .'SET AUTOCOMMIT=0;' . $crlf + $head .= 'SET AUTOCOMMIT=0;' . $crlf . 'START TRANSACTION;' . $crlf; } - $head .= $crlf; + $head .= PMA_possibleCRLF(); if (! empty($GLOBALS['asfile'])) { // we are saving as file, therefore we provide charset information @@ -684,7 +700,7 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mim } if (isset($mime_map) && count($mime_map) > 0) { - $schema_create .= $crlf + $schema_create .= PMA_possibleCRLF() . PMA_exportComment() . PMA_exportComment($GLOBALS['strMIMETypesForTable']. ' ' . PMA_backquote($table, $sql_backquotes) . ':'); @reset($mime_map); @@ -696,7 +712,7 @@ function PMA_getTableComments($db, $table, $crlf, $do_relation = false, $do_mim } if ($have_rel) { - $schema_create .= $crlf + $schema_create .= PMA_possibleCRLF() . PMA_exportComment() . PMA_exportComment($GLOBALS['strRelationsForTable']. ' ' . PMA_backquote($table, $sql_backquotes) . ':'); foreach ($res_rel AS $rel_field => $rel) { @@ -737,9 +753,9 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE, $formatted_table_name = (isset($GLOBALS['sql_backquotes'])) ? PMA_backquote($table) : '\'' . $table . '\''; - $dump = $crlf + $dump = PMA_possibleCRLF() . PMA_exportComment(str_repeat('-', 56)) - . $crlf + . PMA_possibleCRLF() . PMA_exportComment(); switch($export_mode) { @@ -749,7 +765,7 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $relation = FALSE, $dump .= PMA_getTableDef($db, $table, $crlf, $error_url, $dates); $triggers = PMA_DBI_get_triggers($db, $table); if ($triggers) { - $dump .= $crlf + $dump .= PMA_possibleCRLF() . PMA_exportComment() . PMA_exportComment($GLOBALS['strTriggers'] . ' ' . $formatted_table_name) . PMA_exportComment(); @@ -822,12 +838,12 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) // Do not export data for a VIEW // (For a VIEW, this is called only when exporting a single VIEW) if (PMA_Table::isView($db, $table)) { - $head = $crlf + $head = PMA_possibleCRLF() . PMA_exportComment() . PMA_exportComment('VIEW ' . ' ' . $formatted_table_name) . PMA_exportComment($GLOBALS['strData'] . ': ' . $GLOBALS['strNone']) . PMA_exportComment() - . $crlf; + . PMA_possibleCRLF(); if (! PMA_exportOutputHandler($head)) { return FALSE; @@ -836,11 +852,10 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) } // it's not a VIEW - $head = $crlf + $head = PMA_possibleCRLF() . PMA_exportComment() . PMA_exportComment($GLOBALS['strDumpingData'] . ' ' . $formatted_table_name) - . PMA_exportComment() - . $crlf; + . PMA_exportComment(); if (! PMA_exportOutputHandler($head)) { return FALSE; @@ -861,6 +876,13 @@ function PMA_exportData($db, $table, $crlf, $error_url, $sql_query) } if ($result != FALSE) { + // emit a single CRLF before the first data statement (produces + // an unintended CRLF when there is no data, but I don't see how it + // can be avoided, as we are in UNBUFFERED mode) + if (! PMA_exportOutputHandler($crlf)) { + return FALSE; + } + $fields_cnt = PMA_DBI_num_fields($result); // Get field information diff --git a/libraries/sqlparser.lib.php b/libraries/sqlparser.lib.php index 37783734a..f87a0eac7 100644 --- a/libraries/sqlparser.lib.php +++ b/libraries/sqlparser.lib.php @@ -1455,6 +1455,8 @@ if (! defined('PMA_MINIMUM_COMMON')) { $first_reserved_word = ''; $current_identifier = ''; $unsorted_query = $arr['raw']; // in case there is no ORDER BY + $number_of_brackets = 0; + $in_subquery = false; for ($i = 0; $i < $size; $i++) { //DEBUG echo "Loop2 " . $arr[$i]['data'] . " (" . $arr[$i]['type'] . ")
"; @@ -1471,8 +1473,24 @@ if (! defined('PMA_MINIMUM_COMMON')) { // // this code is not used for confirmations coming from functions.js + if ($arr[$i]['type'] == 'punct_bracket_open_round') { + $number_of_brackets++; + } + + if ($arr[$i]['type'] == 'punct_bracket_close_round') { + $number_of_brackets--; + if ($number_of_brackets == 0) { + $in_subquery = false; + } + } + if ($arr[$i]['type'] == 'alpha_reservedWord') { $upper_data = strtoupper($arr[$i]['data']); + + if ($upper_data == 'SELECT' && $number_of_brackets > 0) { + $in_subquery = true; + } + if (!$seen_reserved_word) { $first_reserved_word = $upper_data; $subresult['querytype'] = $upper_data; @@ -1496,7 +1514,7 @@ if (! defined('PMA_MINIMUM_COMMON')) { } } - if ($upper_data == 'LIMIT') { + if ($upper_data == 'LIMIT' && ! $in_subquery) { $section_before_limit = substr($arr['raw'], 0, $arr[$i]['pos'] - 5); $in_limit = TRUE; $seen_limit = TRUE; diff --git a/libraries/tbl_properties.inc.php b/libraries/tbl_properties.inc.php index d99470ab3..90fc8b68a 100644 --- a/libraries/tbl_properties.inc.php +++ b/libraries/tbl_properties.inc.php @@ -241,7 +241,7 @@ for ($i = 0; $i < $num_fields; $i++) { if (isset($row['Type'])) { $extracted_fieldspec = PMA_extractFieldSpec($row['Type']); if ($extracted_fieldspec['type'] == 'bit') { - $row['Default'] = PMA_printable_bit_value($row['Default'], $extracted_fieldspec['spec_in_brackets']); + $row['Default'] = PMA_convert_bit_default_value($row['Default']); } } // Cell index: If certain fields get left out, the counter shouldn't change. @@ -396,6 +396,10 @@ for ($i = 0; $i < $num_fields; $i++) { $row['Default'] = ''; } + if ($type_upper == 'BIT') { + $row['DefaultValue'] = PMA_convert_bit_default_value($row['DefaultValue']); + } + $content_cells[$i][$ci] = '