Update Japanese translation. (add 'etch' conditions)

3 files changed, 19 insertions, 11 deletions

diff --git a/ja/hardware/hardware-supported.xml b/ja/hardware/hardware-supported.xml
index c0af7a775..4cfe8b7df 100644
--- a/ja/hardware/hardware-supported.xml
+++ b/ja/hardware/hardware-supported.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43943 -->
+<!-- original version: 46426 -->
 
  <sect1 id="hardware-supported">
 <!--
@@ -60,6 +60,10 @@ Debian &release; は 12 の主要なアーキテクチャと、
 <tgroup cols="4">
 <thead>
 <row>
+<!--
+  <entry>Architecture</entry><entry>Debian Designation</entry>
+  <entry>Subarchitecture</entry><entry>Flavor</entry>
+-->
   <entry>アーキテクチャ</entry><entry>Debian 名称</entry>
   <entry>サブアーキテクチャ</entry><entry>フレーバー</entry>
 </row>
@@ -92,13 +96,17 @@ Debian &release; は 12 の主要なアーキテクチャと、
 
 <row>
 <!--
-  <entry morerows="3">ARM and StrongARM</entry>
-  <entry morerows="3">arm</entry>
+  <entry morerows="3" condition="etch">ARM and StrongARM</entry>
+  <entry morerows="2" condition="lenny">ARM and StrongARM</entry>
+  <entry morerows="3" condition="etch">arm</entry>
+  <entry morerows="2" condition="lenny">arm</entry>
   <entry>Netwinder and CATS</entry>
   <entry>netwinder</entry>
 -->
-  <entry morerows="3">ARM・StrongARM</entry>
-  <entry morerows="3">arm</entry>
+  <entry morerows="3" condition="etch">ARM・StrongARM</entry>
+  <entry morerows="2" condition="lenny">ARM・StrongARM</entry>
+  <entry morerows="3" condition="etch">arm</entry>
+  <entry morerows="2" condition="lenny">arm</entry>
   <entry>Netwinder・CATS</entry>
   <entry>netwinder</entry>
 </row><row>
@@ -107,7 +115,7 @@ Debian &release; は 12 の主要なアーキテクチャと、
 </row><row>
   <entry>Intel IXP4xx</entry>
   <entry>ixp4xx</entry>
-</row><row>
+</row><row condition="etch">
   <entry>RiscPC</entry>
   <entry>rpc</entry>
 </row>
diff --git a/ja/hardware/installation-media.xml b/ja/hardware/installation-media.xml
index af57640ff..5d2c0946a 100644
--- a/ja/hardware/installation-media.xml
+++ b/ja/hardware/installation-media.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43773 -->
+<!-- original version: 46426 -->
 
  <sect1 id="installation-media">
  <title>インストールに利用できるメディア</title>
@@ -136,10 +136,10 @@ SCSI・IDE/ATAPI の CD-ROM はともに &arch-title; でサポートされています。
 
 <!--
 IDE/ATAPI CD-ROMs are supported on all ARM machines.
-On RiscPCs, SCSI CD-ROMs are also supported.
+<phrase condition="etch">On RiscPCs, SCSI CD-ROMs are also supported.</phrase>
 -->
 すべての ARM マシンで IDE/ATAPI CD-ROM をサポートしています。
-RiscPC では SCSI CD-ROM もサポートしています。
+<phrase condition="etch">RiscPC では SCSI CD-ROM もサポートしています。</phrase>
 
 </para><para arch="mips">
 
diff --git a/ja/hardware/supported/arm.xml b/ja/hardware/supported/arm.xml
index 84fa774a5..6989bd36f 100644
--- a/ja/hardware/supported/arm.xml
+++ b/ja/hardware/supported/arm.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="EUC-JP"?>
 <!-- retain these comments for translator revision tracking -->
-<!-- original version: 43693 -->
+<!-- original version: 46426 -->
 
 
   <sect2 arch="arm"><title>CPU・マザーボード・ビデオのサポート</title>
@@ -115,7 +115,7 @@ Linksys NSLU2 (Network Storage Link for USB 2.0 ディスクドライブ) は、
 </para></listitem>
 </varlistentry>
 
-<varlistentry>
+<varlistentry condition="etch">
 <term>RiscPC</term>
 <listitem><para>