16. Araxis Merge File Comparison Report

Produced by Araxis Merge on 11/20/2017 2:15:52 PM GMT Standard Time. 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.

16.1 Files compared

#	Location	File	Last Modified
1	C:\Merge Test Files\8.0.47\java\org\apache\catalina\authenticator	LocalStrings_fr.properties	Fri Sep 29 16:53:28 2017 UTC
2	C:\Merge Test Files\8.5.23\java\org\apache\catalina\authenticator	LocalStrings_fr.properties	Thu Sep 28 11:32:16 2017 UTC
3	C:\Merge Test Files\9.0.1\java\org\apache\catalina\authenticator	LocalStrings_fr.properties	Wed Sep 27 18:33:40 2017 UTC
Note: Merge considers the second file to be the common ancestor of the others.

16.2 Comparison summary

Description	Between Files 1 and 2		Between Files 2 and 3		Relative to Common Ancestor
Description	Text Blocks	Lines	Text Blocks	Lines	Text Blocks	Lines
Unchanged	1	42	1	42
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).

16.3 Comparison options

Whitespace	Consecutive whitespace is treated as a single space
Character case	Differences in character case are significant
Line endings	Differences in line endings (`CR` and `LF` characters) are ignored
CR/LF characters	Not shown in the comparison detail

16.4 Active regular expressions

No regular expressions were active.

16.5 Comparison detail

1	# Licensed to the Ap ache Softw are Founda tion (ASF) under one or more	1	# Licensed to the Ap ache Softw are Founda tion (ASF) under one or more	1	# Licensed to the Ap ache Softw are Founda tion (ASF) under one or more
2	# contribu tor licens e agreemen ts. See t he NOTICE file distr ibuted wit h	2	# contribu tor licens e agreemen ts. See t he NOTICE file distr ibuted wit h	2	# contribu tor licens e agreemen ts. See t he NOTICE file distr ibuted wit h
3	# this wor k for addi tional inf ormation r egarding c opyright o wnership.	3	# this wor k for addi tional inf ormation r egarding c opyright o wnership.	3	# this wor k for addi tional inf ormation r egarding c opyright o wnership.
4	# The ASF licenses t his file t o You unde r the Apac he License , Version 2.0	4	# The ASF licenses t his file t o You unde r the Apac he License , Version 2.0	4	# The ASF licenses t his file t o You unde r the Apac he License , Version 2.0
5	# (the "Li cense"); y ou may not use this file excep t in compl iance with	5	# (the "Li cense"); y ou may not use this file excep t in compl iance with	5	# (the "Li cense"); y ou may not use this file excep t in compl iance with
6	# the Lice nse. You may obtain a copy of the Licen se at	6	# the Lice nse. You may obtain a copy of the Licen se at	6	# the Lice nse. You may obtain a copy of the Licen se at
7	#	7	#	7	#
8	# http ://www.apa che.org/li censes/LIC ENSE-2.0	8	# http ://www.apa che.org/li censes/LIC ENSE-2.0	8	# http ://www.apa che.org/li censes/LIC ENSE-2.0
9	#	9	#	9	#
10	# Unless r equired by applicabl e law or a greed to i n writing, software	10	# Unless r equired by applicabl e law or a greed to i n writing, software	10	# Unless r equired by applicabl e law or a greed to i n writing, software
11	# distribu ted under the Licens e is distr ibuted on an "AS IS" BASIS,	11	# distribu ted under the Licens e is distr ibuted on an "AS IS" BASIS,	11	# distribu ted under the Licens e is distr ibuted on an "AS IS" BASIS,
12	# WITHOUT WARRANTIES OR CONDIT IONS OF AN Y KIND, ei ther expre ss or impl ied.	12	# WITHOUT WARRANTIES OR CONDIT IONS OF AN Y KIND, ei ther expre ss or impl ied.	12	# WITHOUT WARRANTIES OR CONDIT IONS OF AN Y KIND, ei ther expre ss or impl ied.
13	# See the License fo r the spec ific langu age govern ing permis sions and	13	# See the License fo r the spec ific langu age govern ing permis sions and	13	# See the License fo r the spec ific langu age govern ing permis sions and
14	# limitati ons under the Licens e.	14	# limitati ons under the Licens e.	14	# limitati ons under the Licens e.
15		15		15
16	authentica tor.certif icates=Auc une cha\u0 0eene de c ertificat client (cl ient certi ficate cha in) dans c ette requ\ u00eate	16	authentica tor.certif icates=Auc une cha\u0 0eene de c ertificat client (cl ient certi ficate cha in) dans c ette requ\ u00eate	16	authentica tor.certif icates=Auc une cha\u0 0eene de c ertificat client (cl ient certi ficate cha in) dans c ette requ\ u00eate
17	authentica tor.formlo gin=R\u00e 9f\u00e9re nce direct e \u00e0 l a form de connexion (form logi n page) in valide	17	authentica tor.formlo gin=R\u00e 9f\u00e9re nce direct e \u00e0 l a form de connexion (form logi n page) in valide	17	authentica tor.formlo gin=R\u00e 9f\u00e9re nce direct e \u00e0 l a form de connexion (form logi n page) in valide
18	authentica tor.manage r=Exceptio n lors de l''initial isation de s gestionn aires d''a uthentific ation (tru st manager s)	18	authentica tor.manage r=Exceptio n lors de l''initial isation de s gestionn aires d''a uthentific ation (tru st manager s)	18	authentica tor.manage r=Exceptio n lors de l''initial isation de s gestionn aires d''a uthentific ation (tru st manager s)
19	authentica tor.notCon text=Erreu r de confi guration: Doit \u00 eatre atta ch\u00e9 \ u00e0 un c ontexte	19	authentica tor.notCon text=Erreu r de confi guration: Doit \u00 eatre atta ch\u00e9 \ u00e0 un c ontexte	19	authentica tor.notCon text=Erreu r de confi guration: Doit \u00 eatre atta ch\u00e9 \ u00e0 un c ontexte
20	authentica tor.unauth orized=Imp ossible d' 'authentif ier avec l es cr\u00e 9dits four nis (provi ded creden tials)	20	authentica tor.unauth orized=Imp ossible d' 'authentif ier avec l es cr\u00e 9dits four nis (provi ded creden tials)	20	authentica tor.unauth orized=Imp ossible d' 'authentif ier avec l es cr\u00e 9dits four nis (provi ded creden tials)
21		21		21