Commit 17ba3e4a authored by Erik Abele's avatar Erik Abele
Browse files

Backport japanese error messages and conf changes. 



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@124608 13f79535-47bb-0310-9956-ffa450edef68
parent b0aa4156

docs/conf/httpd-std.conf.in

+1 −1
Changes for docs/conf/httpd-std.conf.in: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -933,7 +933,7 @@ AddHandler type-map var 
#        AddHandler type-map var

#        Order allow,deny

#        Allow from all

#        LanguagePriority en cs de es fr it nl sv pt-br ro

#        LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr

#        ForceLanguagePriority Prefer Fallback

#    </Directory>

#

docs/conf/httpd-win.conf

+1 −1
Changes for docs/conf/httpd-win.conf: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ AddHandler type-map var 
#        AddHandler type-map var

#        Order allow,deny

#        Allow from all

#        LanguagePriority en cs de es fr it nl sv pt-br ro

#        LanguagePriority en cs de es fr it ja ko nl pl pt-br ro sv tr

#        ForceLanguagePriority Prefer Fallback

#    </Directory>

#

docs/error/HTTP_BAD_GATEWAY.html.var

+18 −0
Changes for docs/error/HTTP_BAD_GATEWAY.html.var: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -106,6 +106,24 @@ Body:----------it-- 
<!--#include virtual="include/bottom.html" -->

----------it--



Content-language: ja

Content-type: text/html; charset=ISO-2022-JP

Body:----------ja--

<!--#set var="CONTENT_LANGUAGE" value="ja"

--><!--#set var="CHARACTER_ENCODING" value="iso-2022-jp"

--><!--#set var="TITLE" value="Bad Gateway!"

--><!--#include virtual="include/top.html" -->



    プロクシサーバは上流サーバから不正な応答を受信しました。



  <!--#if expr="$REDIRECT_ERROR_NOTES" -->

    <!--#include virtual="include/spacer.html" -->

    <!--#echo var="REDIRECT_ERROR_NOTES" -->

  <!--#endif -->

    

<!--#include virtual="include/bottom.html" -->

----------ja--



Content-language: ko

Content-type: text/html; charset=EUC-KR

Body:----------ko--

docs/error/HTTP_BAD_REQUEST.html.var

+14 −0
Changes for docs/error/HTTP_BAD_REQUEST.html.var: 14 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -76,6 +76,20 @@ Body:----------it-- 
<!--#include virtual="include/bottom.html" -->

----------it--



Content-language: ja

Content-type: text/html; charset=ISO-2022-JP

Body:----------ja--

<!--#set var="CONTENT_LANGUAGE" value="ja"

--><!--#set var="CHARACTER_ENCODING" value="iso-2022-jp"

--><!--#set var="TITLE" value="Bad request!"

--><!--#include virtual="include/top.html" -->



    お使いのブラウザ (またはプロクシ)

    が、サーバの理解できないリクエストを送信しました。



<!--#include virtual="include/bottom.html" -->

----------ja--



Content-language: ko

Content-type: text/html; charset=EUC-KR

Body:----------ko--

docs/error/HTTP_FORBIDDEN.html.var

+25 −0
Changes for docs/error/HTTP_FORBIDDEN.html.var: 25 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -137,6 +137,31 @@ Body:----------it-- 
<!--#include virtual="include/bottom.html" -->

----------it--



Content-language: ja

Content-type: text/html; charset=ISO-2022-JP

Body:----------ja--

<!--#set var="CONTENT_LANGUAGE" value="ja"

--><!--#set var="CHARACTER_ENCODING" value="iso-2022-jp"

--><!--#set var="TITLE" value="Access forbidden!"

--><!--#include virtual="include/top.html" -->



  <!--#if expr="$REDIRECT_URL = /\/$/" -->



    要求されたディレクトリへのアクセス権限がありません。

    インデックスドキュメントが存在しないか、

    ディレクトリの読み込みが許可されていません。



  <!--#else -->



    要求されたオブジェクトへのアクセス権がありません。

    読み込みが許可されていないか、

    サーバが読み込みに失敗したかでしょう。



  <!--#endif -->



<!--#include virtual="include/bottom.html" -->

----------ja--



Content-language: ko

Content-type: text/html; charset=EUC-KR

Body:----------ko--