From 2641a08edcf0bc89121682c794b9ec254c292db4 Mon Sep 17 00:00:00 2001
From: Ryusuke SUZUKI <ryusuke@FreeBSD.org>
Date: Mon, 27 Aug 2018 12:29:46 +0000
Subject: [PATCH] - Merge the following from the English version:
r51914 -> r52172 head/ja_JP.eucJP/htdocs/where.xml
r51848 -> r52172 head/ja_JP.eucJP/share/xml/release.l10n.ent
---
ja_JP.eucJP/htdocs/where.xml | 13 +++++-------
ja_JP.eucJP/share/xml/release.l10n.ent | 28 +++++++++++++++-----------
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git a/ja_JP.eucJP/htdocs/where.xml b/ja_JP.eucJP/htdocs/where.xml
index cacf84d979..76dd5e5acb 100644
--- 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: r51914 -->
+<!-- Original revision: r52172 -->
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
@@ -59,7 +59,7 @@
<p>&os; �ϡ��ǥץ������Ȥ��������Ƥ���ޤ���
����������ѽ��פǤ��Τǡ�
���ҤȤ� <a
- href="http://www.freshports.org/sysutils/bsdstats/">sysutils/bsdstats</a>
+ href="https://www.freshports.org/sysutils/bsdstats/">sysutils/bsdstats</a>
package �ȡ��뤷�Ƥ���������
���� package �ϡ��ϡ��ɥ���������ӥ��եȥ�������������ᡢ
��ȯ�Ԥ��ɤ��˽��椷�Ƴ�ȯ��Ԥ��٤�����Ƥ������������ޤ���
@@ -278,8 +278,8 @@
<li><a href="&url.snapshot;/i386/i386/ISO-IMAGES/&rel.head;/">i386</a></li>
<li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel.head;/">powerpc</a></li>
<li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel.head;/">powerpc64</a></li>
+ <li><a href="&url.snapshot;/powerpc/powerpcspe/ISO-IMAGES/&rel.head;/">powerpcspe</a></li>
<li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel.head;/">sparc64</a></li>
- <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel.head;/">arm</a></li>
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.head;/">armv6</a></li>
<li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">armv7</a></li>
<li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.head;/">aarch64</a></li>
@@ -299,9 +299,10 @@
<li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">CUBIEBOARD</a></li>
<li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">CUBIEBOARD2</a></li>
<li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">CUBOX/HUMMINGBOARD</a></li>
- <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel.head;/">GUMSTIX</a></li>
+ <li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">GENERICSD</a></li>
<li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">PANDABOARD</a></li>
<li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.head;/">PINE64</a></li>
+ <li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.head;/">PINE64-LTS</a></li>
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.head;/">RPI-B</a></li>
<li><a href="&url.snapshot;/arm/armv7/ISO-IMAGES/&rel.head;/">RPI2</a></li>
<li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.head;/">RPI3</a></li>
@@ -337,7 +338,6 @@
<li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel.current;/">powerpc</a></li>
<li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel.current;/">powerpc64</a></li>
<li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel.current;/">sparc64</a></li>
- <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel.current;/">arm</a></li>
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">armv6</a></li>
<li><a href="&url.snapshot;/arm64/aarch64/ISO-IMAGES/&rel.current;/">aarch64</a></li>
</ul>
@@ -356,7 +356,6 @@
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">CUBIEBOARD</a></li>
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">CUBIEBOARD2</a></li>
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">CUBOX/HUMMINGBOARD</a></li>
- <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel.current;/">GUMSTIX</a></li>
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">PANDABOARD</a></li>
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">RPI2</a></li>
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel.current;/">RPI-B</a></li>
@@ -393,7 +392,6 @@
<li><a href="&url.snapshot;/powerpc/powerpc/ISO-IMAGES/&rel2.current;/">powerpc</a></li>
<li><a href="&url.snapshot;/powerpc/powerpc64/ISO-IMAGES/&rel2.current;/">powerpc64</a></li>
<li><a href="&url.snapshot;/sparc64/sparc64/ISO-IMAGES/&rel2.current;/">sparc64</a></li>
- <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel2.current;/">arm</a></li>
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">armv6</a></li>
</ul>
</td>
@@ -407,7 +405,6 @@
<ul class="txtdownloadlist">
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">BEAGLEBONE</a></li>
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">CUBOX/HUMMINGBOARD</a></li>
- <li><a href="&url.snapshot;/arm/arm/ISO-IMAGES/&rel2.current;/">GUMSTIX</a></li>
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">PANDABOARD</a></li>
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">RPI-B</a></li>
<li><a href="&url.snapshot;/arm/armv6/ISO-IMAGES/&rel2.current;/">WANDBOARD</a></li>
diff --git a/ja_JP.eucJP/share/xml/release.l10n.ent b/ja_JP.eucJP/share/xml/release.l10n.ent
index aff4b1db8d..b478e2e2a6 100644
--- 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: r51848
+ Original revision: r52172
-->
<![%beta2.testing;[
@@ -41,7 +41,6 @@
<ul class="txtdownloadlist">
<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX-HUMMINGBOARD</a></li>
- <li><a href="&url.rel;/arm/arm/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-GUMSTIX.img.xz">GUMSTIX</a></li>
<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel2.current;/&os;-&betarel2.current;-&betarel2.vers;-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
@@ -91,9 +90,11 @@
<li><a href="&url.rel;/amd64/amd64/ISO-IMAGES/&betarel.current;/">amd64</a></li>
<li><a href="&url.rel;/i386/i386/ISO-IMAGES/&betarel.current;/">i386</a></li>
<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/">armv6</a></li>
+ <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/">armv7</a></li>
<li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&betarel.current;/">aarch64</a></li>
<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>
<li><a href="&url.rel;/sparc64/sparc64/ISO-IMAGES/&betarel.current;/">sparc64</a></li>
</ul>
</td>
@@ -107,16 +108,19 @@
</td>
<td>
<ul class="txtdownloadlist">
- <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-BANANAPI.img.xz">BANANAPI</a></li>
- <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-BEAGLEBONE.img.xz">BEAGLEBONE</a></li>
- <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-CUBIEBOARD.img.xz">CUBIEBOARD</a></li>
- <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
- <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-CUBOX-HUMMINGBOARD.img.xz">CUBOX/HUMMINGBOARD</a></li>
- <li><a href="&url.rel;/arm/arm/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-GUMSTIX.img.xz">GUMSTIX</a></li>
- <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-PANDABOARD.img.xz">PANDABOARD</a></li>
<li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-RPI-B.img.xz">RPI-B</a></li>
- <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-RPI2.img.xz">RPI2</a></li>
- <li><a href="&url.rel;/arm/armv6/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv6-WANDBOARD.img.xz">WANDBOARD</a></li>
+ <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-BANANAPI.img.xz">BANANAPI</a></li>
+ <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-CUBIEBOARD2.img.xz">CUBIEBOARD2</a></li>
+ <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-CUBOX-HUMMINGBOARD.img.xz">CUBOX/HUMMINGBOARD</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-PANDABOARD.img.xz">PANDABOARD</a></li>
+ <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-RPI2.img.xz">RPI2</a></li>
+ <li><a href="&url.rel;/arm/armv7/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm-armv7-WANDBOARD.img.xz">WANDBOARD</a></li>
+ <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm64-aarch64-PINE64-LTS.img.xz">PINE64-LTS</a></li>
+ <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm64-aarch64-PINE64.img.xz">PINE64</a></li>
+ <li><a href="&url.rel;/arm64/aarch64/ISO-IMAGES/&betarel.current;/&os;-&betarel.current;-&betarel.vers;-arm64-aarch64-RPI3.img.xz">RPI3</a></li>
</ul>
</td>
<td>
@@ -127,8 +131,8 @@
<?ignore
<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;/relnotes/11-STABLE/relnotes/article.html">��������</a></li>
</ul>
</td>