- Merge the following from the English version:

r54553 -> r54642 head/ja_JP.eucJP/htdocs/index.xsl r54621 -> r54642 head/ja_JP.eucJP/htdocs/where.xml r54553 -> r54642 head/ja_JP.eucJP/htdocs/releases/index.xml r54554 -> r54642 head/ja_JP.eucJP/htdocs/security/security.xml r54553 -> r54642 head/ja_JP.eucJP/share/xml/navibar.l10n.ent r54538 -> r54605 head/ja_JP.eucJP/share/xml/release.l10n.ent - Add rel122.current.date and u.rel122.* entities. head/ja_JP.eucJP/share/xml/l10n.ent
svn path=/head/; revision=54643
2020-10-28 10:39:26 +00:00 · 2020-10-28 10:39:26 +00:00 · 124f36439b · 2020-12-08 03:00:23 +00:00
commit 124f36439b
parent bfea49dccc
7 changed files with 111 additions and 19 deletions
--- a/ja_JP.eucJP/htdocs/index.xsl
+++ b/ja_JP.eucJP/htdocs/index.xsl
@ -5,7 +5,7 @@
 ]>

 <!-- $FreeBSD$ -->
-<!-- Original revision: r54553 -->
+<!-- Original revision: r54642 -->

 <xsl:stylesheet version="1.0"
  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
@ -98,6 +98,8 @@
 			  <h2><a href="&base;/releases/">サポートされているリリース</a></h2>
 			  <ul id="frontreleaseslist">
 			    <li>プロダクション:&nbsp;<a
+				href="&u.rel122.announce;">&rel122.current;</a>,
+				<a
 				href="&u.rel121.announce;">&rel121.current;</a>,
 				<a
 				  href="&u.rel114.announce;">&rel114.current;</a></li>
--- a/ja_JP.eucJP/htdocs/releases/index.xml
+++ b/ja_JP.eucJP/htdocs/releases/index.xml
@ -5,7 +5,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r54553 -->
+<!-- Original revision: r54642 -->

 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
@ -40,6 +40,17 @@
  <h2>最新リリース</h2>

    <h3>プロダクションリリース</h3>
+      <p><b>リリース &rel122.current;</b> (&rel122.current.date;)
+	<em>
+	<a href="&u.rel122.announce;">アナウンス</a> :
+	<a href="&u.rel122.notes;">リリースノート</a> :
+	<a href="&u.rel122.installation;">インストールガイド</a> :
+	<a href="&u.rel122.hardware;">ハードウェアノート</a> :
+	<a href="&u.rel122.readme;">README</a> :
+	<a href="&u.rel122.errata;">Errata (正誤表)</a> :
+	<a href="&u.rel122.signatures;">チェックサム</a>
+      </em></p>
+
      <p><b>リリース &rel121.current;</b> (&rel121.current.date;)
 	<em>
 	<a href="&u.rel121.announce;">アナウンス</a> :
--- a/ja_JP.eucJP/htdocs/security/security.xml
+++ b/ja_JP.eucJP/htdocs/security/security.xml
@ -5,7 +5,7 @@
 ]>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r54554 -->
+<!-- Original revision: r54642 -->

 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
@ -193,11 +193,17 @@
      <td>n/a</td>
      <td>2024 年 6 月 30 日</td>
    </tr>
+    <tr>
+      <td>releng/12.2</td>
+      <td>12.2-RELEASE</td>
+      <td>2020 年 10 月 27 日</td>
+      <td>12.3-RELEASE 公開から 3 ヵ月後</td>
+    </tr>
    <tr>
      <td>releng/12.1</td>
      <td>12.1-RELEASE</td>
      <td>2019 年 11 月 4 日</td>
-      <td>12.2-RELEASE 公開から 3 ヵ月後</td>
+      <td>2022 年 1 月 31 日</td>
    </tr>
    <tr>
      <td>stable/11</td>
--- a/ja_JP.eucJP/htdocs/where.xml
+++ b/ja_JP.eucJP/htdocs/where.xml
@ -6,7 +6,7 @@
 <!ENTITY url.snapshot "https://download.FreeBSD.org/ftp/snapshots">
 ]>
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r54621 -->
+<!-- Original revision: r54642 -->

 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
@ -70,6 +70,70 @@

    <a name="download-rel121"></a>

