diff --git a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
index 1cf560ba892c45dea63a4fb92728b2e66c49ba0a..acc75b45e1cb712521b03f839a887b199c48c58e 100644
--- a/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
+++ b/language/_____LANGUAGE_EXTRA/_____LANGUAGE_EXTRA.aod
@@ -4809,6 +4809,9 @@
<entry>
<key>External Datasource</key>
</entry>
+ <entry>
+ <key>Guarantee</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
<sqlModels>
diff --git a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
index 1be0f8cc5cd2fad740ffa4c0961ac569b2222041..e77f980bae5c5939b62acb8e2064b4fb7119b4f3 100644
--- a/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
+++ b/language/_____LANGUAGE_de/_____LANGUAGE_de.aod
@@ -28,7 +28,6 @@
</entry>
<entry>
<key>Maximal</key>
- <value></value>
</entry>
<entry>
<key>Sender address</key>
@@ -1032,7 +1031,6 @@
</entry>
<entry>
<key>75 %</key>
- <value></value>
</entry>
<entry>
<key>100 %</key>
@@ -2675,7 +2673,6 @@
</entry>
<entry>
<key>Minimal</key>
- <value></value>
</entry>
<entry>
<key>Vanuatu</key>
@@ -3294,7 +3291,6 @@
</entry>
<entry>
<key>no keyword attribute \"%0\" found in keyword container \"%1\"</key>
- <value></value>
</entry>
<entry>
<key>competitor</key>
@@ -3763,7 +3759,6 @@
</entry>
<entry>
<key>[%0]%1 has to be a string or array but it is %2</key>
- <value></value>
</entry>
<entry>
<key>[%0]has now an incorrect length; estimated 2 elements but got %1</key>
@@ -4184,6 +4179,7 @@
</entry>
<entry>
<key>Valid to</key>
+ <value>Gültig bis</value>
</entry>
<entry>
<key>ZIP regex</key>
@@ -5754,7 +5750,7 @@
</entry>
<entry>
<key>DataPrivacy Use</key>
- <value>DataPrivacy</value>
+ <value>Nutzung</value>
</entry>
<entry>
<key>Bed and Breakfast</key>
@@ -5858,7 +5854,7 @@
</entry>
<entry>
<key>Guarantee</key>
- <value>Garantieen</value>
+ <value>Garantie</value>
</entry>
<entry>
<key>On time</key>
@@ -5980,6 +5976,82 @@
<key>External Datasource</key>
<value>Externe Datenquelle</value>
</entry>
+ <entry>
+ <key>MarketingCampaign</key>
+ </entry>
+ <entry>
+ <key>Nur eigene anzeigen</key>
+ </entry>
+ <entry>
+ <key>Billed</key>
+ </entry>
+ <entry>
+ <key>Km Fee</key>
+ </entry>
+ <entry>
+ <key>Credit Card</key>
+ </entry>
+ <entry>
+ <key>Overnight stay</key>
+ </entry>
+ <entry>
+ <key>In creation</key>
+ </entry>
+ <entry>
+ <key>Es wurden keine Daten anonymisiert.</key>
+ </entry>
+ <entry>
+ <key>Sonstige personenbezogene Daten</key>
+ </entry>
+ <entry>
+ <key>Extension letter date</key>
+ </entry>
+ <entry>
+ <key>Namen</key>
+ </entry>
+ <entry>
+ <key>Update</key>
+ </entry>
+ <entry>
+ <key>Blog</key>
+ </entry>
+ <entry>
+ <key>Special displays</key>
+ </entry>
+ <entry>
+ <key>Guarantees</key>
+ <value>Garantien</value>
+ </entry>
+ <entry>
+ <key>Folgende Daten wurden anonymisiert: </key>
+ </entry>
+ <entry>
+ <key>Fuel</key>
+ </entry>
+ <entry>
+ <key>CC</key>
+ </entry>
+ <entry>
+ <key>Xing</key>
+ </entry>
+ <entry>
+ <key>CampaignManagement</key>
+ </entry>
+ <entry>
+ <key>Km</key>
+ </entry>
+ <entry>
+ <key>Taxi</key>
+ </entry>
+ <entry>
+ <key>LinkedIn</key>
+ </entry>
+ <entry>
+ <key>Kommunikationsdaten</key>
+ </entry>
+ <entry>
+ <key>DSGVO Anonymisierung</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
index 3619ed230b46c568cbd235a2afb9009644ebfd8e..c1aa2d4b41c499a953d0bc9c5db4701ab180cbfd 100644
--- a/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
+++ b/language/_____LANGUAGE_en/_____LANGUAGE_en.aod
@@ -4858,6 +4858,9 @@
<entry>
<key>External Datasource</key>
</entry>
+ <entry>
+ <key>Guarantee</key>
+ </entry>
</keyValueMap>
<font name="Dialog" style="0" size="11" />
</language>
diff --git a/report/DSGVO_Disclosure_Report/DSGVO_Disclosure_Report.aod b/report/DSGVO_Disclosure_Report/DSGVO_Disclosure_Report.aod
index f506dbb372ad070f5bac8bcd40aa3ea9f099f534..56597ba51120a8c88f6df3d85e6104dd2cb2a1e9 100644
--- a/report/DSGVO_Disclosure_Report/DSGVO_Disclosure_Report.aod
+++ b/report/DSGVO_Disclosure_Report/DSGVO_Disclosure_Report.aod
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.2.0">
<name>DSGVO_Disclosure_report</name>
- <title>DSGVO Disclosure</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<reportData>%aditoprj%/report/DSGVO_Disclosure_report/reportData.jrxml</reportData>
<reportType>JASPER</reportType>
diff --git a/report/DSGVO_Disclosure_Report/DSGVO_Disclosure_report.aod b/report/DSGVO_Disclosure_Report/DSGVO_Disclosure_report.aod
index f506dbb372ad070f5bac8bcd40aa3ea9f099f534..56597ba51120a8c88f6df3d85e6104dd2cb2a1e9 100644
--- a/report/DSGVO_Disclosure_Report/DSGVO_Disclosure_report.aod
+++ b/report/DSGVO_Disclosure_Report/DSGVO_Disclosure_report.aod
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.2.0">
<name>DSGVO_Disclosure_report</name>
- <title>DSGVO Disclosure</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<reportData>%aditoprj%/report/DSGVO_Disclosure_report/reportData.jrxml</reportData>
<reportType>JASPER</reportType>
diff --git a/report/DSGVO_Disclosure_report/DSGVO_Disclosure_report.aod b/report/DSGVO_Disclosure_report/DSGVO_Disclosure_report.aod
index f506dbb372ad070f5bac8bcd40aa3ea9f099f534..56597ba51120a8c88f6df3d85e6104dd2cb2a1e9 100644
--- a/report/DSGVO_Disclosure_report/DSGVO_Disclosure_report.aod
+++ b/report/DSGVO_Disclosure_report/DSGVO_Disclosure_report.aod
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<report xmlns="http://www.adito.de/2018/ao/Model" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" VERSION="1.2.0" xsi:schemaLocation="http://www.adito.de/2018/ao/Model adito://models/xsd/report/1.2.0">
<name>DSGVO_Disclosure_report</name>
- <title>DSGVO Disclosure</title>
<majorModelMode>DISTRIBUTED</majorModelMode>
<reportData>%aditoprj%/report/DSGVO_Disclosure_report/reportData.jrxml</reportData>
<reportType>JASPER</reportType>
diff --git a/report/DSGVO_Information_report/reportData.jrxml b/report/DSGVO_Information_report/reportData.jrxml
index ec7c1c3b10fe0009ed1de95d042990778d97d464..53cbafcb19d9fa5cfc285fd5106b6c755192c887 100644
--- a/report/DSGVO_Information_report/reportData.jrxml
+++ b/report/DSGVO_Information_report/reportData.jrxml
@@ -2,7 +2,7 @@
<jasperReport xmlns="http://jasperreports.sourceforge.net/jasperreports" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://jasperreports.sourceforge.net/jasperreports http://jasperreports.sourceforge.net/xsd/jasperreport.xsd" name="DSGVO Information" pageWidth="595" pageHeight="842" whenNoDataType="AllSectionsNoDetail" columnWidth="555" leftMargin="20" rightMargin="20" topMargin="20" bottomMargin="20" uuid="e7a916c8-3f9a-497d-84bb-3909b15271ea">
<property name="ireport.zoom" value="1.5"/>
<property name="ireport.x" value="0"/>
- <property name="ireport.y" value="0"/>
+ <property name="ireport.y" value="144"/>
<parameter name="adito.image.myLogo" class="java.lang.String"/>
<parameter name="myAddress" class="java.lang.String"/>
<parameter name="address" class="java.lang.String"/>
@@ -72,7 +72,7 @@
<text><![CDATA[Zweck und Rechtsgrundlagen der Verarbeitung:]]></text>
</staticText>
<textField>
- <reportElement x="0" y="304" width="553" height="55" uuid="d545be0e-6684-4388-96b7-d6020f9d55d4"/>
+ <reportElement positionType="Float" stretchType="RelativeToBandHeight" x="0" y="304" width="553" height="55" uuid="d545be0e-6684-4388-96b7-d6020f9d55d4"/>
<textFieldExpression><![CDATA[$P{dataProtectionOfficer}]]></textFieldExpression>
</textField>
</band>