diff options
author | Peter Karlsson <peterk> | 2004-12-02 20:04:50 +0000 |
---|---|---|
committer | Peter Karlsson <peterk> | 2004-12-02 20:04:50 +0000 |
commit | f228116b00d453012b10e51dc1bf9cb89d0de4f9 (patch) | |
tree | d9fee5d4a28da0fa6354cf0a03f476fd5e0232fd /swedish/social_contract.wml | |
parent | d64414c1dcebf4bef00de8df767b0e48f6cfca99 (diff) |
Sync: Make the two versions v.10 of the social contract the same (1.16)
CVS version numbers
swedish/social_contract.wml: 1.17 -> 1.18
Diffstat (limited to 'swedish/social_contract.wml')
-rw-r--r-- | swedish/social_contract.wml | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/swedish/social_contract.wml b/swedish/social_contract.wml index 420bf5dbded..f3124ac8d95 100644 --- a/swedish/social_contract.wml +++ b/swedish/social_contract.wml @@ -1,5 +1,13 @@ #use wml::debian::template title="Debians sociala kontrakt" -#use wml::debian::translation-check translation="1.15" mindelta="1" maxdelta="3" +#use wml::debian::translation-check translation="1.16" mindelta="1" maxdelta="3" + +<p> + Version 1.0 stadfäst den 5 juli 1997. +<!-- + Ersatt av + <a href="social_contract">version 1.1</a>, stadfäst den 26 april 2004. + --> +</p> <p>Debian, producenterna av Debian GNU/Linux-systemet, har skapat <strong>Debians sociala kontrakt</strong>. @@ -136,8 +144,8 @@ källkod</a> (eng. <em lang="en">open source</em>). <li><p><strong>Exempel på licenser</strong> <p>”<strong><a href="http://www.gnu.org/copyleft/gpl.html">GPL</a></strong>”, - ”<strong>BSD</strong>”, och - ”<strong><a href="http://www.opensource.org/licenses/artistic-license.php">Artistic</a></strong>” + ”<strong><a href="misc/bsd.license">BSD</a></strong>”, och + ”<strong><a href="http://www.perl.com/pub/a/language/misc/Artistic.html">Artistic</a></strong>” är licenser som vi anser vara ”<em>fria</em>”. </ol> |