sync (upstream revision 1.159 -> 1.165).

CVS version numbers

japanese/devel/debian-installer/index.wml: 1.75 -> 1.76

1 files changed, 26 insertions, 21 deletions

diff --git a/japanese/devel/debian-installer/index.wml b/japanese/devel/debian-installer/index.wml
index e036ce461c4..39b5e7f86d9 100644
--- a/japanese/devel/debian-installer/index.wml
+++ b/japanese/devel/debian-installer/index.wml
@@ -1,13 +1,13 @@
 #use wml::debian::template title="Debian ¥¤¥ó¥¹¥È¡¼¥é" NOHEADER="true"
 #use wml::debian::recent_list
 #include "$(ENGLISHDIR)/releases/info"
-#include "$(ENGLISHDIR)/releases/sarge/release.data"
+#include "$(ENGLISHDIR)/releases/etch/release.data"
 #include "$(ENGLISHDIR)/devel/debian-installer/images.data"
-#use wml::debian::translation-check translation="1.159"
+#use wml::debian::translation-check translation="1.165"
 
 <h1>¥Ë¥å¡¼¥¹</h1>
 
-<p><:= get_recent_list('News/$(CUR_YEAR)', '3',
+<p><:= get_recent_list('News/$(CUR_YEAR)', '2',
 '$(ENGLISHDIR)/devel/debian-installer', '', '\d+\w*' ) :>
 <a href="News">²áµî¤Î¥Ë¥å¡¼¥¹</a>
 </p>
@@ -16,17 +16,16 @@
 
 <if-stable-release release="sarge">
 <p>
-Debian GNU/Linux <current_release_sarge> (sarge)
-¤Î<b>¸ø¼°¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤È´ØÏ¢¾ðÊó</b>¤Ï¡¢
+<b>¸ø¼°¤Î Debian <current_release_sarge> ¥¤¥ó¥¹¥È¡¼¥ë¥á¥Ç¥£¥¢¤È´ØÏ¢¾ðÊó</b>¤Ï¡¢
 <a href="$(HOME)/releases/sarge/debian-installer">sarge ¤Î¥Ú¡¼¥¸</a>¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£
 </p>
 </if-stable-release>
 
-<if-stable-release release="woody">
 <p>
-<b>¤â¤·¡¢¤Á¤ã¤ó¤È¤·¤¿¥¤¥ó¥¹¥È¡¼¥ë¤¬É¬Íפʤé</b>¡¢¥¤¥ó¥¹¥È¡¼¥é¤Î¥ê¥ê¡¼¥¹¸õÊä 3
-¤ÎÍøÍѤò¤ª´«¤á¤·¤Þ¤¹¡£¤Þ¤º¤Ï<a href="errata">Àµ¸í¥Ú¡¼¥¸</a>¤ò³Îǧ¤·¤Æ¤¯¤À¤µ¤¤¡£
-¥ê¥ê¡¼¥¹¸õÊä 3 ¤Ç¤Ï¡¢°Ê²¼¤Î¥¤¥á¡¼¥¸¤¬ÍøÍѲÄǽ¤Ç¤¹:
+<b>Debian ¤Î¥Æ¥¹¥ÈÈÇ (testing) ¤ò¥¤¥ó¥¹¥È¡¼¥ë¤¹¤ë¤Ë¤Ï</b>¡¢
+¤Þ¤º <a href="errata">Àµ¸í¥Ú¡¼¥¸</a>¤ò³Îǧ¤·¤Æ¤«¤é¡¢etch
+¥Ù¡¼¥¿ 1 ¥ê¥ê¡¼¥¹¤Î¥¤¥ó¥¹¥È¡¼¥é¤ò»È¤¦¤è¤¦¤ª¤¹¤¹¤á¤·¤Þ¤¹¡£
+¥Ù¡¼¥¿ 1 ¤Ç¤Ï¡¢°Ê²¼¤Î¥¤¥á¡¼¥¸¤¬ÍøÍѲÄǽ¤Ç¤¹:
 </p>
 <ul>
 	<li>netinst CD ¥¤¥á¡¼¥¸ (100 Mb)<br>
@@ -35,21 +34,26 @@ Debian GNU/Linux <current_release_sarge> (sarge)
 	<li>̾»É¥µ¥¤¥º¤Î CD ¥¤¥á¡¼¥¸ (50 Mb)<br>
 	<businesscard-images />
 	</li>
-	<li>´°Á´¤Ê CD ¥»¥Ã¥È<br/>
-	<full-cd-images />
+#	<li>´°Á´¤Ê CD ¥»¥Ã¥È<br>
+#	<full-cd-images />
+#	</li>
+#	<li>´°Á´¤Ê CD ¥»¥Ã¥È (<a href="$(HOME)/CD/torrent-cd">bittorrent</a> ¤òÍøÍÑ)<br>
+#	<full-cd-torrent />
+#	</li>
+	<li>´°Á´¤Ê CD ¥»¥Ã¥È (<a href="$(HOME)/CD/jigdo-cd">jigdo</a> ¤òÍøÍÑ)<br>
+	<full-cd-jigdo />
 	</li>
-	<li>´°Á´¤Ê CD ¥»¥Ã¥È (<a href="$(HOME)/CD/torrent-cd">bittorrent</a> ¤òÍøÍÑ)<br>
-	<full-cd-torrent />
+	<li>´°Á´¤Ê DVD ¥»¥Ã¥È (<a href="$(HOME)/CD/jigdo-cd">jigdo</a> ¤òÍøÍÑ)<br>
+	<full-dvd-jigdo />
 	</li>
-	<li>´°Á´¤Ê <a href="http://cdimage.debian.org/pub/cdimage-testing/cd/rc3/">CD</a>
-	¤È <a href="http://cdimage.debian.org/pub/cdimage-testing/dvd/rc3/">DVD</a>
-	¤Î¥»¥Ã¥È (<a href="$(HOME)/CD/jigdo-cd">jigdo</a> ¤òÍøÍÑ)
-	</li>
-	<li>¤½¤Î¾¤Î¥Ö¡¼¥È¥¤¥á¡¼¥¸ (¥Í¥Ã¥È¥Ö¡¼¥È¡¢usb ¥¹¥Æ¥£¥Ã¥¯¡¢¥Õ¥í¥Ã¥Ô¡¼¡¢¥Æ¡¼¥×¤Ê¤É)<br>
+	<li>¥°¥é¥Õ¥£¥«¥ë¥¤¥ó¥¹¥È¡¼¥é (¥¢¥ë¥Õ¥¡¥ê¥ê¡¼¥¹)<br>
+	[<a href="http://people.debian.org/~fjp/d-i/gtk-miniiso/alpha/amd64/">amd64</a>]
+	[<a href="http://people.debian.org/~fjp/d-i/gtk-miniiso/alpha/i386/">i386</a>]
+	[<a href="http://people.debian.org/~fjp/d-i/gtk-miniiso/alpha/powerpc/">powerpc</a>]
+	<li>¤½¤Î¾¤Î¥Ö¡¼¥È¥¤¥á¡¼¥¸ (¥Í¥Ã¥È¥Ö¡¼¥È¡¢usb ¥¹¥Æ¥£¥Ã¥¯¡¢¥Õ¥í¥Ã¥Ô¡¼¤Ê¤É)<br>
 	<other-images />
 	</li>
 </ul>
-</if-stable-release>
 
 <p>
 ¾­Íè¥ê¥ê¡¼¥¹¤µ¤ì¤ë¥¤¥ó¥¹¥È¡¼¥é¤ò¥Æ¥¹¥È¤·¤Æ»ä¤¿¤Á¤ò»Ù±ç¤·¤¿¤ê¡¢
@@ -79,8 +83,9 @@ href="http://wiki.debian.org/DebianInstallerToday">´ûÃΤÎÌäÂê</a>¤ò³Îǧ¤¹¤ë¤è¤¦¡
 </ul>
 
 <p>
-<b>Debian-Installer ¤ò»È¤Ã¤¿¤¢¤È¤Ï</b>¡¢²¿¤âÌäÂ꤬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¤È¤·¤Æ¤â¡¢¤³¤Î<a
-href="report-template">¥Æ¥ó¥×¥ì¡¼¥È</a>¤ò»È¤Ã¤Æ¥¤¥ó¥¹¥È¡¼¥ë¥ì¥Ý¡¼¥È¤òÁ÷¤Ã¤Æ¤¯¤À¤µ¤¤¡£
+<b>Debian-Installer ¤ò»È¤Ã¤¿¤¢¤È¤Ï</b>¡¢²¿¤âÌäÂ꤬¸«¤Ä¤«¤é¤Ê¤«¤Ã¤¿¤È¤·¤Æ¤â¡¢<a
+href="http://d-i.alioth.debian.org/manual/en.i386/ch05s03.html#submit-bug">\
+¥¤¥ó¥¹¥È¡¼¥ë¥ì¥Ý¡¼¥È</a>¤òÁ÷¤Ã¤Æ¤¯¤À¤µ¤¤¡£
 </p>
 
 <h1>´ØϢʸ½ñ</h1>