Fixed merge conflicts

Merge branch 'beta' into devel

Conflicts:

	ChangeLog
	src/include/functions_common.php
This commit is contained in:
Andre Lorbach 2008-07-07 17:10:52 +02:00
commit a3e39d3266
5 changed files with 1229 additions and 1060 deletions

View File

@ -1,6 +1,13 @@
---------------------------------------------------------------------------
<<<<<<< HEAD:ChangeLog
Version 2.5.0 (devel), 2008-06-10
- Moved older devel branch to beta branch. Increment Version minor number.
=======
Version 2.3.7 (beta), 2008-07-07
- Added missing db mapping for program field of syslogng - thanks to
Micha "Wolvverine" Panasiewicz
- Added translation for Brazilian Portuguese, thanks to Ricardo Maraschini
>>>>>>> 3e647291ba2e5cba972a52679cd8640db0a6614f:ChangeLog
---------------------------------------------------------------------------
Version 2.3.6 (devel), 2008-06-09
- Added new feature, multiple configureable views which can be configured

View File

@ -195,6 +195,7 @@ $dbmapping['syslogng'][SYSLOG_MESSAGE] = "msg";
//TODO $dbmapping['syslogng'][SYSLOG_FACILITY] = "Facility";
//TODO $dbmapping['syslogng'][SYSLOG_SEVERITY] = "Priority"
$dbmapping['syslogng'][SYSLOG_SYSLOGTAG] = "tag";
$dbmapping['syslogng'][SYSLOG_PROCESSID] = "program";
// ---
// EventTime Constants

File diff suppressed because it is too large Load Diff

1
src/lang/pt/info.txt Normal file
View File

@ -0,0 +1 @@
Português

160
src/lang/pt/main.php Normal file
View File

