http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/reference/api/TSMimeHdrFieldValueStringGet.en.po
----------------------------------------------------------------------
diff --git 
a/doc/locale/ja/LC_MESSAGES/reference/api/TSMimeHdrFieldValueStringGet.en.po 
b/doc/locale/ja/LC_MESSAGES/reference/api/TSMimeHdrFieldValueStringGet.en.po
new file mode 100644
index 0000000..7488aae
--- /dev/null
+++ b/doc/locale/ja/LC_MESSAGES/reference/api/TSMimeHdrFieldValueStringGet.en.po
@@ -0,0 +1,93 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache Traffic Server 4.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-15 22:31+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:21
+msgid "TSMimeHdrFieldValueStringGet"
+msgstr ""
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:25
+msgid "Synopsis"
+msgstr ""
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:27
+msgid "`#include <ts/ts.h>`"
+msgstr ""
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:37
+msgid "Description"
+msgstr ""
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:39
+msgid ""
+"MIME headers and fields can be components of request headers, response "
+"headers, or standalone headers created within a Traffic Server plugin. The "
+"functions here are all used to access header values of specific types, but "
+"it is up to the caller to know if a header has appropriate semantics for "
+"the API used. For all but :func:`TSMimeHdrFieldValueStringGet`, an "
+"appropriate data conversion algorithm is applied to the header field string."
+msgstr ""
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:47
+msgid ""
+"All the APIs take a :type:`TSMBuffer` marshal buffer argument, and a :type:"
+"`TSMLoc` argument indicating the location of the HTTP headers. The "
+"required :data:`field` argument is the locator of a specific header value, "
+"as returned by an accessor function such as :func:`TSMimeHdrFieldFind`."
+msgstr ""
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:53
+msgid ""
+"Within the header field, comma-separated values can be retrieved with an "
+"index (:data:`idx`) ranging from 0 to the maximum number of fields for this "
+"value; this maximum is retrieved using :func:`TSMimeHdrFieldValuesCount`. "
+"An :data:`idx` value of ``-1`` has the semantics of retrieving the entire "
+"header value, regardless of how many comma-separated values there are. If a "
+"header is not comma-separated, an :data:`idx` of :data:`0` or :data:`-1` "
+"are the same, but the latter is preferred."
+msgstr ""
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:61
+msgid ""
+":func:`TSMimeHdrFieldValueStringGet` returns a pointer to the header value, "
+"and populated :data:`value_len_ptr` with the length of the value in bytes. "
+"The returned header value is not NUL-terminated."
+msgstr ""
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:66
+msgid "Return values"
+msgstr ""
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:68
+msgid ""
+"All functions returns the header value with a type matching the respective "
+"function name. Using :func:`TSMimeHdrFieldValueDateGet` on a header which "
+"does not have date-time semantics always returns :data:`0`."
+msgstr ""
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:73
+msgid "Examples"
+msgstr ""
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:75
+msgid "This examples show how to retrieve and copy a specific header."
+msgstr ""
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:109
+msgid "See also"
+msgstr ""
+
+#: ../../reference/api/TSMimeHdrFieldValueStringGet.en.rst:111
+msgid ""
+":manpage:`TSAPI(3ts)`, :manpage:`TSMBufferCreate(3ts)`, :manpage:"
+"`TSMimeHdrFieldValuesCount(3ts)`"
+msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlCreate.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlCreate.en.po 
b/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlCreate.en.po
index 51c4e0d..3d93329 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlCreate.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlCreate.en.po
@@ -23,130 +23,76 @@ msgstr ""
 msgid "`#include <ts/ts.h>`"
 msgstr ""
 
-#: ../../reference/api/TSUrlCreate.en.rst:59
+#: ../../reference/api/TSUrlCreate.en.rst:35
 msgid "Description"
 msgstr ""
 
-#: ../../reference/api/TSUrlCreate.en.rst:61
+#: ../../reference/api/TSUrlCreate.en.rst:78
+msgid "See also"
+msgstr ""
+
+#: ../../reference/api/TSUrlCreate.en.rst:37
 msgid ""
 "The URL data structure is a parsed version of a standard internet URL. The "
 "Traffic Server URL API provides access to URL data stored in marshal "
 "buffers. The URL functions can create, copy, retrieve or delete entire "
-"URLs, and retrieve or modify parts of URLs, such as their port or scheme "
-"information."
-msgstr ""
-
-#: ../../reference/api/TSUrlCreate.en.rst:67
-msgid ""
-":func:`TSUrlCreate` creates a new URL within the marshal buffer bufp. "
-"Release the resulting handle with a call to TSHandleMLocRelease. :func:"
-"`TSUrlClone` copies the contents of the URL at location src_url within the "
-"marshal buffer src_bufp to a location within the marshal buffer dest_bufp. "
-"Release the returned handle with a call to :func:`TSHandleMLocRelease`."
+"URLs, and retrieve or modify parts of URLs, such as their host, port or "
+"scheme information."
 msgstr ""
 
-#: ../../reference/api/TSUrlCreate.en.rst:74
+#: ../../reference/api/TSUrlCreate.en.rst:43
 msgid ""
-":func:`TSUrlCopy` copies the contents of the URL at location src_url within "
-"the marshal buffer src_bufp to the location dest_url within the marshal "
-"buffer dest_bufp. :func:`TSUrlCopy` works correctly even if src_bufp and "
-"dest_bufp point to different marshal buffers. It is important for the "
-"destination URL (its marshal buffer and :type:`TSMLoc`) to have been "
-"created before copying into it."
+":func:`TSUrlCreate` creates a new URL within the marshal buffer :data:"
+"`bufp`. Release the resulting handle with a call to :func:"
+"`TSHandleMLocRelease`."
 msgstr ""
 
-#: ../../reference/api/TSUrlCreate.en.rst:81
+#: ../../reference/api/TSUrlCreate.en.rst:47
 msgid ""
