aboutsummaryrefslogtreecommitdiffstats
path: root/japanese/logos
diff options
context:
space:
mode:
authorKenshi Muto <kmuto>2008-10-01 16:22:36 +0000
committerKenshi Muto <kmuto>2008-10-01 16:22:36 +0000
commit7b554b180c4228e225bfdefe41c8b0de9cef946c (patch)
tree22f99fd2101232c43611b3c0c2831d09cd8be341 /japanese/logos
parent568fb6e0de3c7d0d2b8a1789a80c9041f226e154 (diff)
sync with 1.57
CVS version numbers japanese/logos/index.wml: 1.18 -> 1.19
Diffstat (limited to 'japanese/logos')
-rw-r--r--japanese/logos/index.wml29
1 files changed, 28 insertions, 1 deletions
diff --git a/japanese/logos/index.wml b/japanese/logos/index.wml
index 73bf3b4e462..5cb17a945ba 100644
--- a/japanese/logos/index.wml
+++ b/japanese/logos/index.wml
@@ -1,6 +1,6 @@
#use wml::debian::template title="Debian ロゴ" BARETITLE=true
#include "$(ENGLISHDIR)/logos/index.data"
-#use wml::debian::translation-check translation="1.55"
+#use wml::debian::translation-check translation="1.57"
<P>Debian は現在も将来も自由に入手できるものであり続けますが、
「Linux」の商標権の問題が示すように、Debian の持つ資産は
@@ -53,6 +53,33 @@ 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>本ロゴは以下の条件を満たす場合のみ利用することができる。

© 2014-2024 Faster IT GmbH | imprint | privacy policy