diff options
author | Kåre Thor Olsen <kaare> | 2012-10-01 08:40:51 +0000 |
---|---|---|
committer | Kåre Thor Olsen <kaare> | 2012-10-01 08:40:51 +0000 |
commit | 953d1bb733659712abb242eb751aa175a362a54e (patch) | |
tree | 1e2b014585e50e70d84daf3c6c19a08010892906 /danish/logos | |
parent | 87c2330e95f9d5109144cad7784a3fcb399d47ef (diff) |
Sync
CVS version numbers
danish/logos/index.wml: 1.20 -> 1.21
danish/releases/squeeze/errata.wml: 1.9 -> 1.10
Diffstat (limited to 'danish/logos')
-rw-r--r-- | danish/logos/index.wml | 51 |
1 files changed, 15 insertions, 36 deletions
diff --git a/danish/logos/index.wml b/danish/logos/index.wml index 5ccc794d1cf..65ccab67b17 100644 --- a/danish/logos/index.wml +++ b/danish/logos/index.wml @@ -1,5 +1,5 @@ #use wml::debian::template title="Debians bomærker" -#use wml::debian::translation-check translation="1.64" +#use wml::debian::translation-check translation="1.65" #include "$(ENGLISHDIR)/logos/index.data" <p>Selv om Debian kan anskaffes uden omkostninger og altid vil kunne det, har @@ -22,42 +22,21 @@ bomærke</a> har en form for åben licens.</p> </tr> <tr> <td> - <h3>Debians åbne bomærke-licens</h3> - - <p>Bomærket uden <q>Debian</q> er udgivet under følgende fælles frie - softwarelicens (uoversat).</p> - - <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> - - <p>The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software.</p> - - <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> - - <p>Bomærket med <q>Debian</q> er udgivet under følgende licens på grund - af <a href="../trademark">varemærke</a>problematik.</p> - - <p>Ophavsretsligt beskyttet (c) 1999 Software in the Public Interest</p> - <p>Bemærk! Den <a href="index.en.html">engelske side</a> indeholder den - originale ordlyd, dette er blot en oversættelse.</p> - <p>Dette bomærke eller en rettet version må anvendes af enhver som reference - til Debian-projektet, men indikerer ikke godkendelse fra projektet.</p> + <p>Debian Open Use Logo findes i to varianter, et med og et uden teksten + “Debian”.</p> + + <p>Debian Open Use Logo(s) er ophavsretligt beskyttede (c) 1999 af + <a href="http://www.spi-inc.org/">Software in the Public Interest, + Inc.</a>, og frigivet under betingelserne i + <a href="http://www.gnu.org/copyleft/lgpl.html">GNU Lesser General Public + License</a>, version 3 eller enhver senere version, eller, valgfrit, under + <a href="http://creativecommons.org/licenses/by-sa/3.0/deed.da">Creative + Commons Attribution-ShareAlike 3.0 Unported License</a> (Creative Commons + Navngivelse-DelPåSammeVilkår 3.0 Unported).</p> + <p>Bemærk: vi ser meget gerne at du lader billedet pege på - http://www.debian.org/ hvis du bruger det på en webside.</p> + <a href="$(HOME)">http://www.debian.org/</a>, hvis du bruger det på en + webside.</p> </td> <td> <openlogotable> |