-":func:`TSUrlPrint` formats a URL stored in an :type:`TSMBuffer` to an :type:"
-"`TSIOBuffer`."
+":func:`TSUrlClone` copies the contents of the URL at location :data:"
+"`src_url` within the marshal buffer :data:`src_bufp` to a location within "
+"the marshal buffer :data:`dest_bufp`. Release the returned handle with a "
+"call to :func:`TSHandleMLocRelease`."
 msgstr ""
 
-#: ../../reference/api/TSUrlCreate.en.rst:83
+#: ../../reference/api/TSUrlCreate.en.rst:52
 msgid ""
-":func:`TSUrlParse` parses a URL. The start pointer is both an input and an "
-"output parameter and marks the start of the URL to be parsed. After a "
-"successful parse, the start pointer equals the end pointer. The end pointer "
-"must be one byte after the last character you want to parse. The URL "
-"parsing routine assumes that everything between start and end is part of "
-"the URL. It is up to higher level parsing routines, such as :func:"
-"`TSHttpHdrParseReq`, to determine the actual end of the URL."
+":func:`TSUrlCopy` copies the contents of the URL at location :data:"
+"`src_url` within the marshal buffer :data:`src_bufp` to the location :data:"
+"`dest_url` within the marshal buffer dest_bufp. :func:`TSUrlCopy` works "
+"correctly even if :data:`src_bufp` and :data:`dest_bufp` point to different "
+"marshal buffers. It is important for the destination URL (its marshal "
+"buffer and :type:`TSMLoc`) to have been created before copying into it."
 msgstr ""
 
-#: ../../reference/api/TSUrlCreate.en.rst:91
-msgid ""
-":func:`TSUrlLengthGet` calculates the length of the URL located at offset "
-"within the marshal buffer bufp if it were returned as a string. This length "
-"will be the same as the length returned by :func:`TSUrlStringGet`."
-msgstr ""
-
-#: ../../reference/api/TSUrlCreate.en.rst:95
-msgid ""
-":func:`TSUrlStringGet` constructs a string representation of the URL "
-"located at offset within the marshal buffer bufp. :func:`TSUrlStringGet` "
-"stores the length of the allocated string in the parameter length. This is "
-"the same length that :func:`TSUrlLengthGet` returns. The returned string is "
-"allocated by a call to :func:`TSmalloc` and must be freed by a call to :"
-"func:`TSfree`. If length is NULL then no attempt is made to de-reference it."
-msgstr ""
-
-#: ../../reference/api/TSUrlCreate.en.rst:102
-msgid ""
-":func:`TSUrlSchemeGet`, :func:`TSUrlUserGet`, :func:`TSUrlPasswordGet`, :"
-"func:`TSUrlHostGet`, :func:`TSUrlHttpParamsGet`, :func:`TSUrlHttpQueryGet` "
-"and :func:`TSUrlHttpFragmentGet` each retrieve an internal pointer to the "
-"specified portion of the URL from the marshall buffer bufp. The length of "
-"the returned string is placed in length and a pointer to the URL portion is "
-"returned. The returned string is not guaranteed to be NUL-terminated."
-msgstr ""
-
-#: ../../reference/api/TSUrlCreate.en.rst:109
-msgid ""
-":func:`TSUrlSchemeSet`, :func:`TSUrlUserSet`, :func:`TSUrlPasswordSet`, :"
-"func:`TSUrlHostSet`, :func:`TSUrlHttpParamsSet`, :func:`TSUrlHttpQuerySet` "
-"and :func:`TSUrlHttpFragmentSet` each set the specified portion of the URL "
-"located at offset within the marshal buffer bufp to the string value. If "
-"length is -1 then these functions assume that value is NUL-terminated. "
-"Otherwise, the length of the string value is taken to be length. These "
-"functions copy the string to within bufp, so it can be subsequently "
-"modified or deleted."
-msgstr ""
-
-#: ../../reference/api/TSUrlCreate.en.rst:117
-msgid ""
-":func:`TSUrlPortGet` retrieves the port number portion of the URL located "
-"at offset within the marshal buffer bufp, It returns 0 if there is no port "
-"number."
-msgstr ""
-
-#: ../../reference/api/TSUrlCreate.en.rst:121
+#: ../../reference/api/TSUrlCreate.en.rst:59
 msgid ""
-":func:`TSUrlPortSet` sets the port number portion of the URL located at "
-"offset within the marshal buffer bufp to the value port."
+":func:`TSUrlParse` parses a URL. The :data:`start` pointer is both an input "
+"and an output parameter and marks the start of the URL to be parsed. After "
+"a successful parse, the :data:`start` pointer equals the :data:`end` "
+"pointer. The :data:`end` pointer must be one byte after the last character "
+"you want to parse. The URL parsing routine assumes that everything between :"
+"data:`start` and :data:`end` is part of the URL. It is up to higher level "
+"parsing routines, such as :func:`TSHttpHdrParseReq`, to determine the "
+"actual end of the URL."
 msgstr ""
 
-#: ../../reference/api/TSUrlCreate.en.rst:124
-msgid ""
-":func:`TSStringPercentEncode` performs percent-encoding of the string str, "
-"storing the new string in the dst buffer. The length parameter will be set "
-"to the new (encoded) string length, or 0 if the encoding failed. "
-"TSUrlPercentEncode is similar but operates on a URL object. If the optional "
-"map parameter is provided, it should be a map of characters to encode."
+#: ../../reference/api/TSUrlCreate.en.rst:69
+msgid "Return values"
 msgstr ""
 
-#: ../../reference/api/TSUrlCreate.en.rst:131
+#: ../../reference/api/TSUrlCreate.en.rst:71
 msgid ""
