svn commit: r45309 - head/ja_JP.eucJP/share/xml

[Ryusuke SUZUKI]

Author: ryusuke
Date: Wed Jul 16 08:52:53 2014
New Revision: 45309
URL: http://svnweb.freebsd.org/changeset/doc/45309

Log:
  - Merge the following from the English version:
  
  	r42678 -> r45260	head/ja_JP.eucJP/share/xml/release.l10n.ent
  
  - Update &rel2.current.date and &u.rel2.announce entities.
  
  	head/ja_JP.eucJP/share/xml/l10n.ent

Modified:
  head/ja_JP.eucJP/share/xml/l10n.ent
  head/ja_JP.eucJP/share/xml/release.l10n.ent

Modified: head/ja_JP.eucJP/share/xml/l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/l10n.ent	Wed Jul 16 08:34:17 2014	(r45308)
+++ head/ja_JP.eucJP/share/xml/l10n.ent	Wed Jul 16 08:52:53 2014	(r45309)
@@ -21,7 +21,7 @@
 <!ENTITY xml.encoding        'euc-jp'>
 
 <!ENTITY rel.current.date '2014 ǯ 1 ·î'>
-<!ENTITY rel2.current.date '2013 ǯ 9 ·î'>
+<!ENTITY rel2.current.date '2014 ǯ 7 ·î'>
 <!ENTITY rel3.current.date '2013 ǯ 6 ·î'>
 
 <!ENTITY u.betarel.schedule '&enbase;/releases/&betarel.current;R/schedule.html'>
@@ -39,7 +39,7 @@
 
 <!-- URLs to information on the latest release -->
 <!ENTITY u.rel2.notes '&enbase;/releases/&rel2.current;R/relnotes-detailed.html'>
-<!ENTITY u.rel2.announce '&base;/releases/&rel2.current;R/announce.html'>
+<!ENTITY u.rel2.announce '&enbase;/releases/&rel2.current;R/announce.html'>
 <!ENTITY u.rel2.errata '&enbase;/releases/&rel2.current;R/errata.html'>
 <!ENTITY u.rel2.hardware '&enbase;/releases/&rel2.current;R/hardware.html'>
 <!ENTITY u.rel2.installation '&base;/releases/&rel2.current;R/installation.html'>

Modified: head/ja_JP.eucJP/share/xml/release.l10n.ent
==============================================================================
--- head/ja_JP.eucJP/share/xml/release.l10n.ent	Wed Jul 16 08:34:17 2014	(r45308)
+++ head/ja_JP.eucJP/share/xml/release.l10n.ent	Wed Jul 16 08:52:53 2014	(r45309)
@@ -2,7 +2,7 @@
 
 <!--
      $FreeBSD$
-     Original revision: r42678
+     Original revision: r45260
  -->
 
 <![%beta2.testing;[
@@ -71,14 +71,7 @@
 <![%beta.testing;[
 <!ENTITY beta.desc '
   <div xmlns="http://www.w3.org/1999/xhtml">
-    <a name="helptest"></a>
-    <h2>¼¡²ó¤Î FreeBSD ¥ê¥ê¡¼¥¹¤ò¼êÅÁ¤¦</h2>
-
-    <p>»ä¤¿¤Á¤Î³«È¯¼Ô¤È¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢Ã£¤Ï¡¢
-      FreeBSD ¤Î¼¡¤Î¥ê¥ê¡¼¥¹¤Ë¸þ¤±¤Æºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤Þ¤¹¡£
-      ¥Æ¥¹¥È¤Ë¶½Ì£¤¬¤¢¤ë¤Î¤Ê¤é¡¢ºÇ¿·¤Î¥Ó¥ë¥É¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¤¯¤À¤µ¤¤¡£
-      ÅöÁ³¤Î¤³¤È¤Ç¤¹¤¬¡¢¤³¤ì¤é¤Î¥¤¥á¡¼¥¸¤Ï¥Æ¥¹¥ÈÌÜŪ¤Ç¤¢¤ê¡¢
-      ¶È̳´Ä¶­¤Ç¤Ï»ÈÍѤ¹¤Ù¤­¤Ç¤Ï¤Ê¤¤¤È¸À¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
+    &beta.helptest;
 
     <table class="tblbasic">
       <thead>
@@ -148,3 +141,41 @@
 ]]>
 
 <!ENTITY beta.desc ''>
+
+<!ENTITY beta.helptest '
+  <div xmlns="http://www.w3.org/1999/xhtml">
+    <a name="helptest"></a>
+    <h2>¼¡²ó¤Î FreeBSD ¥ê¥ê¡¼¥¹¤ò¼êÅÁ¤¦</h2>
+
+    <p>»ä¤¿¤Á¤Î³«È¯¼Ô¤È¥ê¥ê¡¼¥¹¥¨¥ó¥¸¥Ë¥¢Ã£¤Ï¡¢
+      FreeBSD ¤Î¼¡¤Î¥ê¥ê¡¼¥¹¤Ë¸þ¤±¤Æºî¶È¤ò¹Ô¤Ã¤Æ¤¤¤Þ¤¹¡£
+      ¥Æ¥¹¥È¤Ë¶½Ì£¤¬¤¢¤ë¤Î¤Ê¤é¡¢ºÇ¿·¤Î¥Ó¥ë¥É¤ò¥À¥¦¥ó¥í¡¼¥É¤·¤Æ¤¯¤À¤µ¤¤¡£
+      ÅöÁ³¤Î¤³¤È¤Ç¤¹¤¬¡¢¤³¤ì¤é¤Î¥¤¥á¡¼¥¸¤Ï¥Æ¥¹¥ÈÌÜŪ¤Ç¤¢¤ê¡¢
+      ¶È̳´Ä¶­¤Ç¤Ï»ÈÍѤ¹¤Ù¤­¤Ç¤Ï¤Ê¤¤¤È¸À¤¦¤³¤È¤ËÃí°Õ¤·¤Æ¤¯¤À¤µ¤¤¡£</p>
+  </div>
+'>
+
+<![%beta.local.where;[
+<!ENTITY beta.local.where '
+  <div xmlns="http://www.w3.org/1999/xhtml">
+    &beta.helptest;
+    <p>ÍøÍѲÄǽ¤Ê¥¤¥ó¥¹¥È¡¼¥ë¥¤¥á¡¼¥¸¤Î°ìÍ÷¤Ï¡¢<a
+	href="&base;/where.html#helptest">¥À¥¦¥ó¥í¡¼¥É¥Ú¡¼¥¸</a>
+      ¤Ë¤¢¤ê¤Þ¤¹¡£</p>
+  </div>
+'>
+]]>
+
+<![%beta2.local.where;[
+<!ENTITY beta2.local.where '
+  <div xmlns="http://www.w3.org/1999/xhtml">
+    &beta.helptest;
+    <p>ÍøÍѲÄǽ¤Ê¥¤¥ó¥¹¥È¡¼¥ë¥¤¥á¡¼¥¸¤Î°ìÍ÷¤Ï¡¢<a
+	href="&base;/where.html#helptest">¥À¥¦¥ó¥í¡¼¥É¥Ú¡¼¥¸</a>
+      ¤Ë¤¢¤ê¤Þ¤¹¡£</p>
+  </div>
+'>
+]]>
+
+<!ENTITY beta.local.where ''>
+<!ENTITY beta2.local.where ''>