+    <a name="download-rel122"></a>
+
+    <h1>&os; &rel122.current;-RELEASE</h1>
+
+    <table class="tblbasic tblwide tbldownload">
+      <tbody>
+	<tr>
+	  <th>インストーライメージ</th>
+	  <th>仮想マシンイメージ</th>
+	  <th>SD カードイメージ</th>
+	  <th>文書</th>
+	</tr>
+	<tr>
+	  <td>
+	    <ul class="txtdownloadlist">
+	      <li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&rel122.current;/">amd64</a></li>
+	      <li><a href="&url.rel;/i386/i386/ISO-IMAGES/&rel122.current;/">i386</a></li>
+	      <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&rel122.current;/">powerpc</a></li>
+	      <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&rel122.current;/">powerpc64</a></li>
+	      <li><a href="&url.rel;/powerpc/powerpcspe/ISO-IMAGES/&rel122.current;/">powerpcspe</a></li>
+	      <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&rel122.current;/">sparc64</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel122.current;/">aarch64</a></li>
+	    </ul>
+	  </td>
+	  <td>
+	    <ul class="txtdownloadlist">
+	      <li><a href="&url.rel;/VM-IMAGES/README.txt">README</a></li>
+	      <li><a href="&url.rel;/VM-IMAGES/&rel122.current;-RELEASE/amd64/Latest/">amd64</a></li>
+	      <li><a href="&url.rel;/VM-IMAGES/&rel122.current;-RELEASE/i386/Latest/">i386</a></li>
+	      <li><a href="&url.rel;/VM-IMAGES/&rel122.current;-RELEASE/aarch64/Latest/">aarch64</a></li>
+	    </ul>
+	  </td>
+	  <td>
+	    <ul class="txtdownloadlist">
+	      <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&rel122.current;/&os;-&rel122.current;-RELEASE-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel122.current;/&os;-&rel122.current;-RELEASE-arm-armv7-BANANAPI.img.xz">BANANAPI</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel122.current;/&os;-&rel122.current;-RELEASE-arm-armv7-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel122.current;/&os;-&rel122.current;-RELEASE-arm-armv7-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel122.current;/&os;-&rel122.current;-RELEASE-arm-armv7-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel122.current;/&os;-&rel122.current;-RELEASE-arm-armv7-GENERICSD.img.xz">GENERICSD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel122.current;/&os;-&rel122.current;-RELEASE-arm-armv7-RPI2.img.xz">RPI2</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel122.current;/&os;-&rel122.current;-RELEASE-arm-armv7-PANDABOARD.img.xz">PANDABOARD</a></li>
+	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&rel122.current;/&os;-&rel122.current;-RELEASE-arm-armv7-WANDBOARD.img.xz">WANDBOARD</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel122.current;/&os;-&rel122.current;-RELEASE-arm64-aarch64-PINE64.img.xz">PINE64</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel122.current;/&os;-&rel122.current;-RELEASE-arm64-aarch64-PINE64-LTS.img.xz">PINE64-LTS</a></li>
+	      <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&rel122.current;/&os;-&rel122.current;-RELEASE-arm64-aarch64-RPI3.img.xz">RPI3</a></li>
+	    </ul>
+	  </td>
+	  <td>
+	    <ul class="txtdocslist">
+	      <li><a href="&base;/releases/index.html#current">リリース</a>: &rel122.current.date;</li>
+	      <li><a href="&u.rel122.notes;">リリースノート</a></li>
+	      <li><a href="&u.rel122.readme;">Readme</a></li>
+	      <li><a href="&u.rel122.hardware;">ハードウェア互換リスト</a></li>
+	      <li><a href="&u.rel122.installation;">インストールガイド</a></li>
+	      <li><a href="&u.rel122.errata;">Errata</a></li>
+	      <li><a href="&u.rel122.signatures;">署名済チェックサム</a></li>
+	    </ul>
+	  </td>
+	</tr>
+      </tbody>
+    </table>
+    <br />
+
    <h1>&os; &rel121.current;-RELEASE</h1>

    <table class="tblbasic tblwide tbldownload">
@ -119,13 +183,13 @@
 	  </td>
 	  <td>
 	    <ul class="txtdocslist">
-	      <li><a href="&base;/releases/index.html#current">Released</a>: &rel121.current.date;</li>
-	      <li><a href="&u.rel121.notes;">Release Notes</a></li>
+	      <li><a href="&base;/releases/index.html#current">リリース</a>: &rel121.current.date;</li>
+	      <li><a href="&u.rel121.notes;">リリースノート</a></li>
 	      <li><a href="&u.rel121.readme;">Readme</a></li>
-	      <li><a href="&u.rel121.hardware;">Hardware Compatibility List</a></li>
-	      <li><a href="&u.rel121.installation;">Installation Instructions</a></li>
+	      <li><a href="&u.rel121.hardware;">ハードウェア互換リスト</a></li>
+	      <li><a href="&u.rel121.installation;">インストールガイド</a></li>
 	      <li><a href="&u.rel121.errata;">Errata</a></li>
-	      <li><a href="&u.rel121.signatures;">Signed Checksums</a></li>
+	      <li><a href="&u.rel121.signatures;">署名済チェックサム</a></li>
 	    </ul>
 	  </td>
 	</tr>
--- a/ja_JP.eucJP/share/xml/l10n.ent
+++ b/ja_JP.eucJP/share/xml/l10n.ent
@ -20,6 +20,7 @@
 <!ENTITY url.doc.langcode    'ja_JP.eucJP'>
 <!ENTITY xml.encoding        'euc-jp'>