-":func:`TSStringPercentDecode` perform percent-decoding of the string in the "
-"buffer, writing to the dst buffer. The source and destination can be the "
-"same, in which case they overwrite. The decoded string is always guaranteed "
-"to be no longer than the source string."
-msgstr ""
-
-#: ../../reference/api/TSUrlCreate.en.rst:137
-msgid "See also"
+"The :func:`TSUrlParse` function returns a :type:`TSParseResult`, where :"
+"data:`TS_PARSE_ERROR` indicates an error. Success is indicated by one of :"
+"data:`TS_PARSE_DONE`, :data:`TS_PARSE_OK` or :data:`TS_PARSE_CONT`. The "
+"other APIs all return a :type:`TSReturnCode`, indicating success (:data:"
+"`TS_SUCCESS`) or failure (:data:`TS_ERROR`) of the operation."
 msgstr ""
 
-#: ../../reference/api/TSUrlCreate.en.rst:139
+#: ../../reference/api/TSUrlCreate.en.rst:80
 msgid ""
 ":manpage:`TSAPI(3ts)`, :manpage:`TSMBufferCreate(3ts)`, :manpage:"
-"`TSmalloc(3ts)`"
+"`TSUrlHostGet(3ts)`, :manpage:`TSUrlHostSet(3ts)`, :manpage:"
+"`TSUrlStringGet(3ts)`, :manpage:`TSUrlPercentEncode(3ts)`"
 msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlHostGet.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlHostGet.en.po 
