Produced by Araxis Merge on 2016-08-05 09:21:33 +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 | 2016-08-05 09:21:33 +0000 | ||
| 2 | /Merge Test Files/jakarta-tomcat-4.1.18-src/catalina/src/share/org/apache/catalina/connector/http | LocalString_fr.properties | 2002-12-19 13:49:40 +0000 |
| 3 | /Merge Test Files/jakarta-tomcat-4.1.24-src/catalina/src/share/org/apache/catalina/connector/http | LocalString_fr.properties | 2003-03-19 09:18:36 +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 | 0 | 0 | 1 | 72 | ||
| Changed | 0 | 0 | 0 | 0 | 0 | 0 |
| Inserted | 1 | 36 | 0 | 0 | 0 | 0 |
| Removed | 0 | 0 | 0 | 0 | 1 | 36 |
| 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: LocalString_fr.properties,v 1.1 2002/11/06 09:21:18 hgomez Exp $ | 1 | # $Id: LocalString_fr.properties,v 1.1 2002/11/06 09:21:18 hgomez Exp $ | |||||||
| 2 | 2 | |||||||||
| 3 | # language | 3 | # language | |||||||
| 4 | 4 | |||||||||
| 5 | # package org.apache.catalina.connector.http | 5 | # package org.apache.catalina.connector.http | |||||||
| 6 | 6 | |||||||||
| 7 | 7 | |||||||||
| 8 | httpConnector.alreadyInitialized=Le connecteur HTTP a d￩j￠ ￩t￩ initialis￩ | 8 | httpConnector.alreadyInitialized=Le connecteur HTTP a d￩j￠ ￩t￩ initialis￩ | |||||||
| 9 | httpConnector.alreadyStarted=Le connecteur HTTP a d￩j￠ ￩t￩ d￩marr￩ | 9 | httpConnector.alreadyStarted=Le connecteur HTTP a d￩j￠ ￩t￩ d￩marr￩ | |||||||
| 10 | httpConnector.allAddresses=Ouverture du serveur socket sur toutes les adresses IP de l''hte | 10 | httpConnector.allAddresses=Ouverture du serveur socket sur toutes les adresses IP de l''hte | |||||||
| 11 | httpConnector.failedSocketFactoryLoading=Echec lors du chargement du cr￩ateur de socket (socket factory) | 11 | httpConnector.failedSocketFactoryLoading=Echec lors du chargement du cr￩ateur de socket (socket factory) | |||||||
| 12 | httpConnector.failedToCreateSocket=Le cr￩ateur de socket (socket factory) n''a pu cr￩er la socket | 12 | httpConnector.failedToCreateSocket=Le cr￩ateur de socket (socket factory) n''a pu cr￩er la socket | |||||||
| 13 | httpConnector.anAddress=Ouverture du serveur socket pour l''hte ￠ l''adresse IP {0} | 13 | httpConnector.anAddress=Ouverture du serveur socket pour l''hte ￠ l''adresse IP {0} | |||||||
| 14 | httpConnector.noAddress=Aucune adresse IP de l''hte correspondant ￠ {0}, ouverture sur toutes les adresses | 14 | httpConnector.noAddress=Aucune adresse IP de l''hte correspondant ￠ {0}, ouverture sur toutes les adresses | |||||||
| 15 | httpConnector.noProcessor=Aucun processeur (processor) disponible, rejet de cette connexion | 15 | httpConnector.noProcessor=Aucun processeur (processor) disponible, rejet de cette connexion | |||||||
| 16 | httpConnector.notStarted=Le connecteur HTTP n''a pas encore ￩t￩ d￩marr￩ | 16 | httpConnector.notStarted=Le connecteur HTTP n''a pas encore ￩t￩ d￩marr￩ | |||||||
| 17 | httpConnector.starting=D￩marrage du thread de fond (background thread) | 17 | httpConnector.starting=D￩marrage du thread de fond (background thread) | |||||||
| 18 | httpConnector.stopping=Arr￪t du thread de fond (background thread) | 18 | httpConnector.stopping=Arr￪t du thread de fond (background thread) | |||||||
| 19 | httpProcessor.alreadyStarted=Le processeur HTTP a d￩j￠ ￩t￩ d￩marr￩ | 19 | httpProcessor.alreadyStarted=Le processeur HTTP a d￩j￠ ￩t￩ d￩marr￩ | |||||||
| 20 | httpProcessor.notStarted=Le processeur HTTP n''a pas encore ￩t￩ d￩marr￩ | 20 | httpProcessor.notStarted=Le processeur HTTP n''a pas encore ￩t￩ d￩marr￩ | |||||||
| 21 | httpProcessor.parseHeaders.contentLength=Ent￪te de taille de contenu (Content-Length) invalide | 21 | httpProcessor.parseHeaders.contentLength=Ent￪te de taille de contenu (Content-Length) invalide | |||||||
| 22 | httpProcessor.parseHeaders.colon=Format d''ent￪te HTTP invalide | 22 | httpProcessor.parseHeaders.colon=Format d''ent￪te HTTP invalide | |||||||
| 23 | httpProcessor.parseHeaders.portNumber=Num￩ro de port TCP/IP invalide dans l''ent￪te 'Host' | 23 | httpProcessor.parseHeaders.portNumber=Num￩ro de port TCP/IP invalide dans l''ent￪te 'Host' | |||||||
| 24 | httpProcessor.parseRequest.decode=Impossible de d￩coder l''URI de requ￪te HTTP | 24 | httpProcessor.parseRequest.decode=Impossible de d￩coder l''URI de requ￪te HTTP | |||||||
| 25 | httpProcessor.parseRequest.method=M￩thode de requ￪te HTTP absente | 25 | httpProcessor.parseRequest.method=M￩thode de requ￪te HTTP absente | |||||||
| 26 | httpProcessor.parseRequest.read=Ligne de requ￪te HTTP absente | 26 | httpProcessor.parseRequest.read=Ligne de requ￪te HTTP absente | |||||||
| 27 | httpProcessor.parseRequest.uri=URI de requ￪te HTTP absente | 27 | httpProcessor.parseRequest.uri=URI de requ￪te HTTP absente | |||||||
| 28 | httpProcessor.parseHeaders.unknownExpectation=Champs d''ent￪te "Expect" inconnu | 28 | httpProcessor.parseHeaders.unknownExpectation=Champs d''ent￪te "Expect" inconnu | |||||||
| 29 | httpProcessor.start=Le processeur HTTP a d￩j￠ ￩t￩ d￩marr￩ | 29 | httpProcessor.start=Le processeur HTTP a d￩j￠ ￩t￩ d￩marr￩ | |||||||
| 30 | httpProcessor.starting=D￩marrage du thread de fond (background thread) | 30 | httpProcessor.starting=D￩marrage du thread de fond (background thread) | |||||||
| 31 | httpProcessor.stopping=Arr￪t du thread de fond (background thread) | 31 | httpProcessor.stopping=Arr￪t du thread de fond (background thread) | |||||||
| 32 | requestStream.close.closed=Le flux de requ￪te (request stream) a d￩j￠ ￩t￩ ferm￩ | 32 | requestStream.close.closed=Le flux de requ￪te (request stream) a d￩j￠ ￩t￩ ferm￩ | |||||||
| 33 | requestStream.read.closed=Impossible de lire depuis un flux ferm￩ (closed stream) | 33 | requestStream.read.closed=Impossible de lire depuis un flux ferm￩ (closed stream) | |||||||
| 34 | requestStream.read.error=Fin de flux inattendue | 34 | requestStream.read.error=Fin de flux inattendue | |||||||
| 35 | requestStream.readline.error=Impossible de lire la ligne | 35 | requestStream.readline.error=Impossible de lire la ligne | |||||||
| 36 | requestStream.readline.toolong=Ligne trop longue | 36 | requestStream.readline.toolong=Ligne trop longue |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.