+<!ENTITY rel122.current.date "2020 Ç¯ 10 ·î">
 <!ENTITY rel121.current.date '2019 Ç¯ 11 ·î'>
 <!ENTITY rel120.current.date '2018 Ç¯ 12 ·î'>
 <!ENTITY rel114.current.date '2020 Ç¯ 6 ·î'>
@ -31,6 +32,14 @@
 <!ENTITY u.betarel.schedule '&enbase;/releases/&betarel.current;R/schedule.html'>
 <!ENTITY u.betarel2.schedule '&enbase;/releases/&betarel2.current;R/schedule.html'>

+<!-- URLs to information on the latest release -->
+<!ENTITY u.rel122.notes '&enbase;/releases/&rel122.current;R/relnotes.html'>
+<!ENTITY u.rel122.announce '&enbase;/releases/&rel122.current;R/announce.html'>
+<!ENTITY u.rel122.errata '&enbase;/releases/&rel122.current;R/errata.html'>
+<!ENTITY u.rel122.hardware '&enbase;/releases/&rel122.current;R/hardware.html'>
+<!ENTITY u.rel122.installation '&enbase;/releases/&rel122.current;R/installation.html'>
+<!ENTITY u.rel122.readme '&enbase;/releases/&rel122.current;R/readme.html'>
+<!ENTITY u.rel122.signatures '&enbase;/releases/&rel122.current;R/signatures.html'>

 <!-- URLs to information on the latest release -->
 <!ENTITY u.rel121.notes '&enbase;/releases/&rel121.current;R/relnotes.html'>
--- a/ja_JP.eucJP/share/xml/navibar.l10n.ent
+++ b/ja_JP.eucJP/share/xml/navibar.l10n.ent
@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='euc-jp'?>
 <!-- $FreeBSD$ -->
 <!-- The FreeBSD Japanese Documentation Project -->
-<!-- Original revision: r54553 -->
+<!-- Original revision: r54642 -->

 <!ENTITY nav.about '
 <div xmlns="http://www.w3.org/1999/xhtml" id="sidenav">
@ -99,6 +99,8 @@
    <li><a href="&base;/where.html">FreeBSD の入手方法</a></li>
    <li><a href="&base;/releases/">リリース情報</a>
      <ul>
+	<li>プロダクションリリース: <br />
+	  <a href="&u.rel122.announce;">&rel122.current;</a></li>
 	<li>プロダクションリリース: <br />
 	  <a href="&u.rel121.announce;">&rel121.current;</a></li>
 	<li>プロダクションリリース:<br />
--- a/ja_JP.eucJP/share/xml/release.l10n.ent
+++ b/ja_JP.eucJP/share/xml/release.l10n.ent
@ -2,7 +2,7 @@

 <!--
     $FreeBSD$
-     Original revision: r54538
+     Original revision: r54605
 -->

 <![%beta2.testing;[
@ -106,9 +106,7 @@
 	      <li><a href="&url.rel;/powerpc/powerpc/ISO-IMAGES/&betarel.current;/">powerpc</a></li>
 	      <li><a href="&url.rel;/powerpc/powerpc64/ISO-IMAGES/&betarel.current;/">powerpc64</a></li>
 	      <li><a href="&url.rel;/powerpc/powerpcspe/ISO-IMAGES/&betarel.current;/">powerpcspe</a></li>
-	      <?ignore
 	      <li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">sparc64</a></li>
-	      ?>
 	    </ul>
 	  </td>
 	  <td>
@ -122,7 +120,9 @@
 	  <td>
 	    <ul class="txtdownloadlist">
 	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-BANANAPI.img.xz">BANANAPI</a></li>
+	      <?ignore
 	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
+	      ?>
 	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
 	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-GENERICSD.img.xz">GENERICSD</a></li>
 	      <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
@ -138,16 +138,14 @@
 	  </td>
 	  <td>
 	    <ul class="txtdocslist">
-	      <?ignore
 	      <li><a href="&enbase;/releases/&betarel.current;R/relnotes.html">リリースノート</a></li>
-	      <li><a href="&enbase;/releases/&betarel.current;R/readme.html">Readme</a></li>
-	      ?>
-	      <li><a href="&enbase;/releases/&betarel.current;R/hardware.html">ハードウェア互換リスト</a></li>
 	      <?ignore
+	      <li><a href="&enbase;/releases/&betarel.current;R/readme.html">Readme</a></li>
 	      <li><a href="&enbase;/releases/&betarel.current;R/installation.html">インストールガイド</a></li>
 	      <li><a href="&enbase;/releases/&betarel.current;R/todo.html">TODO リスト</a></li>
-	      <li><a href="&enbase;/releases/&betarel.current;R/signatures.html">署名済チェックサム</a></li>
 	      ?>
+	      <li><a href="&enbase;/releases/&betarel.current;R/hardware.html">ハードウェア互換リスト</a></li>
+	      <li><a href="&enbase;/releases/&betarel.current;R/signatures.html">署名済チェックサム</a></li>
 	    </ul>
 	  </td>
 	</tr>