b/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlHostGet.en.po
new file mode 100644
index 0000000..904a905
--- /dev/null
+++ b/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlHostGet.en.po
@@ -0,0 +1,85 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache Traffic Server 4.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-15 22:31+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../reference/api/TSUrlHostGet.en.rst:22
+msgid "TSUrlHostGet"
+msgstr ""
+
+#: ../../reference/api/TSUrlHostGet.en.rst:25
+msgid "Synopsis"
+msgstr ""
+
+#: ../../reference/api/TSUrlHostGet.en.rst:27
+msgid "`#include <ts/ts.h>`"
+msgstr ""
+
+#: ../../reference/api/TSUrlHostGet.en.rst:40
+msgid "Description"
+msgstr ""
+
+#: ../../reference/api/TSUrlHostGet.en.rst:42
+msgid ""
+"The URL data structure is a parsed version of a standard internet URL. The "
+"Traffic Server URL API provides access to URL data stored in marshal "
+"buffers. The URL functions can create, copy, retrieve or delete entire "
+"URLs, and retrieve or modify parts of URLs, such as their host, port or "
+"scheme information."
+msgstr ""
+
+#: ../../reference/api/TSUrlHostGet.en.rst:48
+msgid ""
+":func:`TSUrlSchemeGet`, :func:`TSUrlUserGet`, :func:`TSUrlPasswordGet`, :"
+"func:`TSUrlHostGet`, :func:`TSUrlHttpParamsGet`, :func:`TSUrlHttpQueryGet` "
+"and :func:`TSUrlHttpFragmentGet` each retrieve an internal pointer to the "
+"specified portion of the URL from the marshall buffer :data:`bufp`. The "
+"length of the returned string is placed in :data:`length` and a pointer to "
+"the URL portion is returned."
+msgstr ""
+
+#: ../../reference/api/TSUrlHostGet.en.rst:55
+msgid ""
+":func:`TSUrlPortGet` retrieves the port number portion of the URL located "
+"at :data:`offset` within the marshal buffer :data:`bufp`. If there is no "
+"explicit port number in the URL, a canonicalized valued is returned based "
+"on the URL scheme."
+msgstr ""
+
+#: ../../reference/api/TSUrlHostGet.en.rst:61
+msgid "Return values"
+msgstr ""
+
+#: ../../reference/api/TSUrlHostGet.en.rst:63
+msgid ""
+"All APIs except :func:`TSUrlPortGet` returns a string, which is not "
+"guaranteed to be NULL terminated. You must therefore always use the :data:"
+"`length` value to determine the actual length of the returned string."
+msgstr ""
+
+#: ../../reference/api/TSUrlHostGet.en.rst:67
+msgid ""
+":func:`TSUrlPortGet` simply returns the port number as an integer, possibly "
+"canonicalized with :data:`80` for HTTP and :data:`443` for HTTPS schemes. "
+"If there is neither port nor scheme information available in the URL, :data:"
+"`0` is returned."
+msgstr ""
+
+#: ../../reference/api/TSUrlHostGet.en.rst:73
+msgid "See also"
+msgstr ""
+
+#: ../../reference/api/TSUrlHostGet.en.rst:75
+msgid ""
+":manpage:`TSAPI(3ts)`, :manpage:`TSUrlCreate(3ts)`, :manpage:"
+"`TSUrlHostSet(3ts)`, :manpage:`TSUrlStringGet(3ts)`, :manpage:"
+"`TSUrlPercentEncode(3ts)`"
+msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlHostSet.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlHostSet.en.po 
b/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlHostSet.en.po
new file mode 100644
index 0000000..098bd4c
--- /dev/null
+++ b/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlHostSet.en.po
@@ -0,0 +1,77 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache Traffic Server 4.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-15 22:31+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../reference/api/TSUrlHostSet.en.rst:22
+msgid "TSUrlHostSet"
+msgstr ""
+
+#: ../../reference/api/TSUrlHostSet.en.rst:25
+msgid "Synopsis"
+msgstr ""
+
+#: ../../reference/api/TSUrlHostSet.en.rst:27
+msgid "`#include <ts/ts.h>`"
+msgstr ""
+
+#: ../../reference/api/TSUrlHostSet.en.rst:40
+msgid "Description"
+msgstr ""
+
+#: ../../reference/api/TSUrlHostSet.en.rst:42
+msgid ""
+"The URL data structure is a parsed version of a standard internet URL. The "
+"Traffic Server URL API provides access to URL data stored in marshal "
+"buffers. The URL functions can create, copy, retrieve or delete entire "
+"URLs, and retrieve or modify parts of URLs, such as their host, port or "
+"scheme information."
+msgstr ""
+
+#: ../../reference/api/TSUrlHostSet.en.rst:48
+msgid ""
+":func:`TSUrlSchemeSet`, :func:`TSUrlUserSet`, :func:`TSUrlPasswordSet`, :"
+"func:`TSUrlHostSet`, :func:`TSUrlHttpParamsSet`, :func:`TSUrlHttpQuerySet` "
+"and :func:`TSUrlHttpFragmentSet` each set the specified portion of the URL "
+"located at offset within the marshal buffer :data:`bufp` to the string "
+"value. If :data:`length` is :data:`-1` then these functions assume that "
+"value is NULL-terminated. Otherwise, the length of the :data:`string` value "
+"is taken to be the value of :data:`length`. These functions copy the string "
+"to within :data:`bufp`, so it can be subsequently modified or deleted."
+msgstr ""
+
+#: ../../reference/api/TSUrlHostSet.en.rst:57
+msgid ""
+":func:`TSUrlPortSet` sets the port number portion of the URL located at :"
+"data:`offset` within the marshal buffer :data:`bufp` to the value port. "
+"Normal canonicalization based on the URL scheme still applies."
+msgstr ""
+
+#: ../../reference/api/TSUrlHostSet.en.rst:62
+msgid "Return values"
+msgstr ""
+
+#: ../../reference/api/TSUrlHostSet.en.rst:64
+msgid ""
+"All these APIs returns a :type:`TSReturnCode`, indicating success (:data:"
+"`TS_SUCCESS`) or failure (:data:`TS_ERROR`) of the operation."
+msgstr ""
+
+#: ../../reference/api/TSUrlHostSet.en.rst:68
+msgid "See also"
+msgstr ""
+
+#: ../../reference/api/TSUrlHostSet.en.rst:70
+msgid ""
+":manpage:`TSAPI(3ts)`, :manpage:`TSUrlCreate(3ts)`, :manpage:"
+"`TSUrlHostGet(3ts)`, :manpage:`TSUrlStringGet(3ts)`, :manpage:"
+"`TSUrlPercentEncode(3ts)`"
+msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlPercentEncode.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlPercentEncode.en.po 
b/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlPercentEncode.en.po
new file mode 100644
index 0000000..d637a3e
--- /dev/null
+++ b/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlPercentEncode.en.po
@@ -0,0 +1,76 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache Traffic Server 4.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-15 22:31+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../reference/api/TSUrlPercentEncode.en.rst:22
+msgid "TSUrlPercentEncode"
+msgstr ""
+
+#: ../../reference/api/TSUrlPercentEncode.en.rst:25
+msgid "Synopsis"
+msgstr ""
+
+#: ../../reference/api/TSUrlPercentEncode.en.rst:27
+msgid "`#include <ts/ts.h>`"
+msgstr ""
+
+#: ../../reference/api/TSUrlPercentEncode.en.rst:34
+msgid "Description"
+msgstr ""
+
+#: ../../reference/api/TSUrlPercentEncode.en.rst:36
+msgid ""
+"The URL data structure is a parsed version of a standard internet URL. The "
+"Traffic Server URL API provides access to URL data stored in marshal "
+"buffers. The URL functions can create, copy, retrieve or delete entire "
+"URLs, and retrieve or modify parts of URLs, such as their host, port or "
+"scheme information."
+msgstr ""
+
+#: ../../reference/api/TSUrlPercentEncode.en.rst:42
+msgid ""
+":func:`TSUrlPercentEncode` performs percent-encoding of the URL object, "
+"storing the new string in the :data:`dst` buffer. The :data:`length` "
+"parameter will be set to the new (encoded) string length, or :data:`0` if "
+"the encoding failed.  :func:`TSStringPercentEncode` is similar but operates "
+"on a string. If the optional :data:`map` parameter is provided (not :data:"
+"`NULL`) , it should be a map of characters to encode."
+msgstr ""
+
+#: ../../reference/api/TSUrlPercentEncode.en.rst:49
+msgid ""
+":func:`TSStringPercentDecode` perform percent-decoding of the string in "
+"the :data:`str` buffer, writing to the :data:`dst` buffer. The source and "
+"destination can be the same, in which case they overwrite. The decoded "
+"string is always guaranteed to be no longer than the source string."
+msgstr ""
+
+#: ../../reference/api/TSUrlPercentEncode.en.rst:55
+msgid "Return values"
+msgstr ""
+
+#: ../../reference/api/TSUrlPercentEncode.en.rst:57
+msgid ""
+"All these APIs returns a :type:`TSReturnCode`, indicating success (:data:"
+"`TS_SUCCESS`) or failure (:data:`TS_ERROR`) of the operation."
+msgstr ""
+
+#: ../../reference/api/TSUrlPercentEncode.en.rst:61
+msgid "See also"
+msgstr ""
+
+#: ../../reference/api/TSUrlPercentEncode.en.rst:63
+msgid ""
+":manpage:`TSAPI(3ts)`, :manpage:`TSUrlCreate(3ts)`, :manpage:"
+"`TSUrlHostGet(3ts)`, :manpage:`TSUrlHostSet(3ts)`, :manpage:"
+"`TSUrlStringGet(3ts)`"
+msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlStringGet.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlStringGet.en.po 
b/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlStringGet.en.po
new file mode 100644
index 0000000..3116957
--- /dev/null
+++ b/doc/locale/ja/LC_MESSAGES/reference/api/TSUrlStringGet.en.po
@@ -0,0 +1,73 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache Traffic Server 4.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-15 22:31+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../reference/api/TSUrlStringGet.en.rst:22
+msgid "TSUrlStringGet"
+msgstr ""
+
+#: ../../reference/api/TSUrlStringGet.en.rst:25
+msgid "Synopsis"
+msgstr ""
+
+#: ../../reference/api/TSUrlStringGet.en.rst:27
+msgid "`#include <ts/ts.h>`"
+msgstr ""
+
+#: ../../reference/api/TSUrlStringGet.en.rst:35
+msgid "Description"
+msgstr ""
+
+#: ../../reference/api/TSUrlStringGet.en.rst:37
+msgid ""
+"The URL data structure is a parsed version of a standard internet URL. The "
+"Traffic Server URL API provides access to URL data stored in marshal "
+"buffers. The URL functions can create, copy, retrieve or delete entire "
+"URLs, and retrieve or modify parts of URLs, such as their host, port or "
+"scheme information."
+msgstr ""
+
+#: ../../reference/api/TSUrlStringGet.en.rst:43
+msgid ""
+":func:`TSUrlStringGet` constructs a string representation of the URL "
+"located at :data:`offset` within the marshal buffer :data:`bufp`. :func:"
+"`TSUrlStringGet` stores the length of the allocated string in the "
+"parameter :data:`length`. This is the same length that :func:"
+"`TSUrlLengthGet` returns. The returned string is allocated by a call to :"
+"func:`TSmalloc` and must be freed by a call to :func:`TSfree`. If length "
+"is :data:`NULL` then no attempt is made to de-reference it."
+msgstr ""
+
+#: ../../reference/api/TSUrlStringGet.en.rst:51
+msgid ""
+":func:`TSUrlLengthGet` calculates the length of the URL located at :data:"
+"`offset` within the marshal buffer bufp as if it were returned as a string. "
+"This length will be the same as the length returned by :func:"
+"`TSUrlStringGet`."
+msgstr ""
+
+#: ../../reference/api/TSUrlStringGet.en.rst:56
+msgid ""
+":func:`TSUrlPrint` formats a URL stored in an :type:`TSMBuffer` to an :type:"
+"`TSIOBuffer`."
+msgstr ""
+
+#: ../../reference/api/TSUrlStringGet.en.rst:60
+msgid "See also"
+msgstr ""
+
+#: ../../reference/api/TSUrlStringGet.en.rst:62
+msgid ""
+":manpage:`TSAPI(3ts)`, :manpage:`TSmalloc(3ts)`, :manpage:"
+"`TSUrlCreate(3ts)`, :manpage:`TSUrlHostGet(3ts)`, :manpage:"
+"`TSUrlHostSet(3ts)`, :manpage:`TSUrlPercentEncode(3ts)`"
+msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_manager.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_manager.en.po 
b/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_manager.en.po
index 8b5254d..589a016 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_manager.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_manager.en.po
@@ -19,6 +19,6 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ../../reference/commands/traffic_manager.en.rst:44
+#: ../../reference/commands/traffic_manager.en.rst:43
 msgid "Environment"
 msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_server.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_server.en.po 
