[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. debian/0.6.5.8-3-55-gab6f41b

Tue Oct 31 12:32:45 UTC 2017

The following commit has been merged in the master branch:
commit c85aa4ce119bff9f4d1584fbb4d1534c8cb3634a
Author: Antonio Russo <antonio.e.russo at gmail.com>
Date:   Mon Oct 23 22:32:30 2017 -0400

    Fix typo in debconf templates

diff --git a/debian/po/cs.po b/debian/po/cs.po
index 6995d10..9cb9443 100644
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -85,8 +85,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/po/da.po b/debian/po/da.po
index 14a6359..f1f3cd0 100644
--- a/debian/po/da.po
+++ b/debian/po/da.po
@@ -90,8 +90,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/po/de.po b/debian/po/de.po
index be6322f..2109e69 100644
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -92,8 +92,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/po/fr.po b/debian/po/fr.po
index 84f6f97..1bad17c 100644
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -86,8 +86,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/po/it.po b/debian/po/it.po
index 86b9ca1..26a6bd5 100644
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -94,8 +94,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/po/ja.po b/debian/po/ja.po
index ff42d29..36b3c76 100644
--- a/debian/po/ja.po
+++ b/debian/po/ja.po
@@ -85,8 +85,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/po/nb.po b/debian/po/nb.po
index c01c496..0b79bf2 100644
--- a/debian/po/nb.po
+++ b/debian/po/nb.po
@@ -96,8 +96,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/po/nl.po b/debian/po/nl.po
index 9353d84..0c58eff 100644
--- a/debian/po/nl.po
+++ b/debian/po/nl.po
@@ -97,8 +97,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/po/pl.po b/debian/po/pl.po
index a74e64c..1614dca 100644
--- a/debian/po/pl.po
+++ b/debian/po/pl.po
@@ -87,8 +87,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/po/pt.po b/debian/po/pt.po
index 443f248..5fcca3c 100644
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -84,7 +84,7 @@ msgid ""
 "pieces of code exclusively available under the other in the same binary."
 msgstr ""
 "O ZFS está licenciado sobre a Common Development and Distribution License "
-"(CDDL),enquanto que o kernel do Linux está sobre a GNU General Public "
+"(CDDL), enquanto que o kernel do Linux está sobre a GNU General Public "
 "License Version 2 (GPL-2). Apesar de ambas serem licenças de open source "
 "livres, são ambas restritivas. A combinação de ambas pode causar problemas "
 "pois impedem o uso exclusivo de partes de código disponíveis para uma "
@@ -95,8 +95,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/po/ru.po b/debian/po/ru.po
index 9c40253..c6049c8 100644
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -86,8 +86,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/po/sv.po b/debian/po/sv.po
index 1fa7da9..a5f5096 100644
--- a/debian/po/sv.po
+++ b/debian/po/sv.po
@@ -86,8 +86,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 8317333..8715773 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -78,8 +78,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/po/zh_CN.po b/debian/po/zh_CN.po
index 8f8e150..af3a67c 100644
--- a/debian/po/zh_CN.po
+++ b/debian/po/zh_CN.po
@@ -85,8 +85,8 @@ msgstr ""
 #. Description
 #: ../zfs-dkms.templates:3001
 msgid ""
-"You are going to build ZFS using DKMS in which way they are not going to be "
-"built into one monolithic binary. Please be aware that distributing both of "
+"You are going to build ZFS using DKMS in such a way that they are not going to "
+"be built into one monolithic binary. Please be aware that distributing both of "
 "the binaries in the same media (disk images, virtual appliances, etc) may "
 "lead to infringing."
 msgstr ""
diff --git a/debian/zfs-dkms.templates b/debian/zfs-dkms.templates
index 475fb66..b5f35a7 100644
--- a/debian/zfs-dkms.templates
+++ b/debian/zfs-dkms.templates
@@ -34,6 +34,7 @@ _Description: Licenses of ZFS and Linux are incompatible
  pieces of code exclusively available under one license with pieces of code
  exclusively available under the other in the same binary. 
  .
- You are going to build ZFS using DKMS in which way they are not going to be built
- into one monolithic binary. Please be aware that distributing both of the binaries
- in the same media (disk images, virtual appliances, etc) may lead to infringing.
+ You are going to build ZFS using DKMS in such a way that they are not going to
+ be built into one monolithic binary. Please be aware that distributing both of
+ the binaries in the same media (disk images, virtual appliances, etc) may
+ lead to infringing.

-- 
UNNAMED PROJECT

