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.
| # | Location | File | Last Modified |
|---|---|---|---|
| 1 | C:\Merge Test Files\8.0.47\java\org\apache\catalina\authenticator | LocalStrings_ja.properties | Fri Sep 29 16:53:28 2017 UTC |
| 2 | C:\Merge Test Files\8.5.23\java\org\apache\catalina\authenticator | LocalStrings_ja.properties | Thu Sep 28 11:32:16 2017 UTC |
| 3 | C:\Merge Test Files\9.0.1\java\org\apache\catalina\authenticator | LocalStrings_ja.properties | Wed Sep 27 18:33:40 2017 UTC |
| 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 | 44 | 1 | 44 | ||
| 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 | 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 |
No regular expressions were active.
| 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=\u3 053\u306e\ u30ea\u30a f\u30a8\u3 0b9\u30c8\ u306b\u306 f\u30af\u3 0e9\u30a4\ u30a2\u30f 3\u30c8\u8 a8d\u8a3c\ u30c1\u30a 7\u30fc\u3 0f3\u304c\ u3042\u308 a\u307e\u3 05b\u3093 | 16 | authentica tor.certif icates=\u3 053\u306e\ u30ea\u30a f\u30a8\u3 0b9\u30c8\ u306b\u306 f\u30af\u3 0e9\u30a4\ u30a2\u30f 3\u30c8\u8 a8d\u8a3c\ u30c1\u30a 7\u30fc\u3 0f3\u304c\ u3042\u308 a\u307e\u3 05b\u3093 | 16 | authentica tor.certif icates=\u3 053\u306e\ u30ea\u30a f\u30a8\u3 0b9\u30c8\ u306b\u306 f\u30af\u3 0e9\u30a4\ u30a2\u30f 3\u30c8\u8 a8d\u8a3c\ u30c1\u30a 7\u30fc\u3 0f3\u304c\ u3042\u308 a\u307e\u3 05b\u3093 | |||||
| 17 | authentica tor.formlo gin=\u30d5 \u30a9\u30 fc\u30e0\u 30ed\u30b0 \u30a4\u30 f3\u30da\u 30fc\u30b8 \u3078\u30 6e\u7121\u 52b9\u306a \u76f4\u63 a5\u53c2\u 7167\u3067 \u3059 | 17 | authentica tor.formlo gin=\u30d5 \u30a9\u30 fc\u30e0\u 30ed\u30b0 \u30a4\u30 f3\u30da\u 30fc\u30b8 \u3078\u30 6e\u7121\u 52b9\u306a \u76f4\u63 a5\u53c2\u 7167\u3067 \u3059 | 17 | authentica tor.formlo gin=\u30d5 \u30a9\u30 fc\u30e0\u 30ed\u30b0 \u30a4\u30 f3\u30da\u 30fc\u30b8 \u3078\u30 6e\u7121\u 52b9\u306a \u76f4\u63 a5\u53c2\u 7167\u3067 \u3059 | |||||
| 18 | authentica tor.manage r=\u30c8\u 30e9\u30b9 \u30c8\u30 de\u30cd\u 30fc\u30b8 \u30e3\u30 92\u521d\u 671f\u5316 \u4e2d\u30 6e\u4f8b\u 5916\u3067 \u3059 | 18 | authentica tor.manage r=\u30c8\u 30e9\u30b9 \u30c8\u30 de\u30cd\u 30fc\u30b8 \u30e3\u30 92\u521d\u 671f\u5316 \u4e2d\u30 6e\u4f8b\u 5916\u3067 \u3059 | 18 | authentica tor.manage r=\u30c8\u 30e9\u30b9 \u30c8\u30 de\u30cd\u 30fc\u30b8 \u30e3\u30 92\u521d\u 671f\u5316 \u4e2d\u30 6e\u4f8b\u 5916\u3067 \u3059 | |||||
| 19 | authentica tor.notCon text=\u8a2 d\u5b9a\u3 0a8\u30e9\ u30fc: \u3 0b3\u30f3\ u30c6\u30a d\u30b9\u3 0c8\u306b\ u6307\u5b9 a\u3057\u3 06a\u3051\ u308c\u307 0\u3044\u3 051\u307e\ u305b\u309 3 | 19 | authentica tor.notCon text=\u8a2 d\u5b9a\u3 0a8\u30e9\ u30fc: \u3 0b3\u30f3\ u30c6\u30a d\u30b9\u3 0c8\u306b\ u6307\u5b9 a\u3057\u3 06a\u3051\ u308c\u307 0\u3044\u3 051\u307e\ u305b\u309 3 | 19 | authentica tor.notCon text=\u8a2 d\u5b9a\u3 0a8\u30e9\ u30fc: \u3 0b3\u30f3\ u30c6\u30a d\u30b9\u3 0c8\u306b\ u6307\u5b9 a\u3057\u3 06a\u3051\ u308c\u307 0\u3044\u3 051\u307e\ u305b\u309 3 | |||||
| 20 | authentica tor.sessio nExpired=\ u30ed\u30b 0\u30a4\u3 0f3\u30d7\ u30ed\u30b b\u30b9\u3 06b\u8a8d\ u3081\u308 9\u308c\u3 066\u3044\ u305f\u664 2\u9593\u3 04c\u904e\ u304e\u307 e\u3057\u3 05f\u3002\ u7d99\u7d9 a\u3057\u3 05f\u3044\ u306a\u308 9\u3070\uf f0c\u30d0\ u30c3\u30a f\u30dc\u3 0bf\u30f3\ u30922\u5e a6\u62bc\u 3057\u3066 \u304b\u30 89\u518d\u 5ea6\u30ea \u30f3\u30 af\u3092\u 62bc\u3059 \u304b\uff 0c\u30d6\u 30e9\u30a6 \u30b6\u30 92\u7acb\u 3061\u4e0a \u3052\u76 f4\u3057\u 3066\u304f \u3060\u30 55\u3044 | 20 | authentica tor.sessio nExpired=\ u30ed\u30b 0\u30a4\u3 0f3\u30d7\ u30ed\u30b b\u30b9\u3 06b\u8a8d\ u3081\u308 9\u308c\u3 066\u3044\ u305f\u664 2\u9593\u3 04c\u904e\ u304e\u307 e\u3057\u3 05f\u3002\ u7d99\u7d9 a\u3057\u3 05f\u3044\ u306a\u308 9\u3070\uf f0c\u30d0\ u30c3\u30a f\u30dc\u3 0bf\u30f3\ u30922\u5e a6\u62bc\u 3057\u3066 \u304b\u30 89\u518d\u 5ea6\u30ea \u30f3\u30 af\u3092\u 62bc\u3059 \u304b\uff 0c\u30d6\u 30e9\u30a6 \u30b6\u30 92\u7acb\u 3061\u4e0a \u3052\u76 f4\u3057\u 3066\u304f \u3060\u30 55\u3044 | 20 | authentica tor.sessio nExpired=\ u30ed\u30b 0\u30a4\u3 0f3\u30d7\ u30ed\u30b b\u30b9\u3 06b\u8a8d\ u3081\u308 9\u308c\u3 066\u3044\ u305f\u664 2\u9593\u3 04c\u904e\ u304e\u307 e\u3057\u3 05f\u3002\ u7d99\u7d9 a\u3057\u3 05f\u3044\ u306a\u308 9\u3070\uf f0c\u30d0\ u30c3\u30a f\u30dc\u3 0bf\u30f3\ u30922\u5e a6\u62bc\u 3057\u3066 \u304b\u30 89\u518d\u 5ea6\u30ea \u30f3\u30 af\u3092\u 62bc\u3059 \u304b\uff 0c\u30d6\u 30e9\u30a6 \u30b6\u30 92\u7acb\u 3061\u4e0a \u3052\u76 f4\u3057\u 3066\u304f \u3060\u30 55\u3044 | |||||
| 21 | authentica tor.unauth orized=\u7 528\u610f\ u3055\u308 c\u305f\u8 a3c\u660e\ u66f8\u306 7\u8a8d\u8 a3c\u3067\ u304d\u307 e\u305b\u3 093 | 21 | authentica tor.unauth orized=\u7 528\u610f\ u3055\u308 c\u305f\u8 a3c\u660e\ u66f8\u306 7\u8a8d\u8 a3c\u3067\ u304d\u307 e\u305b\u3 093 | 21 | authentica tor.unauth orized=\u7 528\u610f\ u3055\u308 c\u305f\u8 a3c\u660e\ u66f8\u306 7\u8a8d\u8 a3c\u3067\ u304d\u307 e\u305b\u3 093 | |||||
| 22 | 22 | 22 |
Araxis Merge (but not the data content of this report) is Copyright © 1993–2017 Araxis Ltd (www.araxis.com). All rights reserved.