b/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_server.en.po
index 2241174..667c7e9 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_server.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_server.en.po
@@ -19,14 +19,14 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
-#: ../../reference/commands/traffic_server.en.rst:71
+#: ../../reference/commands/traffic_server.en.rst:69
 msgid "Print usage information and exit."
 msgstr ""
 
-#: ../../reference/commands/traffic_server.en.rst:75
+#: ../../reference/commands/traffic_server.en.rst:73
 msgid "Print version information and exit."
 msgstr ""
 
-#: ../../reference/commands/traffic_server.en.rst:78
+#: ../../reference/commands/traffic_server.en.rst:76
 msgid "Environment"
 msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_top.en.po
----------------------------------------------------------------------
diff --git a/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_top.en.po 
b/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_top.en.po
new file mode 100644
index 0000000..b0e8765
--- /dev/null
+++ b/doc/locale/ja/LC_MESSAGES/reference/commands/traffic_top.en.po
@@ -0,0 +1,20 @@
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache Traffic Server 4.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-01-15 22:31+0900\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../../reference/commands/traffic_top.en.rst:20
+msgid "traffic_top"
+msgstr ""
+
+#: ../../reference/commands/traffic_top.en.rst:25
+msgid "Description"
+msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/reference/configuration/cache.config.en.po
----------------------------------------------------------------------
diff --git 
a/doc/locale/ja/LC_MESSAGES/reference/configuration/cache.config.en.po 
b/doc/locale/ja/LC_MESSAGES/reference/configuration/cache.config.en.po
index df18050..e5ffb24 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/cache.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/cache.config.en.po
@@ -153,7 +153,7 @@ msgstr ""
 msgid "The following list shows possible actions and their allowed values."
 msgstr ""
 
-#: ../../reference/configuration/cache.config.en.rst:129
+#: ../../reference/configuration/cache.config.en.rst:128
 msgid "``action``"
 msgstr ""
 
@@ -190,65 +190,105 @@ msgid ""
 "content to be stored locally on every cluster node."
 msgstr ""
 
-#: ../../reference/configuration/cache.config.en.rst:141
+#: ../../reference/configuration/cache.config.en.rst:158
 msgid "``pin-in-cache``"
 msgstr ""
 
-#: ../../reference/configuration/cache.config.en.rst:134
-msgid ""
-"The amount of time you want to keep the object(s) in the cache. The "
-"following time formats are allowed:"
-msgstr ""
-
-#: ../../reference/configuration/cache.config.en.rst:137
+#: ../../reference/configuration/cache.config.en.rst:154
 msgid "``d`` for days; for example: 2d"
 msgstr ""
 
-#: ../../reference/configuration/cache.config.en.rst:138
+#: ../../reference/configuration/cache.config.en.rst:155
 msgid "``h`` for hours; for example: 10h"
 msgstr ""
 
-#: ../../reference/configuration/cache.config.en.rst:139
+#: ../../reference/configuration/cache.config.en.rst:156
 msgid "``m`` for minutes; for example: 5m"
 msgstr ""
 
