fix misplaced translations (d-w@13099)

CVS version numbers

japanese/logos/index.wml: 1.19 -> 1.20

1 files changed, 27 insertions, 28 deletions

diff --git a/japanese/logos/index.wml b/japanese/logos/index.wml
index 5cb17a945ba..64d83e8dbd1 100644
--- a/japanese/logos/index.wml
+++ b/japanese/logos/index.wml
@@ -24,6 +24,32 @@
 <td>
 <H3>Debian オープンユーズロゴ・ライセンス</H3>
 
+<P>&ldquo;Debian&rdquo; なしのロゴは以下の一般フリーソフトウェアライセンス
+   でリリースされます。
+
+<P>Copyright (c) 1999 Software in the Public Interest
+      <P>Permission is hereby granted, free of charge, to any person
+      obtaining a copy of this software and associated documentation
+      files (the "Software"), to deal in the Software without restriction,
+      including without limitation the rights to use, copy, modify, merge,
+      publish, distribute, sublicense, and/or sell copies of the Software,
+      and to permit persons to whom the Software is furnished to do so,
+      subject to the following conditions:
+
+      <P>The above copyright notice and this permission notice shall be
+      included in all copies or substantial portions of the Software.
+
+      <P>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+      KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+      WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+      NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+      BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+      AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+      IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+      THE SOFTWARE.
+
+<P>&ldquo;Debian&rdquo; 付きのロゴは、現在進行中の<a href="../trademark">商標</a>に関する事柄のため、
+以下のライセンスでリリースされます。
 
 <P>Copyright (c) 1999 Software in the Public Interest
 <br>
@@ -32,7 +58,7 @@
 それらは本プロジェクトによる保証を示すものではない。
 
 <P>註: このロゴイメージをウェブページで使うときは、
-http://www.debian.org/ へのリンクとすることを期待する。
+!http://www.debian.org/ へのリンクとすることを期待する。
 </td>
 <td>
 <openlogotable>
@@ -53,33 +79,6 @@ http://www.debian.org/ へのリンクとすることを期待する。
 <td>
 <H3>Debian オフィシャルユーズロゴ・ライセンス</H3>
 
-<P>&ldquo;Debian&rdquo; なしのロゴは以下の一般フリーソフトウェアライセンス
-   でリリースされます。
-
-<P>Copyright (c) 1999 Software in the Public Interest
-      <P>Permission is hereby granted, free of charge, to any person
-      obtaining a copy of this software and associated documentation
-      files (the "Software"), to deal in the Software without restriction,
-      including without limitation the rights to use, copy, modify, merge,
-      publish, distribute, sublicense, and/or sell copies of the Software,
-      and to permit persons to whom the Software is furnished to do so,
-      subject to the following conditions:
-
-      <P>The above copyright notice and this permission notice shall be
-      included in all copies or substantial portions of the Software.
-
-      <P>THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-      KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-      WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-      NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-      BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-      AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
-      IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-      THE SOFTWARE.
-
-<P>&ldquo;Debian&rdquo; 付きのロゴは、現在進行中の<a href="../trademark">商標</a>に関する事柄のため、
-以下のライセンスでリリースされます。
-
 <P>Copyright (c) 1999 Software in the Public Interest
 <OL>
 	<LI>本ロゴは以下の条件を満たす場合のみ利用することができる。