@ -0,0 +1,160 @@
<?php
/*
*********************************************************************
* -> www.phplogcon.org <-
* -----------------------------------------------------------------
*
* Copyright (C) 2008 Adiscon GmbH.
*
* This file is part of phpLogCon.
*
* Translation by Ricardo Maraschini
* [mailto:ricardo.maraschini@opservices.com.br]
*
* PhpLogCon is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* PhpLogCon is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with phpLogCon. If not, see <http://www.gnu.org/licenses/>.
*
* A copy of the GPL can be found in the file "COPYING" in this
* distribution.
*********************************************************************
*/
global $content;
// Global Stuff
$content['LN_MAINTITLE'] = "Controle de Logs";
$content['LN_MAIN_SELECTSTYLE'] = "Selecione um estilo";
$content['LN_GEN_LANGUAGE'] = "Selecione uma linguagem";
$content['LN_GEN_SELECTSOURCE'] = "Selecione Origem";
$content['LN_GEN_MOREPAGES'] = "Mais que uma p&aacute;gina dispon&iacute;vel";
$content['LN_GEN_FIRSTPAGE'] = "Primeira P&aacute;gina";
$content['LN_GEN_LASTPAGE'] = "&Uacute;ltima P&aacute;gina";
$content['LN_GEN_NEXTPAGE'] = "Pr&oacute;xima P&aacute;gina";
$content['LN_GEN_PREVIOUSPAGE'] = "P&aacute;gina Anterior";
$content['LN_GEN_RECORDCOUNT'] = "Total de registros encontrados";
$content['LN_GEN_PAGERSIZE'] = "Registros/p&aacute;gina";
$content['LN_GEN_PAGE'] = "P&aacute;gina";
$content['LN_GEN_PREDEFINEDSEARCHES'] = "Buscas pr&eacute;-definidas";
$content['LN_GEN_SOURCE_DISK'] = "Arquivo em disco";
$content['LN_GEN_SOURCE_DB'] = "Base de dados";
$content['LN_GEN_SOURCE_PDO'] = "Base de dados (PDO)";
$content['LN_GEN_RECORDSPERPAGE'] = "registros por p&aacute;gina";
$content['LN_GEN_PRECONFIGURED'] = "Pr&eacute;-configurado";
$content['LN_GEN_AVAILABLESEARCHES'] = "Buscas dispon&iacute;veis";
$content['LN_GEN_DB_MYSQL'] = "Servidor MySQL";
$content['LN_GEN_DB_MSSQL'] = "Microsoft SQL Server";
$content['LN_GEN_DB_ODBC'] = "Conex&atilde;o via ODBC";
$content['LN_GEN_DB_PGSQL'] = "PostgreSQL";
$content['LN_GEN_DB_OCI'] = "Oracle Call Interface";
$content['LN_GEN_DB_DB2'] = " IBM DB2";
$content['LN_GEN_DB_FIREBIRD'] = "Firebird/Interbase 6";
$content['LN_GEN_DB_INFORMIX'] = "IBM Informix Dynamic Server";
$content['LN_GEN_DB_SQLITE'] = "SQLite 2";
$content['LN_GEN_SELECTVIEW'] = "Selecionar Vis&atilde;o";
// Main Index Site
$content['LN_ERROR_INSTALLFILEREMINDER'] = "Aten&ccedil;&atilde;o! Voc&ecirc; ainda N&Atilde;O removeu o arquivo 'install.php' do diret&oacute;rio de seu phpLogCon!";
$content['LN_TOP_NUM'] = "N&atilde;o.";
$content['LN_TOP_UID'] = "uID";
$content['LN_GRID_POPUPDETAILS'] = "Detalhes para a mensagem ID '%1'";
$content['LN_SEARCH_USETHISBLA'] = "Use o formul&aacute;rio abaixo";
$content['LN_SEARCH_FILTER'] = "Busca (filtro):";
$content['LN_SEARCH_ADVANCED'] = "Busca Avan&ccedil;ada";
$content['LN_SEARCH'] = "Busca";
$content['LN_SEARCH_RESET'] = "Limpa";
$content['LN_SEARCH_PERFORMADVANCED'] = "Realizar Busca Avan&ccedil;ada";
$content['LN_VIEW_MESSAGECENTERED'] = "Eliminar filtros e visualizar esta mensagem no topo";
$content['LN_VIEW_RELATEDMSG'] = "Ver mensagens relacionadas";
$content['LN_VIEW_FILTERFOR'] = "Filtrar mensagens por ";
$content['LN_VIEW_SEARCHFOR'] = "Busca online por ";
$content['LN_VIEW_SEARCHFORGOOGLE'] = "Busca no Google por ";
$content['LN_GEN_MESSAGEDETAILS'] = "Detalhes da Mensagem";
$content['LN_HIGHLIGHT'] = "Destacar >>";
$content['LN_HIGHLIGHT_OFF'] = "Destacar <<";
$content['LN_HIGHLIGHT_WORDS'] = "Utilize uma lista de palavras separadas por v&iacute;rgula";
$content['LN_AUTORELOAD'] = "Define auto recarregamento";
$content['LN_AUTORELOAD_DISABLED'] = "Auto recarregamento desabilitado";
$content['LN_AUTORELOAD_PRECONFIGURED'] = "Auto recarregamento pr&eacute;-configurado ";
$content['LN_AUTORELOAD_SECONDS'] = "segundos";
$content['LN_AUTORELOAD_MINUTES'] = "minutos";
$content['LN_ERROR_NORECORDS'] = "Sem mensagens encontradas.";
// Filter Options
$content['LN_FILTER_DATE'] = "Intervalo Data/Hora";
$content['LN_FILTER_DATEMODE'] = "Selecionar Modo";
$content['LN_DATEMODE_ALL'] = "Todo o tempo";
$content['LN_DATEMODE_RANGE'] = "Intervalo de tempo";
$content['LN_DATEMODE_LASTX'] = "Tempo X desde hoje";
$content['LN_FILTER_DATEFROM'] = "Data a partir de ";
$content['LN_FILTER_DATETO'] = "At&eacute;";
$content['LN_FILTER_DATELASTX'] = "Tempo desde";
$content['LN_FILTER_ADD2SEARCH'] = "Adicionar a busca";
$content['LN_DATE_LASTX_HOUR'] = "&Uacute;ltima hora";
$content['LN_DATE_LASTX_12HOURS'] = "&Uacute;ltimas 12 horas";
$content['LN_DATE_LASTX_24HOURS'] = "&Uacute;ltimas 24 horas";
$content['LN_DATE_LASTX_7DAYS'] = "&Uacute;ltimos 7 dias";
$content['LN_DATE_LASTX_31DAYS'] = "&Uacute;ltimos 31 dias";
$content['LN_FILTER_FACILITY'] = "Facility";
$content['LN_FILTER_SEVERITY'] = "Severidade";
$content['LN_FILTER_OTHERS'] = "Outros Filtros";
$content['LN_FILTER_MESSAGE'] = "Mensagem Syslog";
$content['LN_FILTER_SYSLOGTAG'] = "Syslogtag";
$content['LN_FILTER_SOURCE'] = "Origem (Hostname)";
$content['LN_FILTER_MESSAGETYPE'] = "Tipo de mensagem";
// Field Captions
$content['LN_FIELDS_DATE'] = "Data";
$content['LN_FIELDS_FACILITY'] = "Facility";
$content['LN_FIELDS_SEVERITY'] = "Severidade";
$content['LN_FIELDS_HOST'] = "Host";
$content['LN_FIELDS_SYSLOGTAG'] = "Syslogtag";
$content['LN_FIELDS_PROCESSID'] = "ID do processo";
$content['LN_FIELDS_MESSAGETYPE'] = "Tipo da Mensagem";
$content['LN_FIELDS_UID'] = "uID";
$content['LN_FIELDS_MESSAGE'] = "Mensagem";
$content['LN_FIELDS_EVENTID'] = "ID do Evento";
$content['LN_FIELDS_EVENTLOGTYPE'] = "Tipo do Evento";
$content['LN_FIELDS_EVENTSOURCE'] = "Origem do Evento";
$content['LN_FIELDS_EVENTCATEGORY'] = "Categoria do Evento";
$content['LN_FIELDS_EVENTUSER'] = "Evento de Usu&acute;rio";
// Install Page
$content['LN_CFG_DBSERVER'] = "Servidor BD";
$content['LN_CFG_DBPORT'] = "Porta BD";
$content['LN_CFG_DBNAME'] = "Nome BD";
$content['LN_CFG_DBPREF'] = "Prefixo para as tabelas";
$content['LN_CFG_DBUSER'] = "Usu&aacute;rio";
$content['LN_CFG_DBPASSWORD'] = "Password";
$content['LN_CFG_PARAMMISSING'] = "O seguinte par&acirc;metro esta faltando: ";
$content['LN_CFG_SOURCETYPE'] = "Tipo de Origem";
$content['LN_CFG_DISKTYPEOPTIONS'] = "Op&ccedil;&oatilde;oes de disco";
$content['LN_CFG_LOGLINETYPE'] = "Formato linha do log";
$content['LN_CFG_SYSLOGFILE'] = "Arquivo Syslog";
$content['LN_CFG_DATABASETYPEOPTIONS'] = "Op&ccedil;&oatilde;es BD";
$content['LN_CFG_DBTABLETYPE'] = "Tipo de tabela";
$content['LN_CFG_DBSTORAGEENGINE'] = "Engine BD";
$content['LN_CFG_DBTABLENAME'] = "Nome tabela";
$content['LN_CFG_NAMEOFTHESOURCE'] = "Nome da origem";
$content['LN_CFG_FIRSTSYSLOGSOURCE'] = "Fonte prim&aacute;ria Syslog";
$content['LN_CFG_DBROWCOUNTING'] = "Habilitar contagem de registro";
$content['LN_CFG_VIEW'] = "Selecione vis&atilde;o";
// Details page
$content['LN_DETAILS_FORSYSLOGMSG'] = "Detalhes para a mensagem com id";
$content['LN_DETAILS_DETAILSFORMSG'] = "Detalhes para a mensagem com id";
$content['LN_DETAIL_BACKTOLIST'] = "Voltar para a lista";
?>