-#: ../../reference/configuration/cache.config.en.rst:140
+#: ../../reference/configuration/cache.config.en.rst:157
 msgid "``s`` for seconds; for example: 20s"
 msgstr ""
 
-#: ../../reference/configuration/cache.config.en.rst:141
+#: ../../reference/configuration/cache.config.en.rst:158
 msgid "mixed units; for example: 1h15m20s"
 msgstr ""
 
-#: ../../reference/configuration/cache.config.en.rst:147
+#: ../../reference/configuration/cache.config.en.rst:164
 msgid "``revalidate``"
 msgstr ""
 
-#: ../../reference/configuration/cache.config.en.rst:146
-msgid ""
-"The amount of time object(s) are to be considered fresh. Use the same time "
-"formats as ``pin-in-cache``."
-msgstr ""
-
-#: ../../reference/configuration/cache.config.en.rst:154
+#: ../../reference/configuration/cache.config.en.rst:172
 msgid "``ttl-in-cache``"
 msgstr ""
 
-#: ../../reference/configuration/cache.config.en.rst:152
-msgid ""
-"The amount of time object(s) are to be kept in the cache, regardless of "
-"Cache-Control response headers. Use the same time formats as pin-in-cache "
-"and revalidate ."
-msgstr ""
-
-#: ../../reference/configuration/cache.config.en.rst:157
+#: ../../reference/configuration/cache.config.en.rst:175
 msgid "Examples"
 msgstr ""
 
-#: ../../reference/configuration/cache.config.en.rst:159
+#: ../../reference/configuration/cache.config.en.rst:177
 msgid ""
 "The following example configures Traffic Server to revalidate ``gif`` and "
 "``jpeg`` objects in the domain ``mydomain.com`` every 6 hours, and all "
 "other objects in ``mydomain.com`` every hour. The rules are applied in the "
 "order listed. ::"
 msgstr ""
+
+#: ../../reference/configuration/cache.config.en.rst:138
+msgid "``cache-responses-to-cookies``"
+msgstr ""
+
+#: ../../reference/configuration/cache.config.en.rst:133
+msgid ""
+"Change the style of caching with regard to cookies. This effectively "
+"overrides the configuration parameter :ref:`proxy.config.http.cache."
+"cache_responses_to_cookies` and uses the same values with the same "
+"semantics. The override happens only for requests that match."
+msgstr ""
+
+#: ../../reference/configuration/cache.config.en.rst:143
+msgid ""
+"Preserves objects in cache, preventing them from being overwritten. Does "
+"not affect objects that are determined not to be cacheable. This setting "
+"can have performance issues, and  severely affect the cache. For instance, "
+"if the primary destination matches all objects, once the cache is full, no "
+"new objects could get written as nothing would be evicted.  Similarly, for "
+"each cache-miss, each object would incur extra checks to determine if the "
+"object it would replace could be overwritten."
+msgstr ""
+
+#: ../../reference/configuration/cache.config.en.rst:151
+msgid ""
+"The value is the amount of time you want to keep the object(s) in the "
+"cache. The following time formats are allowed:"
+msgstr ""
+
+#: ../../reference/configuration/cache.config.en.rst:163
+msgid ""
+"For objects that are in cache, overrides the the amount of time the "
+"object(s) are to be considered fresh. Use the same time formats as ``pin-in-"
+"cache``."
+msgstr ""
+
+#: ../../reference/configuration/cache.config.en.rst:169
+msgid ""
+"Forces object(s) to become cached, as if they had a Cache-Control: max-age:"
+"<time> header. Can be overruled by requests with cookies. The value is the "
+"amount of time object(s) are to be kept in the cache, regardless of Cache-"
+"Control response headers. Use the same time formats as pin-in-cache and "
+"revalidate."
+msgstr ""
+
+#: ../../reference/configuration/cache.config.en.rst:186
+msgid ""
+"Force a specific regex to be in cache between 7-11pm of the server's time "
+"for 26hours. ::"
+msgstr ""
+
+#: ../../reference/configuration/cache.config.en.rst:190
+msgid "Prevent objects from being evicted from cache:"
+msgstr ""
+
+#: ../../reference/configuration/cache.config.en.rst:192
+msgid "url_regex=example.com/game/.* pin-in-cache=1h"
+msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/reference/configuration/congestion.config.en.po
----------------------------------------------------------------------
diff --git 
a/doc/locale/ja/LC_MESSAGES/reference/configuration/congestion.config.en.po 
b/doc/locale/ja/LC_MESSAGES/reference/configuration/congestion.config.en.po
index 186bad8..e519c2d 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/congestion.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/congestion.config.en.po
@@ -238,14 +238,6 @@ msgstr ""
 msgid "*``dead_os_conn_timeout``* {#dead_os_conn_timeout}"
 msgstr "*``dead_os_conn_timeout``* {#dead_os_conn_timeout}"
 
-#: ../../reference/configuration/congestion.config.en.rst:121
-msgid ""
-"Default: ``15`` secondsj The connection timeout to the congested origin "
-"server."
-msgstr ""
-"デフォルト: ``15`` 
秒。輻輳しているオリジンサーバーに対する接続タイム
アウ"
-"ト。"
-
 #: ../../reference/configuration/congestion.config.en.rst:127
 msgid "*``dead_os_conn_retries``* {#dead_os_conn_retries}"
 msgstr "*``dead_os_conn_retries``* {#dead_os_conn_retries}"
@@ -364,3 +356,16 @@ msgid ""
 msgstr ""
 ":file:`congestion.config` ファイルのルールは :file:`records.config` 
ファイル"
 "の次の設定を上書きします。"
