Based on original 1.45.

CVS version numbers

japanese/logos/index.wml: 1.6 -> 1.7

1 files changed, 52 insertions, 31 deletions

diff --git a/japanese/logos/index.wml b/japanese/logos/index.wml
index fda20438b7b..748d30f93ee 100644
--- a/japanese/logos/index.wml
+++ b/japanese/logos/index.wml
@@ -1,6 +1,6 @@
-#use wml::debian::template title="$B%m%4%Z!<%8(B"
-#include "../../english/logos/index.data"
-#use wml::debian::translation-check translation="1.37"
+#use wml::debian::template title="Debian $B%m%4(B" BARETITLE=true
+#include "$(ENGLISHDIR)/logos/index.data"
+#use wml::debian::translation-check translation="1.45"
 
 <P>Debian $B$O<+M3$KF~<j$G$-!":#8e$b$=$&$"$jB3$1$^$9$,!"(B
 ``Linux'' $B$H$$$&L>A0$N=jM-8"LdBj$N$h$&$J;v7o$O!"(B
@@ -14,7 +14,14 @@ Debian $B$N=jM-J*$rJ]8n$9$kI,MW@-$rL@$i$+$K$7$^$7$?!#(B
 
 <HR>
 
-<H2><a name="open-use">Debian $B%*!<%W%s%f!<%:%m%4%i%$%;%s%9(B</a></H2>
+<table border="0" cellspacing="0" cellpadding="5" width="100%">
+<tr>
+<th colspan="2"><font size="+1"><a name="open-use">Debian $B%*!<%W%s%f!<%:%m%4(B</a></font></th>
+</tr>
+<tr>
+<td width="65%">
+<H3>Debian $B%*!<%W%s%f!<%:%m%4!&%i%$%;%s%9(B</H3>
+
 
 <P>Copyright (c) 1999 Software in the Public Interest
 <br>
@@ -23,24 +30,34 @@ Debian $B$N=jM-J*$rJ]8n$9$kI,MW@-$rL@$i$+$K$7$^$7$?!#(B
 $BC/$G$bMxMQ$9$k$3$H$,$G$-$k$,!"(B
 $B$=$l$i$OK\%W%m%8%'%/%H$K$h$kJ]>Z$r<($9$b$N$G$O$J$$!#(B
 
-<P>$B%&%'%V%Z!<%8>e$GMxMQ$9$k>l9g$K$=$N%$%a!<%8$+$i(B http://www.debian.org/
-$B$X%j%s%/$rMQ0U$9$k$3$H$r!";d$?$A$O9b$/I>2A$9$k$H$O$$$(!"I,?\$G$O$J$$!#(B
-
+<P>$BCp(B: $B$3$N%m%4%$%a!<%8$r%&%'%V%Z!<%8$G;H$&$H$-$O!"(B
+http://www.debian.org/ $B$X$N%j%s%/$H$9$k$3$H$r4|BT$9$k!#(B
+</td>
+<td width="35%">
 <openlogotable>
-
+</td>
+</tr>
+</table>
 
 <HR>
 
-<H2><a name="official-use">Debian $B%*%U%#%7%c%k%f!<%:%m%4%i%$%;%s%9(B</a></H2>
+<table border="0" cellspacing="0" cellpadding="5" width="100%">
+<tr>
+<th colspan="2"><font size="+1"><a name="official-use">Debian $B%*%U%#%7%c%k%f!<%:%m%4(B</a></font></th>
+</tr>
+<tr>
+<td width="65%">
+<H3>Debian $B%*%U%#%7%c%k%f!<%:%m%4!&%i%$%;%s%9(B</H3>
 
 <P>Copyright (c) 1999 Software in the Public Interest
 <OL>
-  <LI>$BK\%m%4$O0J2<$N>r7o$rK~$?$9>l9g$N$_MxMQ$9$k$3$H$,$G$-$k!#(B
-    <OL>
-      <LI>$BK\%m%4$rMxMQ$9$k%W%m%@%/%H$,(B www.debian.org
-          $B$K$F8x3+$5$l$F$$$k=qLL2=$5$l$?<jB3$-$KE,9g$7$F$$$k>l9g(B
-      <LI>$B;d$?$A$,$=$NMxMQ$r>5G'$7$?>l9g(B
-    </OL>
+	<LI>$BK\%m%4$O0J2<$N>r7o$rK~$?$9>l9g$N$_MxMQ$9$k$3$H$,$G$-$k!#(B
+	 <UL>
+	    <LI>$BK\%m%4$rMxMQ$9$k%W%m%@%/%H$,(B www.debian.org
+		$B$K$F8x3+$5$l$F$$$k=qLL2=$5$l$?<jB3$-$KE,9g$7$F$$$k>l9g(B
+		($B$?$H$($P!"%*%U%#%7%c%k(B CD $B$J$I(B)
+	    <LI>$B$=$NMxMQL\E*$r;d$?$A$,8x<0$K>5G'$7$?>l9g(B
+	</UL>
       <LI>($B>r9`(B I $B$KDj$a$k(B) Debian $B$N8x<0$J9=@.ItJ,$,(B
           $B$=$N40A4$J%W%m%@%/%H$N0lIt$G$"$k>l9g!"(B
           $B$=$NItJ,$N$_$K4X$7$F8x<0$K>5G'$,F@$i$l$?>l9g!"(B
@@ -50,30 +67,34 @@ Debian $B$N=jM-J*$rJ]8n$9$kI,MW@-$rL@$i$+$K$7$^$7$?!#(B
 
 <P>Debian $B3+H/<T$K$h$C$F:n@.$5$l!"$+$D>&MQL\E*$KHNGd$5$l$J$$8B$j!"(B
 $B%*%U%#%7%c%k%m%4$r0aN`(B ($B%7%c%D$dK9;R$J$I(B) $B$KMxMQ$9$k$3$H$r5v2D$9$k!#(B
-
+</td>
+<td width="35%">
 <officiallogotable>
-
+</td>
+</tr>
+</table>
 
 <hr>
 
-<H2>$B%m%4MxMQ$NNc(B</H2>
-
-<P><IMG SRC="button-1.gif">
+<H2>$B$=$NB>$N%W%m%b!<%7%g%sMQ2hA|(B</H2>
 
-<br>$B$3$A$i$O!"K\%W%m%8%'%/%H$N$?$a$K:n@.$5$l$?:G=i$N%\%?%s$G$9!#(B
-$B$3$N%m%4$N%i%$%;%s%9$O%*!<%W%s%f!<%:%m%4%i%$%;%s%9$K=>$$$^$9!#(B
+<P><IMG SRC="button-1.gif" ALT="[Debian GNU/Linux]" ALIGN="left">
+$B$3$A$i$O!"K\%W%m%8%'%/%H$N$?$a$K:n@.$5$l$?:G=i$N%\%?%s$G$9!#(B
+$B$3$N%m%4$N%i%$%;%s%9$O%*!<%W%s%f!<%:%m%4!&%i%$%;%s%9$K=>$$$^$9!#(B
 $B$3$N%m%4$O(B <A HREF="mailto:csmall@debian.org">Craig Small</A>
 $B$K$h$C$F:n@.$5$l$^$7$?!#(B
 
-<P><IMG SRC="button-2.gif"><IMG SRC="button-3.jpg">
-<BR>Debian $BMQ$K:n@.$5$l$?$=$NB>$N%m%4(B
+<P>$B$3$A$i$,!"(BDebian $BMQ$K:n@.$5$l$?$=$NB>$N%\%?%s$G$9(B:
+<BR>
+<IMG SRC="button-2.gif" ALT="[Powered by Debian]"> &nbsp;
+<IMG SRC="button-3.jpg" ALT="[Powered by Debian]"> &nbsp;
+<IMG SRC="button-k1.png" ALT="[Powered by Debian]"> &nbsp;
+<IMG SRC="button-k2.png" ALT="[Powered by Debian]"> &nbsp;
 
-<P>Linux Tag-99 $B$N(B <A HREF="tshirt-lt99.jpg">T $B%7%c%D(B</A>
+<P><a href="http://gnuart.onshore.com/">GNU/art site</a> $B$+$i(B
+$B$b$C$HAGE($J2hA|$r<j$K$$$l$k$3$H$,$G$-$^$9!#(B
 
-<P>Debian $B$K$D$$$F8@5Z$9$k:]$K!"(B
-$B0J2<$N%P!<%J$r%&%'%V%Y!<%9$N9-9p$H$7$FMxMQ$9$k$3$H$,$G$-$^$9!#(B
-$B$3$A$i$rMxMQ$9$k:]$d!"$=$NMxMQ$rCf;_$9$k:]$K;d$?$A$K$=$N;]$rEA$($k>l9g$O!"(B
-<A HREF="mailto:webmaster@debian.org">webmaster@debian.org</A>
-$B08$F$KEE;R%a!<%k$rAw$C$F$/$@$5$$!#(B
+<P>Linux Tag-99 $B$N(B <A HREF="tshirt-lt99.jpg">T $B%7%c%D%G%6%$%s(B</A>
 
-<bannertable>
+<P>Debian $B$r%&%'%V$G@kEA$7$F$$$?$@$/$H$-$O!"(B
+<a href="../banners/">$B%P%J!<(B</a>$B$,MxMQ$G$-$k$G$7$g$&!#(B