[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.7-1-4-g51f38dd

Petter Reinholdtsen pere at hungry.com
Fri Jul 29 21:08:08 UTC 2016


The following commit has been merged in the master branch:
commit 51f38dd6e83fa420e00b8ab6f0710692c9234cc9
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Fri Jul 29 23:05:01 2016 +0200

    Updated Danish debconf translation by Joe Hansen.
    
    Closes: #830652

diff --git a/debian/po/da.po b/debian/po/da.po
index 3f08e51..14a6359 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -1,14 +1,14 @@
 # Danish translation zfs-linux.
-# Copyright (C) 2013 zfs-linux og nedenstående oversættere.
+# Copyright (C) 2016 zfs-linux og nedenstående oversættere.
 # This file is distributed under the same license as the zfs-linux package.
-# Joe Hansen <joedalton2 at yahoo.dk>, 2013.
+# Joe Hansen <joedalton2 at yahoo.dk>, 2013, 2016.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: zfs-linux\n"
 "Report-Msgid-Bugs-To: zfs-linux at packages.debian.org\n"
 "POT-Creation-Date: 2015-11-01 14:11+0800\n"
-"PO-Revision-Date: 2013-07-07 06:57+0100\n"
+"PO-Revision-Date: 2016-07-09 06:57+0100\n"
 "Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
 "Language-Team: Danish <debian-l10n-danish at lists.debian.org>\n"
 "Language: da\n"
@@ -66,7 +66,7 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid "Licenses of ZFS and Linux are incompatible"
-msgstr ""
+msgstr "Licenserne for ZFS og Linux er ikke kompatible"
 
 #. Type: note
 #. Description
@@ -79,6 +79,12 @@ msgid ""
 "prevents using pieces of code exclusively available under one license with "
 "pieces of code exclusively available under the other in the same binary."
 msgstr ""
+"ZFS er udgivet under licensen Common Development and Distribution License "
+"(CDDL), og Linuxkernen er udgivet under GNU General Public License Version "
+"2 (GPL-2). Selv om begge er frie åben licenser er de restriktive "
+"licenser. Kombinationen af dem medfører problemer da de forhindrer brug "
+"af kodestumper eksklusivt tilgængelig under en licens med stykker af kode "
+"eksklusivt tilgængelig under den anden i den samme binære."
 
 #. Type: note
 #. Description
@@ -89,3 +95,8 @@ msgid ""
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
+"Du er ved at bygge ZFS via DKMS, hvorved de ikke bliver bygget ind til en "
+"monolitisk binær. Vær opmærksom på at distribution af begge de binære filer "
+"på det samme medie (diskaftryk, virtuelle enheder etc.) kan føre til "
+"en overtrædelse af licenserne."
+

-- 
OpenZFS on Linux



More information about the Pkg-zfsonlinux-devel mailing list