+
+#: ../../reference/configuration/congestion.config.en.rst:121
+msgid ""
+"Default: ``15`` seconds. The connection timeout to the congested origin "
+"server."
+msgstr ""
+
+#~ msgid ""
+#~ "Default: ``15`` secondsj The connection timeout to the congested origin "
+#~ "server."
+#~ msgstr ""
+#~ "デフォルト: ``15`` 
秒。輻輳しているオリジンサーバーに対する接続タイム
アウ"
+#~ "ト。"

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/reference/configuration/logs_xml.config.en.po
----------------------------------------------------------------------
diff --git 
a/doc/locale/ja/LC_MESSAGES/reference/configuration/logs_xml.config.en.po 
b/doc/locale/ja/LC_MESSAGES/reference/configuration/logs_xml.config.en.po
index 7e6baba..d2939cd 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/logs_xml.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/logs_xml.config.en.po
@@ -344,33 +344,21 @@ msgid ""
 "only entries from the named servers will be included in the file."
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:225
-msgid "``<CollationHosts = \"list_of_valid_hostnames\"/>``"
-msgstr ""
-
-#: ../../reference/configuration/logs_xml.config.en.rst:221
-msgid ""
-"Optional A comma-separated list of collation servers to which all log "
-"entries (for this object) are forwarded. Collation servers can be specified "
-"by name or IP address. Specify the collation port with a colon after the "
-"name; for example, ``host:port`` ."
-msgstr ""
-
-#: ../../reference/configuration/logs_xml.config.en.rst:231
+#: ../../reference/configuration/logs_xml.config.en.rst:237
 msgid "``<Header = \"header\"/>``"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:228
+#: ../../reference/configuration/logs_xml.config.en.rst:234
 msgid ""
 "Optional The header text you want the log files to contain. The header text "
 "appears at the beginning of the log file, just before the first record."
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:251
+#: ../../reference/configuration/logs_xml.config.en.rst:257
 msgid "``<RollingEnabled = \"truth value\"/>``"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:234
+#: ../../reference/configuration/logs_xml.config.en.rst:240
 msgid ""
 "Optional Enables or disables log file rolling for the ``LogObject``. This "
 "setting overrides the value for the :ts:cv:`proxy.config.log."
@@ -378,58 +366,58 @@ msgid ""
 "value* to one of the following values:"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:241
+#: ../../reference/configuration/logs_xml.config.en.rst:247
 msgid "``0`` to disable rolling for this particular ``LogObject``."
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:242
+#: ../../reference/configuration/logs_xml.config.en.rst:248
 msgid ""
 "``1`` to roll log files at specific intervals during the day (you specify "
 "time intervals with the ``RollingIntervalSec`` and ``RollingOffsetHr`` "
 "fields)."
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:245
+#: ../../reference/configuration/logs_xml.config.en.rst:251
 msgid ""
 "``2`` to roll log files when they reach a certain size (you specify the "
 "size with the ``RollingSizeMb`` field)."
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:247
+#: ../../reference/configuration/logs_xml.config.en.rst:253
 msgid ""
 "``3`` to roll log files at specific intervals during the day or when they "
 "reach a certain size (whichever occurs first)."
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:249
+#: ../../reference/configuration/logs_xml.config.en.rst:255
 msgid ""
 "``4`` to roll log files at specific intervals during the day when log files "
 "reach a specific size (at a specified time if the file is of the specified "
 "size)."
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:263
+#: ../../reference/configuration/logs_xml.config.en.rst:269
 msgid "``<RollingIntervalSec = \"seconds\"/>``"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:256
+#: ../../reference/configuration/logs_xml.config.en.rst:262
 msgid ""
 "Optional The seconds between log file rolling for the ``LogObject``; "
 "enables you to specify different rolling intervals for different "
 "``LogObjects``."
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:261
+#: ../../reference/configuration/logs_xml.config.en.rst:267
 msgid ""
 "This setting overrides the value for :ts:cv:`proxy.config.log."
 "rolling_interval_sec` in the :file:`records.config` file."
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:273
+#: ../../reference/configuration/logs_xml.config.en.rst:279
 msgid "``<RollingOffsetHr = \"hour\"/>``"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:266
+#: ../../reference/configuration/logs_xml.config.en.rst:272
 msgid ""
 "Optional Specifies an hour (from 0 to 23) at which rolling is guaranteed to "
 "align. Rolling might start before then, but a rolled file will be produced "
@@ -439,51 +427,51 @@ msgid ""
 "the :file:`records.config` file."
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:277
+#: ../../reference/configuration/logs_xml.config.en.rst:283
 msgid "``<RollingSizeMb = \"size_in_MB\"/>``"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:276
+#: ../../reference/configuration/logs_xml.config.en.rst:282
 msgid "Optional The size at which log files are rolled."
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:280
+#: ../../reference/configuration/logs_xml.config.en.rst:286
 msgid "Examples"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:282
+#: ../../reference/configuration/logs_xml.config.en.rst:288
 msgid ""
 "The following is an example of a ``LogFormat`` specification that collects "
 "information using three common fields: ::"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:290
+#: ../../reference/configuration/logs_xml.config.en.rst:296
 msgid ""
 "The following is an example of a ``LogFormat`` specification that uses "
 "aggregate operators: ::"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:299
+#: ../../reference/configuration/logs_xml.config.en.rst:305
 msgid ""
 "The following is an example of a ``LogFilter`` that will cause only "
 "``REFRESH_HIT`` entries to be logged: ::"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:310
+#: ../../reference/configuration/logs_xml.config.en.rst:316
 msgid ""
 "When specifying the field in the filter condition, you can omit the ``"
 "%<>``. This means that the filter below is equivalent to the example "
 "directly above: ::"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:320
+#: ../../reference/configuration/logs_xml.config.en.rst:326
 msgid ""
 "The following is an example of a ``LogObject`` specification that creates a "
 "local log file for the minimal format defined earlier. The log filename "
 "will be ``minimal.log`` because this is an ASCII log file (the default).::"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:330
