Produced by Araxis Merge on 2016-08-05 09:21:32 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | /Merge Test Files/jakarta-tomcat-4.0.6-src/catalina/src/share/org/apache/catalina/connector/http | LocalStrings_es.properties | 2002-10-08 14:15:36 +0000 |
| 2 | /Merge Test Files/jakarta-tomcat-4.1.18-src/catalina/src/share/org/apache/catalina/connector/http | LocalStrings_es.properties | 2002-12-19 13:49:44 +0000 |
| 3 | /Merge Test Files/jakarta-tomcat-4.1.24-src/catalina/src/share/org/apache/catalina/connector/http | LocalStrings_es.properties | 2003-03-19 09:18:40 +0000 |
| Note: Merge considers the second file to be the common ancestor of the others. | |||
| Description | Between Files 1 and 2 | Between Files 2 and 3 | Relative to Common Ancestor | |||
|---|---|---|---|---|---|---|
| Text Blocks | Lines | Text Blocks | Lines | Text Blocks | Lines | |
| Unchanged | 1 | 70 | 1 | 70 | ||
| Changed | 0 | 0 | 0 | 0 | 0 | 0 |
| Inserted | 0 | 0 | 0 | 0 | 0 | 0 |
| Removed | 0 | 0 | 0 | 0 | 0 | 0 |
| Note: An automatic merge would leave 0 conflict(s). | ||||||
| Whitespace | Differences in whitespace are significant |
|---|---|
| Character case | Differences in character case are significant |
| Line endings | Differences in line endings (CR and LF characters) are significant |
| CR/LF characters | Not shown in the comparison detail |
No regular expressions were active.
| 1 | # $Id: LocalStrings_es.properties,v 1.1 2000/12/31 16:35:16 nacho Exp $ | 1 | # $Id: LocalStrings_es.properties,v 1.1 2000/12/31 16:35:16 nacho Exp $ | 1 | # $Id: LocalStrings_es.properties,v 1.1 2000/12/31 16:35:16 nacho Exp $ | |||||
| 2 | 2 | 2 | ||||||||
| 3 | # language es | 3 | # language es | 3 | # language es | |||||
| 4 | 4 | 4 | ||||||||
| 5 | # package org.apache.catalina.connector.http | 5 | # package org.apache.catalina.connector.http | 5 | # package org.apache.catalina.connector.http | |||||
| 6 | 6 | 6 | ||||||||
| 7 | 7 | 7 | ||||||||
| 8 | httpConnector.alreadyStarted=Conector HTTP ha sido ya iniciado | 8 | httpConnector.alreadyStarted=Conector HTTP ha sido ya iniciado | 8 | httpConnector.alreadyStarted=Conector HTTP ha sido ya iniciado | |||||
| 9 | httpConnector.allAddresses=Abriendo sockets de servidor en todas las direcciones IP disponibles | 9 | httpConnector.allAddresses=Abriendo sockets de servidor en todas las direcciones IP disponibles | 9 | httpConnector.allAddresses=Abriendo sockets de servidor en todas las direcciones IP disponibles | |||||
| 10 | httpConnector.failedSocketFactoryLoading=Problemas para cargar la factoria de sockets | 10 | httpConnector.failedSocketFactoryLoading=Problemas para cargar la factoria de sockets | 10 | httpConnector.failedSocketFactoryLoading=Problemas para cargar la factoria de sockets | |||||
| 11 | httpConnector.failedToCreateSocket=La factoria de sockets a fallado al crear un socket | 11 | httpConnector.failedToCreateSocket=La factoria de sockets a fallado al crear un socket | 11 | httpConnector.failedToCreateSocket=La factoria de sockets a fallado al crear un socket | |||||
| 12 | httpConnector.anAddress=Abriendo sockets en las direccion IP {0} | 12 | httpConnector.anAddress=Abriendo sockets en las direccion IP {0} | 12 | httpConnector.anAddress=Abriendo sockets en las direccion IP {0} | |||||
| 13 | httpConnector.noAddress=No existe la direccionb IP {0}, abriendo todas las disponibles | 13 | httpConnector.noAddress=No existe la direccionb IP {0}, abriendo todas las disponibles | 13 | httpConnector.noAddress=No existe la direccionb IP {0}, abriendo todas las disponibles | |||||
| 14 | httpConnector.noProcessor=No hay procesador disponible, rechazando esta conexion | 14 | httpConnector.noProcessor=No hay procesador disponible, rechazando esta conexion | 14 | httpConnector.noProcessor=No hay procesador disponible, rechazando esta conexion | |||||
| 15 | httpConnector.notStarted=Conector HTTP no ha sido iniciado todavia | 15 | httpConnector.notStarted=Conector HTTP no ha sido iniciado todavia | 15 | httpConnector.notStarted=Conector HTTP no ha sido iniciado todavia | |||||
| 16 | httpConnector.starting=Iniciando thread de posterior | 16 | httpConnector.starting=Iniciando thread de posterior | 16 | httpConnector.starting=Iniciando thread de posterior | |||||
| 17 | httpConnector.stopping=Parando thread posterior | 17 | httpConnector.stopping=Parando thread posterior | 17 | httpConnector.stopping=Parando thread posterior | |||||
| 18 | httpProcessor.alreadyStarted=Procesador HTTP ha sido ya iniciado | 18 | httpProcessor.alreadyStarted=Procesador HTTP ha sido ya iniciado | 18 | httpProcessor.alreadyStarted=Procesador HTTP ha sido ya iniciado | |||||
| 19 | httpProcessor.notStarted=Procesador HTTP no ha sido iniciado todavia | 19 | httpProcessor.notStarted=Procesador HTTP no ha sido iniciado todavia | 19 | httpProcessor.notStarted=Procesador HTTP no ha sido iniciado todavia | |||||
| 20 | httpProcessor.parseHeaders.contentLength=Cabecera 'Content-Lenght' no valida | 20 | httpProcessor.parseHeaders.contentLength=Cabecera 'Content-Lenght' no valida | 20 | httpProcessor.parseHeaders.contentLength=Cabecera 'Content-Lenght' no valida | |||||
| 21 | httpProcessor.parseHeaders.colon=Cabecera HTTP no valida | 21 | httpProcessor.parseHeaders.colon=Cabecera HTTP no valida | 21 | httpProcessor.parseHeaders.colon=Cabecera HTTP no valida | |||||
| 22 | httpProcessor.parseHeaders.portNumber=Numero de puerto TCP/IP no valido en la cabecera 'Host' | 22 | httpProcessor.parseHeaders.portNumber=Numero de puerto TCP/IP no valido en la cabecera 'Host' | 22 | httpProcessor.parseHeaders.portNumber=Numero de puerto TCP/IP no valido en la cabecera 'Host' | |||||
| 23 | httpProcessor.parseRequest.decode=No se puede decodificar el URI de la peticion HTTP | 23 | httpProcessor.parseRequest.decode=No se puede decodificar el URI de la peticion HTTP | 23 | httpProcessor.parseRequest.decode=No se puede decodificar el URI de la peticion HTTP | |||||
| 24 | httpProcessor.parseRequest.method=Metodo de la peticion HTTP inexistente | 24 | httpProcessor.parseRequest.method=Metodo de la peticion HTTP inexistente | 24 | httpProcessor.parseRequest.method=Metodo de la peticion HTTP inexistente | |||||
| 25 | httpProcessor.parseRequest.read=Linea de la peticion HTTP inexistente | 25 | httpProcessor.parseRequest.read=Linea de la peticion HTTP inexistente | 25 | httpProcessor.parseRequest.read=Linea de la peticion HTTP inexistente | |||||
| 26 | httpProcessor.parseRequest.uri=El URI peticion HTTP inexistente | 26 | httpProcessor.parseRequest.uri=El URI peticion HTTP inexistente | 26 | httpProcessor.parseRequest.uri=El URI peticion HTTP inexistente | |||||
| 27 | httpProcessor.parseHeaders.unknownExpectation=Campo de cabecera Expect desconocido | 27 | httpProcessor.parseHeaders.unknownExpectation=Campo de cabecera Expect desconocido | 27 | httpProcessor.parseHeaders.unknownExpectation=Campo de cabecera Expect desconocido | |||||
| 28 | httpProcessor.start=Procesador HTTP ha sido ya iniciado | 28 | httpProcessor.start=Procesador HTTP ha sido ya iniciado | 28 | httpProcessor.start=Procesador HTTP ha sido ya iniciado | |||||
| 29 | httpProcessor.starting=Iniciando thread de posterior | 29 | httpProcessor.starting=Iniciando thread de posterior | 29 | httpProcessor.starting=Iniciando thread de posterior | |||||
| 30 | httpProcessor.stopping=Parando thread posterior | 30 | httpProcessor.stopping=Parando thread posterior | 30 | httpProcessor.stopping=Parando thread posterior | |||||
| 31 | requestStream.close.closed=El flujo de la peticion ha sido cerrado ya | 31 | requestStream.close.closed=El flujo de la peticion ha sido cerrado ya | 31 | requestStream.close.closed=El flujo de la peticion ha sido cerrado ya | |||||
| 32 | requestStream.read.closed=No se puede leer de un flujo cerrado | 32 | requestStream.read.closed=No se puede leer de un flujo cerrado | 32 | requestStream.read.closed=No se puede leer de un flujo cerrado | |||||
| 33 | requestStream.read.error=Final de flujo inesperado | 33 | requestStream.read.error=Final de flujo inesperado | 33 | requestStream.read.error=Final de flujo inesperado | |||||
| 34 | requestStream.readline.error=No puede leer la linea | 34 | requestStream.readline.error=No puede leer la linea | 34 | requestStream.readline.error=No puede leer la linea | |||||
| 35 | requestStream.readline.toolong=Linea demasiado larga | 35 | requestStream.readline.toolong=Linea demasiado larga | 35 | requestStream.readline.toolong=Linea demasiado larga |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.