Produced by Araxis Merge on 2016-08-05 08:07:07 +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_ja.properties | 2002-10-08 14:15:34 +0000 |
| 2 | /Merge Test Files/jakarta-tomcat-4.1.18-src/catalina/src/share/org/apache/catalina/connector/http | LocalStrings_ja.properties | 2002-12-19 13:49:38 +0000 |
| Description | Between Files 1 and 2 | |
|---|---|---|
| Text Blocks | Lines | |
| Unchanged | 1 | 72 |
| Changed | 0 | 0 |
| Inserted | 0 | 0 |
| Removed | 0 | 0 |
| 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_ja.properties,v 1.1 2001/09/13 02:19:21 craigmcc Exp $ | 1 | # $Id: LocalStrings_ja.properties,v 1.1 2001/09/13 02:19:21 craigmcc 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=HTTP\u30b3\u30cd\u30af\u30bf\u306f\u3059\u3067\u306b\u521d\u671f\u5316\u3055\u308c\u3066\u3044\u307e\u3059 | 8 | httpConnector.alreadyInitialized=HTTP\u30b3\u30cd\u30af\u30bf\u306f\u3059\u3067\u306b\u521d\u671f\u5316\u3055\u308c\u3066\u3044\u307e\u3059 | |||
| 9 | httpConnector.alreadyStarted=HTTP\u30b3\u30cd\u30af\u30bf\u306f\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 | 9 | httpConnector.alreadyStarted=HTTP\u30b3\u30cd\u30af\u30bf\u306f\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 | |||
| 10 | httpConnector.allAddresses=\u3059\u3079\u3066\u306e\u30db\u30b9\u30c8IP\u30a2\u30c9\u30ec\u30b9\u306e\u30b5\u30fc\u30d0\u30bd\u30b1\u30c3\u30c8\u3092\u30aa\u30fc\u30d7\u30f3\u3057\u307e\u3059 | 10 | httpConnector.allAddresses=\u3059\u3079\u3066\u306e\u30db\u30b9\u30c8IP\u30a2\u30c9\u30ec\u30b9\u306e\u30b5\u30fc\u30d0\u30bd\u30b1\u30c3\u30c8\u3092\u30aa\u30fc\u30d7\u30f3\u3057\u307e\u3059 | |||
| 11 | httpConnector.failedSocketFactoryLoading=\u30bd\u30b1\u30c3\u30c8\u30d5\u30a1\u30af\u30c8\u30ea\u306e\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f | 11 | httpConnector.failedSocketFactoryLoading=\u30bd\u30b1\u30c3\u30c8\u30d5\u30a1\u30af\u30c8\u30ea\u306e\u30ed\u30fc\u30c9\u306b\u5931\u6557\u3057\u307e\u3057\u305f | |||
| 12 | httpConnector.failedToCreateSocket=\u30bd\u30b1\u30c3\u30c8\u30d5\u30a1\u30af\u30c8\u30ea\u306f\u30bd\u30b1\u30c3\u30c8\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f | 12 | httpConnector.failedToCreateSocket=\u30bd\u30b1\u30c3\u30c8\u30d5\u30a1\u30af\u30c8\u30ea\u306f\u30bd\u30b1\u30c3\u30c8\u306e\u4f5c\u6210\u306b\u5931\u6557\u3057\u307e\u3057\u305f | |||
| 13 | httpConnector.anAddress=\u30db\u30b9\u30c8IP\u30a2\u30c9\u30ec\u30b9 {0} \u306e\u30b5\u30fc\u30d0\u30bd\u30b1\u30c3\u30c8\u3092\u30aa\u30fc\u30d7\u30f3\u3057\u307e\u3059 | 13 | httpConnector.anAddress=\u30db\u30b9\u30c8IP\u30a2\u30c9\u30ec\u30b9 {0} \u306e\u30b5\u30fc\u30d0\u30bd\u30b1\u30c3\u30c8\u3092\u30aa\u30fc\u30d7\u30f3\u3057\u307e\u3059 | |||
| 14 | httpConnector.noAddress={0} \u306b\u4e00\u81f4\u3059\u308b\u30db\u30b9\u30c8IP\u30a2\u30c9\u30ec\u30b9\u306f\u5b58\u5728\u3057\u306a\u3044\u306e\u3067\u3001\u3059\u3079\u3066\u306e\u30a2\u30c9\u30ec\u30b9\u3092\u30aa\u30fc\u30d7\u30f3\u3057\u307e\u3059 | 14 | httpConnector.noAddress={0} \u306b\u4e00\u81f4\u3059\u308b\u30db\u30b9\u30c8IP\u30a2\u30c9\u30ec\u30b9\u306f\u5b58\u5728\u3057\u306a\u3044\u306e\u3067\u3001\u3059\u3079\u3066\u306e\u30a2\u30c9\u30ec\u30b9\u3092\u30aa\u30fc\u30d7\u30f3\u3057\u307e\u3059 | |||
| 15 | httpConnector.noProcessor=\u5229\u7528\u53ef\u80fd\u306a\u30d7\u30ed\u30bb\u30c3\u30b5\u304c\u306a\u3044\u306e\u3067\uff0c\u3053\u306e\u30b3\u30cd\u30af\u30b7\u30e7\u30f3\u3092\u62d2\u5426\u3057\u307e\u3059 | 15 | httpConnector.noProcessor=\u5229\u7528\u53ef\u80fd\u306a\u30d7\u30ed\u30bb\u30c3\u30b5\u304c\u306a\u3044\u306e\u3067\uff0c\u3053\u306e\u30b3\u30cd\u30af\u30b7\u30e7\u30f3\u3092\u62d2\u5426\u3057\u307e\u3059 | |||
| 16 | httpConnector.notStarted=HTTP\u30b3\u30cd\u30af\u30bf\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 | 16 | httpConnector.notStarted=HTTP\u30b3\u30cd\u30af\u30bf\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 | |||
| 17 | httpConnector.starting=\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u30b9\u30ec\u30c3\u30c9\u3092\u8d77\u52d5\u3057\u307e\u3059 | 17 | httpConnector.starting=\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u30b9\u30ec\u30c3\u30c9\u3092\u8d77\u52d5\u3057\u307e\u3059 | |||
| 18 | httpConnector.stopping=\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u30b9\u30ec\u30c3\u30c9\u3092\u505c\u6b62\u3057\u307e\u3059 | 18 | httpConnector.stopping=\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u30b9\u30ec\u30c3\u30c9\u3092\u505c\u6b62\u3057\u307e\u3059 | |||
| 19 | httpProcessor.alreadyStarted=HTTP\u30d7\u30ed\u30bb\u30c3\u30b5\u306f\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 | 19 | httpProcessor.alreadyStarted=HTTP\u30d7\u30ed\u30bb\u30c3\u30b5\u306f\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 | |||
| 20 | httpProcessor.notStarted=HTTP\u30d7\u30ed\u30bb\u30c3\u30b5\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 | 20 | httpProcessor.notStarted=HTTP\u30d7\u30ed\u30bb\u30c3\u30b5\u306f\u307e\u3060\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u305b\u3093 | |||
| 21 | httpProcessor.parseHeaders.contentLength=\u7121\u52b9\u306a'Content-Length'\u30d8\u30c3\u30c0\u3067\u3059 | 21 | httpProcessor.parseHeaders.contentLength=\u7121\u52b9\u306a'Content-Length'\u30d8\u30c3\u30c0\u3067\u3059 | |||
| 22 | httpProcessor.parseHeaders.colon=\u7121\u52b9\u306aHTTP\u30d8\u30c3\u30c0\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u3059 | 22 | httpProcessor.parseHeaders.colon=\u7121\u52b9\u306aHTTP\u30d8\u30c3\u30c0\u30d5\u30a9\u30fc\u30de\u30c3\u30c8\u3067\u3059 | |||
| 23 | httpProcessor.parseHeaders.portNumber='Host'\u30d8\u30c3\u30c0\u306b\u7121\u52b9\u306aTCP/IP\u30dd\u30fc\u30c8\u756a\u53f7\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059 | 23 | httpProcessor.parseHeaders.portNumber='Host'\u30d8\u30c3\u30c0\u306b\u7121\u52b9\u306aTCP/IP\u30dd\u30fc\u30c8\u756a\u53f7\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059 | |||
| 24 | httpProcessor.parseRequest.decode=HTTP\u30ea\u30af\u30a8\u30b9\u30c8\u306eURI\u3092\u30c7\u30b3\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093 | 24 | httpProcessor.parseRequest.decode=HTTP\u30ea\u30af\u30a8\u30b9\u30c8\u306eURI\u3092\u30c7\u30b3\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093 | |||
| 25 | httpProcessor.parseRequest.method=HTTP\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u3042\u308a\u307e\u305b\u3093 | 25 | httpProcessor.parseRequest.method=HTTP\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u30e1\u30bd\u30c3\u30c9\u304c\u3042\u308a\u307e\u305b\u3093 | |||
| 26 | httpProcessor.parseRequest.read=HTTP\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u884c\u304c\u3042\u308a\u307e\u305b\u3093 | 26 | httpProcessor.parseRequest.read=HTTP\u30ea\u30af\u30a8\u30b9\u30c8\u306e\u884c\u304c\u3042\u308a\u307e\u305b\u3093 | |||
| 27 | httpProcessor.parseRequest.uri=HTTP\u30ea\u30af\u30a8\u30b9\u30c8\u306eURI\u304c\u3042\u308a\u307e\u305b\u3093 | 27 | httpProcessor.parseRequest.uri=HTTP\u30ea\u30af\u30a8\u30b9\u30c8\u306eURI\u304c\u3042\u308a\u307e\u305b\u3093 | |||
| 28 | httpProcessor.parseHeaders.unknownExpectation=\u672a\u77e5\u306e\u30d8\u30c3\u30c0\u30d5\u30a3\u30fc\u30eb\u30c9\u3067\u3059 | 28 | httpProcessor.parseHeaders.unknownExpectation=\u672a\u77e5\u306e\u30d8\u30c3\u30c0\u30d5\u30a3\u30fc\u30eb\u30c9\u3067\u3059 | |||
| 29 | httpProcessor.start=HTTP\u30d7\u30ed\u30bb\u30c3\u30b5\u306f\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 | 29 | httpProcessor.start=HTTP\u30d7\u30ed\u30bb\u30c3\u30b5\u306f\u3059\u3067\u306b\u8d77\u52d5\u3055\u308c\u3066\u3044\u307e\u3059 | |||
| 30 | httpProcessor.starting=\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u30b9\u30ec\u30c3\u30c9\u3092\u8d77\u52d5\u3057\u307e\u3059 | 30 | httpProcessor.starting=\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u30b9\u30ec\u30c3\u30c9\u3092\u8d77\u52d5\u3057\u307e\u3059 | |||
| 31 | httpProcessor.stopping=\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u30b9\u30ec\u30c3\u30c9\u3092\u505c\u6b62\u3057\u307e\u3059 | 31 | httpProcessor.stopping=\u30d0\u30c3\u30af\u30b0\u30e9\u30a6\u30f3\u30c9\u30b9\u30ec\u30c3\u30c9\u3092\u505c\u6b62\u3057\u307e\u3059 | |||
| 32 | requestStream.close.closed=\u30ea\u30af\u30a8\u30b9\u30c8\u30b9\u30c8\u30ea\u30fc\u30e0\u306f\u3059\u3067\u306b\u30af\u30ed\u30fc\u30ba\u3055\u308c\u307e\u3057\u305f | 32 | requestStream.close.closed=\u30ea\u30af\u30a8\u30b9\u30c8\u30b9\u30c8\u30ea\u30fc\u30e0\u306f\u3059\u3067\u306b\u30af\u30ed\u30fc\u30ba\u3055\u308c\u307e\u3057\u305f | |||
| 33 | requestStream.read.closed=\u30af\u30ed\u30fc\u30ba\u3055\u308c\u305f\u30b9\u30c8\u30ea\u30fc\u30e0\u304b\u3089\u8aad\u3080\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093 | 33 | requestStream.read.closed=\u30af\u30ed\u30fc\u30ba\u3055\u308c\u305f\u30b9\u30c8\u30ea\u30fc\u30e0\u304b\u3089\u8aad\u3080\u3053\u3068\u306f\u3067\u304d\u307e\u305b\u3093 | |||
| 34 | requestStream.read.error=\u4e88\u60f3\u5916\u306b\u30b9\u30c8\u30ea\u30fc\u30e0\u304c\u7d42\u4e86\u3057\u307e\u3057\u305f | 34 | requestStream.read.error=\u4e88\u60f3\u5916\u306b\u30b9\u30c8\u30ea\u30fc\u30e0\u304c\u7d42\u4e86\u3057\u307e\u3057\u305f | |||
| 35 | requestStream.readline.error=\u884c\u304c\u8aad\u3081\u307e\u305b\u3093 | 35 | requestStream.readline.error=\u884c\u304c\u8aad\u3081\u307e\u305b\u3093 | |||
| 36 | requestStream.readline.toolong=\u884c\u304c\u9577\u3059\u304e\u307e\u3059 | 36 | requestStream.readline.toolong=\u884c\u304c\u9577\u3059\u304e\u307e\u3059 |
Araxis Merge (but not the data content of this report) is Copyright © 1993-2016 Araxis Ltd (www.araxis.com). All rights reserved.