+#: ../../reference/configuration/logs_xml.config.en.rst:336
 msgid ""
 "The following is an example of a ``LogObject`` specification that includes "
 "only HTTP requests served by hosts in the domain ``company.com`` or by the "
@@ -492,11 +480,11 @@ msgid ""
 "collation host ``209.131.52.129.`` ::"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:347
+#: ../../reference/configuration/logs_xml.config.en.rst:353
 msgid "WELF"
 msgstr ""
 
-#: ../../reference/configuration/logs_xml.config.en.rst:349
+#: ../../reference/configuration/logs_xml.config.en.rst:355
 msgid ""
 "Traffic Server supports WELF (WebTrends Enhanced Log Format) so you can "
 "analyze Traffic Server log files with WebTrends reporting tools. A "
@@ -504,3 +492,21 @@ msgid ""
 "file:`logs_xml.config` file (shown below). To create a WELF format log "
 "file, create a ``<LogObject>`` that uses this predefined format. ::"
 msgstr ""
+
+#: ../../reference/configuration/logs_xml.config.en.rst:231
+msgid ""
+"``<CollationHosts = \"list_of_valid_hostnames:port|failover hosts\"/>``"
+msgstr ""
+
+#: ../../reference/configuration/logs_xml.config.en.rst:221
+msgid ""
+"Optional A comma-separated list of collation servers (with pipe delimited "
+"failover servers) to which all log entries (for this object) are forwarded. "
+"Collation servers can be specified by name or IP address. Specify the "
+"collation port with a colon after the name. For example, in ``host1:5000|"
+"failhostA:5000|failhostB:6000, host2:6000`` logs would be sent to host1 and "
+"host2, with failhostA and failhostB acting as failover hosts for host1. "
+"When host1 disconnects, logs would be sent to failhostA. If failhostA "
+"disconnects, log entries would be sent to failhostB until host1 or "
+"failhostA comes back. Logs would also be sent to host2."
+msgstr ""

http://git-wip-us.apache.org/repos/asf/trafficserver/blob/285bd7d9/doc/locale/ja/LC_MESSAGES/reference/configuration/plugin.config.en.po
----------------------------------------------------------------------
diff --git 
a/doc/locale/ja/LC_MESSAGES/reference/configuration/plugin.config.en.po 
b/doc/locale/ja/LC_MESSAGES/reference/configuration/plugin.config.en.po
index 46fbff6..528384a 100644
--- a/doc/locale/ja/LC_MESSAGES/reference/configuration/plugin.config.en.po
+++ b/doc/locale/ja/LC_MESSAGES/reference/configuration/plugin.config.en.po
@@ -15,32 +15,59 @@ msgstr ""
 msgid "plugin.config"
 msgstr ""
 
-#: ../../reference/configuration/plugin.config.en.rst:24
+#: ../../reference/configuration/plugin.config.en.rst:25
+msgid "Description"
+msgstr ""
+
+#: ../../reference/configuration/plugin.config.en.rst:27
 msgid ""
 "The :file:`plugin.config` file controls run-time loadable plugins available "
-"to the Traffic Server, as well as their configuration."
+"to the Traffic Server, as well as their configuration. Plugins listed in "
+"this file are referred to as `global plugins` because they are always "
+"loaded and have global effect.  This is in contrast to plugins specified "
+"in :file:`remap.config`, whose effects are limited to the specific mapping "
+"rules they are applied to."
 msgstr ""
 
-#: ../../reference/configuration/plugin.config.en.rst:28
-msgid "Example"
+#: ../../reference/configuration/plugin.config.en.rst:34
+msgid ""
+"Each configuration line consists of a path to an ``.so`` file. This path "
+"can either be absolute, or relative to the plugin directory (usually ``/usr/"
+"local/libexec/trafficserver``).  Failure to load a plugin is fatal, and "
+"will cause Traffic Server to abort. In general, it is not possible to know "
+"whether it is safe for the service to run without a particular plugin, "
+"since plugins can have arbitrary effects on caching and authorization "
+"policies."
 msgstr ""
 
-#: ../../reference/configuration/plugin.config.en.rst:41
+#: ../../reference/configuration/plugin.config.en.rst:42
 msgid ""
-"Each configuration line consists of a path to an ``.so`` file. This path "
-"can either be absolute, or relative to the plugin-directory (usually ``/usr/"
-"local/libexec/trafficserver``). Such a line tells Traffic Server to load "
-"said plugin."
+"Plugins should only be listed once. The order in which the plugins are "
+"listed is also the order in which they are chained for request processing."
 msgstr ""
 
 #: ../../reference/configuration/plugin.config.en.rst:46
 msgid ""
-"A plugin can have any number of configuration parameters listed. Please "
-"refer to our `plugins' documentation <../plugins>`_ for their reference."
+"An option list of whitespace-separated arguments may follow the plugin "
+"name. These are passed as an argument vector to the plugin's initialization "
+"function, :func:`TSPluginInit`. Arguments that begin with the ``$`` "
+"character designate Traffic Server configuration variables. These arguments "
+"will be replaced with the value of the corresponding configuration variable "
+"before the plugin is loaded. When using configuration variable expansion, "
+"note that most Traffic Server configuration can be changed. If a plugin "
+"requires the current value, it must obtain that using the management API."
+msgstr ""
+
+#: ../../reference/configuration/plugin.config.en.rst:57
+msgid "Examples"
+msgstr ""
+
+#: ../../reference/configuration/plugin.config.en.rst:71
+msgid "See also"
 msgstr ""
 
-#: ../../reference/configuration/plugin.config.en.rst:49
+#: ../../reference/configuration/plugin.config.en.rst:73
 msgid ""
-"Plugins should only be listed *once*. The order in which the plugins are "
-"listed is also the order in which they are chained for the processing."
+":manpage:`TSAPI(3ts)`, :manpage:`TSPluginInit(3ts)`, :manpage:`remap."
+"config(5)`"
 msgstr ""

Reply via email to