aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosip Rodin <joy>2002-01-06 15:34:34 +0000
committerJosip Rodin <joy>2002-01-06 15:34:34 +0000
commit74ea64298aaef1ed5a9c6b868f87a1ba61530f05 (patch)
treeba7b182b3c3354ce6f9947ef203f310c58f133ab
parentae5512eedae015cef31e1f118d917cf3026ab469 (diff)
updated SPI address and fixed a few links that lacked http: for some strange reason; removed mention of OpenHardware(tm) since we don't mention it anywhere else anymore; added a link to logos/; added a note for translators; didn't up the translation-check so that translators do still check things out
CVS version numbers catalan/license.wml: 1.2 -> 1.3 croatian/license.wml: 1.7 -> 1.8 danish/license.wml: 1.5 -> 1.6 english/license.wml: 1.11 -> 1.12 finnish/license.wml: 1.2 -> 1.3 french/license.wml: 1.8 -> 1.9 german/license.wml: 1.11 -> 1.12 greek/license.wml: 1.2 -> 1.3 indonesian/license.wml: 1.2 -> 1.3 italian/license.wml: 1.14 -> 1.15 japanese/license.wml: 1.6 -> 1.7 korean/license.wml: 1.14 -> 1.15 norwegian/license.wml: 1.12 -> 1.13 polish/license.wml: 1.9 -> 1.10 portuguese/license.wml: 1.7 -> 1.8 romanian/license.wml: 1.15 -> 1.16 russian/license.wml: 1.3 -> 1.4 spanish/license.wml: 1.12 -> 1.13 swedish/license.wml: 1.8 -> 1.9 turkish/license.wml: 1.4 -> 1.5
-rw-r--r--catalan/license.wml18
-rw-r--r--croatian/license.wml17
-rw-r--r--danish/license.wml21
-rw-r--r--english/license.wml27
-rw-r--r--finnish/license.wml15
-rw-r--r--french/license.wml20
-rw-r--r--german/license.wml21
-rw-r--r--greek/license.wml20
-rw-r--r--indonesian/license.wml13
-rw-r--r--italian/license.wml28
-rw-r--r--japanese/license.wml18
-rw-r--r--korean/license.wml28
-rw-r--r--norwegian/license.wml34
-rw-r--r--polish/license.wml21
-rw-r--r--portuguese/license.wml18
-rw-r--r--romanian/license.wml28
-rw-r--r--russian/license.wml18
-rw-r--r--spanish/license.wml18
-rw-r--r--swedish/license.wml19
-rw-r--r--turkish/license.wml17
20 files changed, 207 insertions, 212 deletions
diff --git a/catalan/license.wml b/catalan/license.wml
index 0f12d5bae09..c34b174b47a 100644
--- a/catalan/license.wml
+++ b/catalan/license.wml
@@ -1,18 +1,18 @@
#use wml::debian::template title="Llicència de les pàgines WWW Debian" NOCOPYRIGHT="true" BARETITLE="true"
#use wml::debian::translation-check translation="1.11"
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<P>Aquest material només pot ésser distribuït subjecte als termes i
les condicions esmentats a la Open Publication License, Draft v1.0 o
posterior (la darrera versió es troba disponible a
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>).
-<P>&ldquo;Debian&rdquo;, el logotip de Debian, &ldquo;Open
-Hardware&rdquo;, i el logotip d'Open Hardware són marques comercials
-de Software in the Public Interest, Inc.
+<P>&ldquo;Debian&rdquo; i <a href="logos/">el logotip de Debian</a>
+són marques comercials de Software in the Public Interest, Inc.
diff --git a/croatian/license.wml b/croatian/license.wml
index 522d79f4947..12609bb5712 100644
--- a/croatian/license.wml
+++ b/croatian/license.wml
@@ -1,17 +1,18 @@
#use wml::debian::template title="Licenca Debian WWW stranica" NOCOPYRIGHT="true" BARETITLE="true"
#use wml::debian::translation-check translation="1.11"
-<BLOCKQUOTE>
-<P>Vlasnik autorskih prava &copy; 1997.-2002.
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<P>Ovaj materijal se smije distribuirati samo ovisno o uvjetima pokazanima u
`Open Publication License', Draft v1.0 ili kasnijima (najnovija verzija je
trenutno dostupna na
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>).
-<P>&ldquo;Debian&rdquo;, Debian Logo, &ldquo;Open Hardware&rdquo;,
-i Open Hardware Logo su znakovi tvrtke Software in the Public Interest, Inc.
+<P>&ldquo;Debian&rdquo; i <a href="logos/">Debian logotip</a>
+su znakovi tvrtke Software in the Public Interest, Inc.
diff --git a/danish/license.wml b/danish/license.wml
index f76688a68c6..f5344197081 100644
--- a/danish/license.wml
+++ b/danish/license.wml
@@ -1,20 +1,21 @@
#use wml::debian::template title="Debians web-licens" NOCOPYRIGHT="true" BARETITLE="true"
#use wml::debian::translation-check translation="1.11"
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<P>Dette materiale må kun distributeres i henhold til vilkårene beskrevet i
Open Publication License, udkast (draft) v1.0 eller senere (den seneste
version er tilgængelig på
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>).</p>
-<P>&ldquo;Debian&rdquo;, Debians logo, &ldquo;Open Hardware&rdquo;,
-og Open Hardware-logoet er varemærker tilhørende Software in the Public
-Interest, Inc.</p>
+<P>&ldquo;Debian&rdquo; og <a href="logos/">Debians logo</a>
+er varemærker tilhørende Software in the Public Interest, Inc.</p>
-<p>Dette er en oversættelse af det <a href="license.en.html">originale</a> engelsksprogede dokument.</p> \ No newline at end of file
+<p>Dette er en oversættelse af det <a href="license.en.html">originale</a>
+engelsksprogede dokument.</p>
diff --git a/english/license.wml b/english/license.wml
index 83cc0589273..fa9a9267a71 100644
--- a/english/license.wml
+++ b/english/license.wml
@@ -1,17 +1,22 @@
#use wml::debian::template title="Debian WWW Pages License" NOCOPYRIGHT="true" BARETITLE="true"
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
-<P>This material may be distributed only subject to the terms and conditions set
+<p>This material may be distributed only subject to the terms and conditions set
forth in the Open Publication License, Draft v1.0 or later (the latest version
is presently available at
-<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>).
+<a href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>).
+</p>
-<P>&ldquo;Debian&rdquo;, the Debian Logo, &ldquo;Open Hardware&rdquo;,
-and the Open Hardware Logo are trademarks of Software in the Public
-Interest, Inc.
+<p>&ldquo;Debian&rdquo; and <a href="logos/">the Debian Logo</a>
+are trademarks of Software in the Public Interest, Inc.</p>
+
+# Note to translators: you are free to link to <a href="license.en.html">the
+# original license</a> here -- this is legal text and only the original
+# version is authoritative. In fact, you needn't even bother translating this.
diff --git a/finnish/license.wml b/finnish/license.wml
index 904e3234219..742603b97a6 100644
--- a/finnish/license.wml
+++ b/finnish/license.wml
@@ -2,10 +2,11 @@
#use wml::debian::translation-check translation="1.11"
<blockquote>
-<p>Tekijänoikeudet &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><br>
-P.O. Box 1326<br>
-Boston, MA 02117, USA.
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
</blockquote>
<p>Tätä materiaalia voidaan levittää ainoastaan Open Publication
@@ -13,6 +14,6 @@ License, draft v1.0 (uusin versio on saatavilla osoitteesta <a
href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</a>)
tai myöhemmän määräysten ja ehtojen mukaisesti.</p>
-<p>&ldquo;Debian&rdquo;, Debian-logo, &ldquo;Open Hardware&rdquo;,
-ja Open Hardware -logo ovat <span lang="en">Software in the Public
-Interest, Inc.</span>:n tavaramerkkejä.</p>
+<p>&ldquo;Debian&rdquo; ja <a href="logos/">Debian-logo</a> ovat
+<span lang="en">Software in the Public Interest, Inc.</span>:n
+tavaramerkkejä.</p>
diff --git a/french/license.wml b/french/license.wml
index 084d96c14ed..2a5f607d375 100644
--- a/french/license.wml
+++ b/french/license.wml
@@ -2,11 +2,11 @@
#use wml::debian::translation-check translation="1.11" translation_maintainer="Norbert Bottlaender-Prier"
<blockquote>
-<p>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest
-(SPI)</a><br />
-P.O. Box 1326<br />
-Boston, MA 02117, USA.</p>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
</blockquote>
<p>Ce matériel ne peut être distribué que conformément aux termes et
@@ -17,10 +17,6 @@ Publication License)</em>, Draft v.1.0 ou suivantes.
http://www.opencontent.org/openpub/</a>).
</p>
-<p>&ldquo;Debian&rdquo;, le logo <em>Debian,</em> &ldquo;Open
-Hardware&rdquo;,
-et le Logo <em>Open Hardware</em> sont des marques déposées appartenant à
-<em>Software in the Public Interest, Inc.</em></p>
-
-
-
+<p>&ldquo;Debian&rdquo; et <a href="logos/">le logo Debian</a> sont des
+marques déposées appartenant à <em>Software in the Public Interest, Inc.</em>
+</p>
diff --git a/german/license.wml b/german/license.wml
index d118dd994ef..0fb610fcf51 100644
--- a/german/license.wml
+++ b/german/license.wml
@@ -7,12 +7,13 @@
$Id$
-->
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<P>Dieses Material darf nur unter den Bestimmungen, die in der
Open Publication License, Draft v1.0 oder sp&auml;ter (die neuste
@@ -21,13 +22,11 @@ Version ist gegenw&auml;rtig unter
href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>
erreichbar) festgehalten sind, weitergegeben werden.
-<P>&ldquo;Debian&rdquo;, das Debian-Logo, &ldquo;Open Hardware&rdquo;
-und das Open-Hardware-Logo sind Warenzeichen von Software in the Public
-Interest, Inc.
+<P>&ldquo;Debian&rdquo; und <a href="logos/">das Debian-Logo</a> sind
+Warenzeichen von Software in the Public Interest, Inc.
<hr>
-<p><small> Dies ist die deutsche &Uuml;bersetzung von
+<p><small>Dies ist die deutsche &Uuml;bersetzung von
&ldquo;<a href="license.en.html">Debian's license</a>&rdquo;.
In Zweifelsf&auml;llen ist das englische Original ma&szlig;geblich.</small>
-
diff --git a/greek/license.wml b/greek/license.wml
index 350c55994e5..0682ddd29e9 100644
--- a/greek/license.wml
+++ b/greek/license.wml
@@ -1,18 +1,18 @@
-#use wml::debian::translation-check translation="1.9"
#use wml::debian::template title="¶äåéá ôùí óåëßäùí WWW ôïõ Debian" NOCOPYRIGHT="true" BARETITLE="true"
+#use wml::debian::translation-check translation="1.9"
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2000
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<P>Áõôü ôï õëéêü ìðïñåß íá äéáíåìçèåß ìüíï êÜôù áðï ôïõò üñïõò êáé ôéò óõíèÞêåò ðïõ
ðåñéãñÜöïíôáé óôçí Open Publication License, Draft v1.0 Þ íåþôåñï (ç íåþôåñç Ýêäïóç
åßíáé äéáèÝóéìç óôçí çë. äéåýèõíóç
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>).
-<P>&ldquo;Ôï üíïìá Debian&rdquo;, ôï Debian Logo, &ldquo;ôï üíïìá Open Hardware&rdquo;,
-êáé ôï Open Hardware Logo åßíáé óÞìáôá êáôáôåèÝíôá ôïõ Software in the Public
-Interest, Inc.
+<P>&ldquo;Ôï üíïìá Debian&rdquo; êáé <a href="logos/">ôï Debian Logo</a>
+åßíáé óÞìáôá êáôáôåèÝíôá ôïõ Software in the Public Interest, Inc.
diff --git a/indonesian/license.wml b/indonesian/license.wml
index 3cea858e4cd..46c229850b8 100644
--- a/indonesian/license.wml
+++ b/indonesian/license.wml
@@ -2,15 +2,16 @@
#use wml::debian::translation-check translation="1.11"
<blockquote>
-<p>Hak Cipta &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><br>
-P.O. Box 1326<br>
-Boston, MA 02117, USA.
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
</blockquote>
<p>Materi ini hanya dapat diedarkan berdasarkan lisensi Open Publication License, Draft v1.0
atau yang lebih baru (versi terakhir lisensi ini tersedia di
<a href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</a>).
-<p>&ldquo;Debian&rdquo;, Logo Debian, &ldquo;Open Hardware&rdquo;,
-and Logo Open Hardware adalah cap/tanda milik Software in the Public Interest, Inc.
+<p>&ldquo;Debian&rdquo; and <a href="logos/">Logo Debian</a>
+adalah cap/tanda milik Software in the Public Interest, Inc.
diff --git a/italian/license.wml b/italian/license.wml
index 03687a2f5ad..0fd32c5f08f 100644
--- a/italian/license.wml
+++ b/italian/license.wml
@@ -1,12 +1,14 @@
#use wml::debian::template title="Pagina della Licenza Debian WWW" NOCOPYRIGHT="true" BARETITLE="true"
#use wml::debian::translation-check translation="1.11"
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest,
+Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<P>Questo materiale può essere distribuito solo ai termini e sotto le
consizioni poste nel "Open Publication License", Bozza v1.0 o
@@ -14,12 +16,10 @@ successiva (l'ultima versione è attualmente disponibile presso
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub
/</A>).
-<P>&ldquo;Debian&rdquo;, il Logo Debian, &ldquo;Open Hardware&rdquo;,
-e il logo Open Hardware sono trademark di Software in the Public
-Interest, Inc.
+<P>&ldquo;Debian&rdquo; e <a href="logos/">il Logo Debian</a>
+sono trademark di Software in the Public Interest, Inc.
-<P><B>N.d.T.</B>: Questa è una traduzione della <a
- href="license.en.html">licenza originale in inglese</a>. In tutti in
- casi in cui il significato della traduzione differisca da quello
- dell'originale, la versione corretta è da considerarsi quella
- originale.
+<P><B>N.d.T.</B>: Questa è una traduzione della
+<a href="license.en.html">licenza originale in inglese</a>. In tutti in casi
+in cui il significato della traduzione differisca da quello dell'originale,
+la versione corretta è da considerarsi quella originale.
diff --git a/japanese/license.wml b/japanese/license.wml
index 9dc293f2037..5314628fb8d 100644
--- a/japanese/license.wml
+++ b/japanese/license.wml
@@ -1,12 +1,13 @@
#use wml::debian::template title="Debian WWW $B%Z!<%8%i%$%;%s%9(B" NOCOPYRIGHT="true" BARETITLE="true"
#use wml::debian::translation-check translation="1.11"
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<P>Open Publication License $B$N%I%i%U%H(B v1.0 $B0J9_$K5,Dj$5$l$?(B
$B>r9`$*$h$S>r7o$K=>$&>l9g$N$_!"(B
@@ -15,6 +16,5 @@ Boston, MA 02117, USA.
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>
$B$K$FF~<j$G$-$^$9!#(B)
-<P>&ldquo;Debian&rdquo; $B$*$h$S(B Debian $B%m%4!"(B
-&ldquo;Open Hardware&rdquo; $B$*$h$S(B Open Hardware $B%m%4$O!"(B
-Software in the Public Interest, Inc $B$N>&I8$G$9!#(B
+<P>&ldquo;Debian&rdquo; <a href="logos/">$B$*$h$S(B Debian $B%m%4!"(B</a>
+Software in the Public Interest, Inc. $B$N>&I8$G$9!#(B
diff --git a/korean/license.wml b/korean/license.wml
index 1fdc9c49038..4792de38121 100644
--- a/korean/license.wml
+++ b/korean/license.wml
@@ -1,19 +1,17 @@
-#use wml::debian::template title="»ç¿ë±Ç"
-#use wml::debian::translation-check translation="1.11"
+#use wml::debian::template title="»ç¿ë±Ç" NOCOPYRIGHT="true"
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
-<P>This material may be distributed only subject to the terms and conditions set
-
-forth in the Open Publication License, Draft v1.0 or later (the latest version
+<P>This material may be distributed only subject to the terms and conditions set
+forth in the Open Publication License, Draft v1.0 or later (the latest version
is presently available at
-<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub
-/</A>).
+<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>).
-<P>&ldquo;Debian&rdquo;°ú Debian ·Î°í, &ldquo;Open Hardware&rdquo;¿Í
-Open Hardware ·Î°í´Â °øÀͼÒÇÁÆ®¿þ¾î ´ÜüÀÇ µî·Ï »óÇ¥ÀÌ´Ù.
+<P>&ldquo;Debian&rdquo;°ú <a href="logos/">Debian ·Î°í</a>
+·Î°í´Â °øÀͼÒÇÁÆ®¿þ¾î ´ÜüÀÇ µî·Ï »óÇ¥ÀÌ´Ù.
diff --git a/norwegian/license.wml b/norwegian/license.wml
index ff6779faca3..4e8f3fb80e6 100644
--- a/norwegian/license.wml
+++ b/norwegian/license.wml
@@ -1,27 +1,25 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//NO">
#use wml::debian::template title="Lisens for Debians nettsider" NOCOPYRIGHT="true" BARETITLE="true"
#use wml::debian::translation-check translation="1.11"
-<!--Oversatt til norsk av Tor Slettnes (tor@slett.net)-->
+# Oversatt til norsk av Tor Slettnes (tor@slett.net)
-
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117<BR>
-USA.
-</BLOCKQUOTE>
-
-<hr>
-<P><i>Denne siden er oversatt fra engelsk. Den opprinnelige lisensen
-er tilgjengelig <a href="license.en.html">her</a>.</i>
-<hr>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<p>Materialet på disse sidene kan kun videreformidles i henhold til
vilkårene fremsatt i "the Open Publication License, Draft v1.0" eller
senere. Den nyeste versjonen (på engelsk) er tilgjengelig hos
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>.
-<P>&ldquo;Debian&rdquo;, Debianlogoen, &ldquo;Open Hardware&rdquo;,
-og Open Hardware-logoen er varemerker til Software in the Public
-Interest, Inc. (Programvare i allmen interesse).
+<P>&ldquo;Debian&rdquo; og <a href="logos/">Debianlogoen</a>
+er varemerker til Software in the Public Interest, Inc. (Programvare i
+allmen interesse).
+
+<hr>
+
+<P><i>Denne siden er oversatt fra engelsk. Den opprinnelige lisensen
+er tilgjengelig <a href="license.en.html">her</a>.</i>
diff --git a/polish/license.wml b/polish/license.wml
index 43d327a0b55..9dd060185a8 100644
--- a/polish/license.wml
+++ b/polish/license.wml
@@ -1,24 +1,23 @@
#use wml::debian::template title="Licencja stron WWW Debiana" NOCOPYRIGHT="true" BARETITLE="true"
#use wml::debian::translation-check translation="1.11"
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<P>Zezwala siê na kopiwanie i dystrybuowanie tego materia³u tylko zgodnie
z warunkami okre¶lonymi w Open Publication License, Draft v1.0 lub
pó¼niejszej (najnowsza wersja jest obecnie dostêpna pod adresem
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>).
-<P>&ldquo;Debian&rdquo;, Logo Debiana, &ldquo;Open Hardware&rdquo;,
-i logo Open Hardware s± znakami handlowymi Software in the Public
-Interest, Inc.
+<P>&ldquo;Debian&rdquo; i <a href="logos/">Logo Debiana</a>
+s± znakami handlowymi Software in the Public Interest, Inc.
<hr>
-<p><small> To jest polskie t³umaczenie <a href="license.en.html">Licencji
+<p><small>To jest polskie t³umaczenie <a href="license.en.html">Licencji
stron WWW Debiana</a>. Jest ona dostêpna równie¿ w oryginale.</small>
-
diff --git a/portuguese/license.wml b/portuguese/license.wml
index adaa4fec6a4..e0270cb0d3a 100644
--- a/portuguese/license.wml
+++ b/portuguese/license.wml
@@ -1,18 +1,18 @@
#use wml::debian::template title="Licença das Páginas WWW da Debian" NOCOPYRIGHT="true" BARETITLE="true"
#use wml::debian::translation-check translation="1.11"
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<P>Esse material só pode ser distribuído sob os termos e condições definidos
na Open Publication License (Licença de Publicação Aberta), versão 1.0 ou
posterior (a última versão estará disponível sempre em
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>).
-<P>&ldquo;Debian&rdquo;, o Logotipo da Debian, &ldquo;Open Hardware&rdquo;,
-e o Logotipo Open Hardware são marcas registradas da Software in the Public
-Interest, Inc.
+<P>&ldquo;Debian&rdquo; e <a href="logos/">o Logotipo da Debian</a>
+são marcas registradas da Software in the Public Interest, Inc.
diff --git a/romanian/license.wml b/romanian/license.wml
index d94fdb89f36..73128ed4ba7 100644
--- a/romanian/license.wml
+++ b/romanian/license.wml
@@ -1,26 +1,22 @@
-#use wml::debian::translation-check translation="1.11"
#use wml::debian::template title="Licenþa paginilor web Debian" NOCOPYRIGHT="true" BARETITLE="true"
+#use wml::debian::translation-check translation="1.11"
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
-
-<P>
-Acest material poate fi distribuit numai în condiþiile ºi termenii specificaþi de
+<P>Acest material poate fi distribuit numai în condiþiile ºi termenii specificaþi de
cãtre Licenþã de publicare deschisã (Open Publication License), versiunea (draft) v1.0 sau urmãtoarele (ultima versiune se
aflã în prezent la
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub
/</A>).
-<P>&ldquo;Debian&rdquo;, Debian Logo, &ldquo;Open Hardware&rdquo;,
-ºi Open Hardware Logo sînt mãrci înregistrate ale Software in the Public
-Interest, Inc.
+<P>&ldquo;Debian&rdquo; ºi <a href="logos/">Debian Logo</a>
+sînt mãrci înregistrate ale Software in the Public Interest, Inc.
<P>Acest document a fost tradus în românã din englezã. Originalul acestei traduceri
-poate fi gãsit la:
-<A HREF="/license.html"> Debian License </A>
-
+poate fi gãsit la: <A HREF="/license.html">Debian License</A>.
diff --git a/russian/license.wml b/russian/license.wml
index d9fc9242361..6c1c4d5d644 100644
--- a/russian/license.wml
+++ b/russian/license.wml
@@ -1,18 +1,18 @@
#use wml::debian::template title="WWW ÓÔÒÁÎÉÃÙ ÌÉÃÅÎÚÉÉ Debian" NOCOPYRIGHT="true" BARETITLE="true"
#use wml::debian::translation-check translation="1.11"
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">ðÒÏÇÒÁÍÍÎÏÅ ïÂÅÓÐÅÞÅÎÉÅ × ïÂÝÅÓÔ×ÅÎÎÙÈ éÎÔÅÒÅÓÁÈ (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<P>üÔÏÔ ÍÁÔÅÒÉÁÌ ÍÏÖÎÏ ÒÁÓÐÒÏÓÔÒÁÎÑÔØ ÔÏÌØËÏ ÐÒÉ ÓÏÇÌÁÓÉÉ É ×ÙÐÏÌÎÅÎÉÉ
ÕÓÌÏ×ÉÊ ïÔËÒÙÔÏÊ ÌÉÃÅÎÚÉÉ ÄÌÑ ÐÕÂÌÉËÁÃÉÊ, ÞÅÒÎÏ×ÉË v1.0 ÉÌÉ ÂÏÌÅÅ ÐÏÚÄÎÅÊ
(× ÎÁÓÔÏÑÝÉÊ ÍÏÍÅÎÔ, ÐÏÓÌÅÄÎÑÑ ×ÅÒÓÉÑ ÄÏÓÔÕÐÎÁ ÐÏ ÁÄÒÅÓÕ
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>).
-<P>&ldquo;Debian&rdquo;, the Debian Logo, &ldquo;Open Hardware&rdquo;,
-É the Open Hardware Logo Ñ×ÌÑÀÔÓÑ ÔÏÒÇÏ×ÙÍÉ ÍÁÒËÁÍÉ Software in the Public
-Interest, Inc.
+<P>&ldquo;Debian&rdquo; É <a href="logos/">the Debian Logo</a>
+Ñ×ÌÑÀÔÓÑ ÔÏÒÇÏ×ÙÍÉ ÍÁÒËÁÍÉ Software in the Public Interest, Inc.
diff --git a/spanish/license.wml b/spanish/license.wml
index 2deb841e61f..985ee400c71 100644
--- a/spanish/license.wml
+++ b/spanish/license.wml
@@ -1,12 +1,13 @@
#use wml::debian::template title="Licencia de las páginas WWW de Debian" NOCOPYRIGHT="true" BARETITLE="true"
#use wml::debian::translation-check translation="1.11"
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-Software en el Interés Público (SPI)<BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<P><STRONG>OJO</STRONG>: Esta es una traducci&oacute;n de la licencia
original, sin valor jurídico, para más información debe acudir a la
@@ -17,6 +18,5 @@ condiciones indicados en la Licencia de Publicaciones Abiertas, Borrador
v1.0 o posterior (la última versión está disponible en
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>).
-<P>&ldquo;Debian&rdquo;, El Logo de Debian, &ldquo;Open Hardware&rdquo;,
-y el Logo de Open Hardware son marcas registradas de Software en el
-Inter&eacute;s P&uacute;blico, Inc.
+<P>&ldquo;Debian&rdquo; y <a href="logos/">El Logo de Debian</a>
+son marcas registradas de Software in the Public Interest, Inc.
diff --git a/swedish/license.wml b/swedish/license.wml
index cf655b5b09a..95826693140 100644
--- a/swedish/license.wml
+++ b/swedish/license.wml
@@ -1,13 +1,13 @@
#use wml::debian::template title="Debians webbplatslicens" NOCOPYRIGHT="true" BARETITLE="true"
#use wml::debian::translation-check translation="1.11"
-<BLOCKQUOTE>
-<P>© 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117<BR>
-Amerikas förenta stater
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<P>
Detta material får enbart distribueras i enlighet med de villkor som
@@ -15,9 +15,8 @@ beskrivs i Open Publication License, förhandsverion (draft) 1.0 eller senare
(den senaste versionen går för närvarande att finna på
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>).
-<P>"Debian", Debians logotyp, "Open Hardware" och
-Open Hardware-logotypen är varumärken hos Software in the Public
-Interest, Inc.
+<P>"Debian" och <a href="logos/">Debians logotyp</a>
+är varumärken hos Software in the Public Interest, Inc.
<P>Detta är en översättning från det
<a href="license.en.html">engelska originalet</A>
diff --git a/turkish/license.wml b/turkish/license.wml
index 2aad38db47c..63fcfe821c3 100644
--- a/turkish/license.wml
+++ b/turkish/license.wml
@@ -2,17 +2,18 @@
#Translator: Murat Demirten <murat@debian.org>
#use wml::debian::translation-check translation="1.11"
-<BLOCKQUOTE>
-<P>Copyright &copy; 1997-2002
-<a href="//www.spi-inc.org/">Software in the Public Interest (SPI)</a><BR>
-P.O. Box 1326<BR>
-Boston, MA 02117, USA.
-</BLOCKQUOTE>
+<blockquote>
+<p>Copyright &copy; 1997-2002
+<a href="http://www.spi-inc.org/">Software in the Public Interest, Inc.</a><br>
+P.O. Box 502761<br>
+Indianapolis, IN 46250-2761<br>
+United States<br>
+</blockquote>
<P>Buradaki belgeler Open Publication License, Draft v1.0 veya sonrasýndaki (en son versiyonunu
<A href="http://www.opencontent.org/openpub/">http://www.opencontent.org/openpub/</A>
adresinden bulabilirsiniz) hususlar
dikkate alýnarak daðýtýlabilir.
-<P>&ldquo;Debian&rdquo;, Debian Logosu, &ldquo;Open Hardware&rdquo;,
-ve Open Hardware Logolarý Software in the Public Interest, Inc'ýn tescilli markalarýdýr.
+<P>&ldquo;Debian&rdquo; ve <a href="logos/">Debian Logosu</a>
+Software in the Public Interest, Inc'ýn tescilli markalarýdýr.

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