httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From taka...@apache.org
Subject svn commit: r1229077 - in /httpd/httpd/branches/2.4.x: ./ docs/manual/style/lang/ja.xml
Date Mon, 09 Jan 2012 09:49:19 GMT
Author: takashi
Date: Mon Jan  9 09:49:19 2012
New Revision: 1229077

URL: http://svn.apache.org/viewvc?rev=1229077&view=rev
Log:
Merge r1229059 from trunk:

Sync with 2.2 branch

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/docs/manual/style/lang/ja.xml

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Jan  9 09:49:19 2012
@@ -1,3 +1,3 @@
 /httpd/httpd/branches/revert-ap-ldap:1150158-1150173
 /httpd/httpd/branches/wombat-integration:723609-723841
-/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1228816
+/httpd/httpd/trunk:1201042,1201111,1201194,1201198,1201202,1202236,1202456,1202886,1203859,1204630,1204968,1204990,1205061,1205075,1205379,1205885,1206291,1206587,1206850,1207719,1208753,1208835,1209053,1209085,1209417,1209432,1209461,1209601,1209603,1209618,1209623,1209741,1209754,1209766,1209776,1209797-1209798,1209811-1209812,1209814,1209908,1209910,1209913,1209916-1209917,1209947,1209952,1210080,1210124,1210130,1210219,1210221,1210252,1210284,1210378,1210725,1210892,1210951,1210954,1211528,1211663,1211680,1212883,1213338,1213567,1214003,1214005,1214015,1220462,1220467,1220493,1220524,1220570,1220768,1220794,1220826,1220846,1221292,1222335,1222370,1222473,1222915,1222917,1222921,1223048,1225060,1225197-1225198,1225380,1225476,1225478,1225791,1225795-1225796,1226339,1226375,1228816,1229059

Modified: httpd/httpd/branches/2.4.x/docs/manual/style/lang/ja.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/docs/manual/style/lang/ja.xml?rev=1229077&r1=1229076&r2=1229077&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/docs/manual/style/lang/ja.xml [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/docs/manual/style/lang/ja.xml [utf-8] Mon Jan  9 09:49:19 2012
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE language SYSTEM "../lang.dtd">
-<!-- English revision: 636495 -->
+<!-- English revision: 1044715 -->
 
 <!--
  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -120,8 +120,7 @@
         <message id="apache">Apache</message>
         <message id="http-server">HTTP サーバ</message>
         <message id="documentation">ドキュメンテーション</message>
-        <message id="version">バージョン
-            &httpd.major;.&httpd.minor;</message>
+        <message id="version">バージョン &httpd.major;.&httpd.minor;</message>
 
         <!-- super menu -->
         <message id="modules">モジュール</message>
@@ -130,16 +129,18 @@
         <message id="sitemap">サイトマップ</message>
 
         <!-- footer line -->
-        <message id="before-license">Licensed under the</message>
-        <message id="after-license"></message>
-        <message id="langavail">言語</message>
+        <message id="before-license">この文書は</message>
+        <message id="after-license">のライセンスで提供されています。</message>
+        <message id="langavail">翻訳済み言語</message>
 
         <!-- not up to date -->
-        <message id="outofdate">この日本語訳はすでに古くなっている可能性があります。
-          更新された内容を見るには英語版をご覧下さい。</message>
+        <message id="outofdate">この日本語訳はすでに古くなっている
+            可能性があります。
+            最近更新された内容を見るには英語版をご覧下さい。
+        </message>
         <!-- directive not translated yet -->
-        <message id="nottranslated">The documentation for this directive has
-            not been translated yet. Please have a look at the English
-            version.</message>
+        <message id="nottranslated">このディレクティブの解説文書は
+            まだ翻訳されていません。英語版をご覧ください。
+            </message>
     </messages>
 </language>



Mime
View raw message