From cdc405307613eae1ef30b19e417faf27d6aee4a5 Mon Sep 17 00:00:00 2001
From: Sarah Vaupel <vaupel.sarah@campus.lmu.de>
Date: Wed, 18 Dec 2019 19:21:03 +0100
Subject: [PATCH] feat(legal): fix translations and links

---
 templates/i18n/data-protection/en.hamlet   | 218 +++++++++++----------
 templates/i18n/imprint/de-de-formal.hamlet |   8 +-
 templates/i18n/imprint/en.hamlet           |  78 ++++++++
 3 files changed, 194 insertions(+), 110 deletions(-)

diff --git a/templates/i18n/data-protection/en.hamlet b/templates/i18n/data-protection/en.hamlet
index b1e4c7da0..84198f4dc 100644
--- a/templates/i18n/data-protection/en.hamlet
+++ b/templates/i18n/data-protection/en.hamlet
@@ -1,76 +1,82 @@
 $newline never
-<section>
-  <h2>Last changed 19.02.2019
-  <p>
-    The LMU as a corporate body of public law is subject to #
-    the BayDSG (bavarian legislation on data-protection), in some points the BDSG (Federal Data Protection Act), #
-    the GDPR (General Data Protection Regulation), and the corresponding articles of special laws (Telemedia, Telecommunication, Employment Law, etc.) relevant to data protection.<br />
-    This data privacy statement fulfills the obligations to inform the user as result from the formalities mentioned above.
+<i>Last changed: 18.12.2019
+
+<p>
+  The following data protection statement extends the #
+  <a href="https://www.rz.ifi.lmu.de/datenschutz_en.html">Data Protection Statement of the Rechnerbetriebsgruppe (RBG) of the LMU</a> #
+  , Version 0.91 from 22.05.2018.<br>
+  Should the Data Protection Statement linked above be newer than the Statement on this page, #
+  the version of the RBG has higher priority than this version in case of conflicting information.
+
+<p>
+  The LMU as a corporate body of public law is subject to #
+  the BayDSG (bavarian legislation on data-protection), in some points the BDSG (Federal Data Protection Act), #
+  the GDPR (General Data Protection Regulation), and the corresponding articles of special laws (Telemedia, Telecommunication, Employment Law, etc.) relevant to data protection.<br />
+  This data privacy statement fulfills the obligations to inform the user as result from the formalities mentioned above.
+
+<h3>Contact
+<h4>Data Protection Official of the LMU Munich
+<ul style="list-style-type: none">
+  <li>Dr. Rolf Gemmeke
+  <li>Geschwister-Scholl-Platz 1, 80539 München
+  <li>Telefon: +49 (0) 89 2180-2414
+  <li>
+    <a href="http://www.uni-muenchen.de/einrichtungen/orga_lmu/beauftragte/dschutz/index.html">
+      Website of the data protection official of the LMU
+
+<h4>Supervisory body for data protection in the public sector
+<ul style="list-style-type: none">
+  <li>Bayerischer Landesbeauftragter für den Datenschutz
+  <li>Promenade 27
+  <li>91522 Ansbach
+  <li>Telefon: +49 (0) 981 53 1300
+  <li>
+    <a href="http://www.datenschutz-bayern.de/">
+      Website of the bavarian Data Protection Commissioner
+
+<h4> Data Protection Coordinator of the department Institut für Informatik of the LMU
+<ul style="list-style-type: none">
+  <li>Robert Hofer
+  <li>E-Mail: ^{mailtoHtml "dsk@ifi.lmu.de"}
+  <li>Telefon: +49 (0) 89 / 2180 - 9198
+
+<h4>Legal person responsible for data processing
+<ul style="list-style-type: none">
+  <li>Ludwig-Maximilians-Universität München
+  <li>Geschwister-Scholl-Platz 1
+  <li>80539 München
+  <li>Telefon: +49 (0) 89 / 2180 - 0
+  <li>E-Mail: ^{mailtoHtml "praesidium@lmu.de"}
+  <li>
+    <p>
+      The LMU Munich is a corporate body of the public law.<br>
+      It is legally represented by its president, Prof. Dr. Bernd Huber.
+
+    <h5>Responsible department
+    <ul style="list-style-type: none">
+      <li> IT Operations Team (RBG) of the department Institut für Informatik of the LMU Munich
+      <li>Oettingenstraße 67
+      <li>D-80538 München
+      <li>E-Mail: ^{mailtoHtml "rbg@ifi.lmu.de"}
+      <li>Tel.: +49 (0) 89 / 2180 - 9198
 
 
-<section>
-  <h2>Contact
-  <h3>Data Protection Official of the LMU Munich
-  <ul style="list-style-type: none">
-    <li>Dr. Rolf Gemmeke
-    <li>Geschwister-Scholl-Platz 1, 80539 München
-    <li>Telefon: +49 (0) 89 2180-2414
-    <li>
-      <a href="http://www.uni-muenchen.de/einrichtungen/orga_lmu/beauftragte/dschutz/index.html">
-        Website of the data protection official of the LMU
+<h3>Processing of Personal Data
 
-  <h3>Supervisory body for data protection in the public sector
-  <ul style="list-style-type: none">
-    <li>Bayerischer Landesbeauftragter für den Datenschutz
-    <li>Promenade 27
-    <li>91522 Ansbach
-    <li>Telefon: +49 (0) 981 53 1300
-    <li>
-      <a href="http://www.datenschutz-bayern.de/">
-        Website of the bavarian Data Protection Commissioner
+<p>
+  The IT service and organization at the department Institut für Informatik follows #
+  the state of the art and best practices regarding security and IT operations.<br />
+  The protection of personal data as well as the sustainable operation of services #
+  in the scope of their possibilities is therefore guaranteed.
 
-  <h3> Data Protection Coordinator of the department Institut für Informatik of the LMU
-  <ul style="list-style-type: none">
-    <li>Robert Hofer
-    <li>E-Mail: ^{mailtoHtml "dsk@ifi.lmu.de"}
-    <li>Telefon: +49 (0) 89 / 2180 - 9198
-
-  <h3>Legal person responsible for data processing
-  <ul style="list-style-type: none">
-    <li>Ludwig-Maximilians-Universität München
-    <li>Geschwister-Scholl-Platz 1
-    <li>80539 München
-    <li>Telefon: +49 (0) 89 / 2180 - 0
-    <li>E-Mail: ^{mailtoHtml "praesidium@lmu.de"}
-    <li>
-      <p>
-        The LMU Munich is a corporate body of the public law.<br />
-        It is legally represented by its president, Prof. Dr. Bernd Huber.
-
-      <h4>Responsible department
-      <ul style="list-style-type: none">
-        <li> IT Operations Team (RBG) of the department Institut für Informatik of the LMU Munich
-        <li>Oettingenstraße 67
-        <li>D-80538 München
-        <li>E-Mail: ^{mailtoHtml "rbg@ifi.lmu.de"}
-        <li>Tel.: +49 (0) 89 / 2180 - 9198
-
-<section>
-  <h2>Processing of Personal Data
-  <p>
-    The IT service and organization at the department Institut für Informatik follows #
-    the state of the art and best practices regarding security and IT operations.<br />
-    The protection of personal data as well as the sustainable operation of services #
-    in the scope of their possibilities is therefore guaranteed.
-
-  <h3>1. Webserver protocol
-
-  <h4>Data subjects
+<h4>1. Webserver protocol
 
+<h5>Data subjects
+<p>
   Every user of this webserver is affected by the acquisition and processing of the data.
 
-  <h4>Which data is acquired
-
+<h5>Which data is acquired
+<p>
   The webserver records
   <ul>
     <li> Pseudonym corresponding to the IP address of the user's webclient
@@ -81,54 +87,54 @@ $newline never
     <li> Type and version of the webclient
     <li> Error messages if applicable
     <li> Text of any search, filter, or sorting parameter as applicable
-  <p>
-    In case of a disturbance or security incident, the pseudonymisation of the IP address will be #
-    temporarily suspended.
-  <p>
-    ipscrub (<a href="http://www.ipscrub.org">http://www.ipscrub.org</a>) is used to generate pseudonyms for IP addresses.
+<p>
+  In case of a disturbance or security incident, the pseudonymisation of the IP address will be #
+  temporarily suspended.
+<p>
+  ipscrub (<a href="http://www.ipscrub.org">http://www.ipscrub.org</a>) is used to generate pseudonyms #
+  for IP addresses.
 
+<h5>Appropriation
+<p>
+  The collected data is only used for statistical analysis (in anonymised form), for enhancing Uni2work, #
+  for analysis, elimination and protection against disturbances, and in case of security incidents.<br />
+  Only the IT administrators responsible for the operation of the department Institut für Informatik #
+  have access to the data.
 
-  <h4>Appropriation
-  <p>
-    The collected data is only used for statistical analysis (in anonymised form), for enhancing Uni2work, #
-    for analysis, elimination and protection against disturbances, and in case of security incidents.<br />
-    Only the IT administrators responsible for the operation of the department Institut für Informatik #
-    have access to the data.
+<h5> Legal or Contractual Basis of Data Processing
+<ul>
+  <li> Obligation to sustainable and secure operation of IT services according to the state of the art (TMG, TKG, DSG, EUDGV, BayDSG, BDSG)
+  <li> Legislation pertaining to the retention period and type of webserver protocols
+  <li> Performing of a function that is of public interest
 
-  <h4> Legal or Contractual Basis of Data Processing
-  <ul>
-    <li> Obligation to sustainable and secure operation of IT services according to the state of the art (TMG, TKG, DSG, EUDGV, BayDSG, BDSG)
-    <li> Legislation pertaining to the retention period and type of webserver protocols
-    <li> Performing of a function that is of public interest
+<h5> Disclosure
+<p> First point of contact is the above-mentioned responsible department.
 
-  <h4> Disclosure
-  <p> First point of contact is the above-mentioned responsible department.
+<h5> Deletion
+<p>
+  Entries of the webserver protocol will be automatically deleted after seven days.<br />
+  Data that is processed due to a disturbance or a security incident will be deleted after the incident 
+  has been concluded.
 
-  <h4> Deletion
-  <p>
-    Entries of the webserver protocol will be automatically deleted after seven days.<br />
-    Data that is processed due to a disturbance or a security incident will be deleted after the incident 
-    has been concluded.
+<h5> Consent, Correction, Revocation, Request for Deletion or Transmission
+<p>
+  Consent is not required for the processing of the data due to the type of the collected data, its designated use, #
+  the automated deletion and the basis of the collection (GDPR, Art. 6 Para. 1 e+f).<br />
+  The right of withdrawal for data processing, the right of petition for deletion, the right of petition #
+  for correction, and the right of petition for transmission are not applicable due to the consent to data processing #
+  not being necessary as well as the type and use of the collected data.
 
-  <h4> Consent, Correction, Revocation, Request for Deletion or Transmission
-  <p>
-    Consent is not required for the processing of the data due to the type of the collected data, its designated use, #
-    the automated deletion and the basis of the collection (GDPR, Art. 6 Para. 1 e+f).<br />
-    The right of withdrawal for data processing, the right of petition for deletion, the right of petition #
-    for correction, and the right of petition for transmission are not applicable due to the consent to data processing #
-    not being necessary as well as the type and use of the collected data.
+<h5> Right to appeal
+<p>
+  Users generally have the right to appeal to the supervisory body concerning any processing or transmission #
+  of their personal data.<br>
+  In case of the LMU Munich, the supervisory body is the above-mentioned Bavarian Data Protection Commissioner.<br>
+  Apart from that, any other above-mentioned legal contact person may be contacted concerning appeals and inquiries.
 
-  <h4> Right to appeal
-  <p>
-    Users generally have the right to appeal to the supervisory body concerning any processing or transmission #
-    of their personal data.<br />
-    In case of the LMU Munich, the supervisory body is the above-mentioned Bavarian Data Protection Commissioner.<br />
-    Apart from that, any other above-mentioned legal contact person may be contacted concerning appeals and inquiries.
-
-  <h4> Obligation to participate in the processing of the data
-  <p>
-    The user is obligated to provide the data and allow its processing when using this service.<br />
-    We reserve the right to exclude users from the service who do not provide the data.
+<h5> Obligation to participate in the processing of the data
+<p>
+  The user is obligated to provide the data and allow its processing when using this service.<br>
+  We reserve the right to exclude users from the service who do not provide the data.
 
 $# <!-- CONTINUED -->
 $#
diff --git a/templates/i18n/imprint/de-de-formal.hamlet b/templates/i18n/imprint/de-de-formal.hamlet
index e1cff3d44..fbcb8a89b 100644
--- a/templates/i18n/imprint/de-de-formal.hamlet
+++ b/templates/i18n/imprint/de-de-formal.hamlet
@@ -17,8 +17,8 @@ $newline never
   <li>D-80538 München
   <li>E-Mail: ^{mailtoHtml "rbg@ifi.lmu.de"}
   <li>Web: #
-    <a href="https://www.rz.ifi.lmu.de/rbg/">
-      https://www.rz.ifi.lmu.de/rbg/
+    <a href="https://www.rz.ifi.lmu.de/">
+      https://www.rz.ifi.lmu.de/
   <li>Telefon: +49 (0) 89 / 2180 - 9198
 
 
@@ -30,8 +30,8 @@ $newline never
   <li>D-80538 München
   <li>E-Mail: ^{mailtoHtml "rbg@ifi.lmu.de"}
   <li>Web: #
-    <a href="https://www.rz.ifi.lmu.de/rbg/">
-      https://www.rz.ifi.lmu.de/rbg/
+    <a href="https://www.rz.ifi.lmu.de/">
+      https://www.rz.ifi.lmu.de/
   <li>Telefon: +49 (0) 89 / 2180 - 9198
 <p>
   Die Rechnerbetriebgruppe ist eine Organisation des Department "Institut für Informatik", #
diff --git a/templates/i18n/imprint/en.hamlet b/templates/i18n/imprint/en.hamlet
index d9dfa33f9..0d6e61564 100644
--- a/templates/i18n/imprint/en.hamlet
+++ b/templates/i18n/imprint/en.hamlet
@@ -1 +1,79 @@
 $newline never
+<h3>Contact
+
+<h4>Contents
+<ul style="list-style-type: none">
+  <li>Gregor Kleen
+  <li>Oettingenstraße 67
+  <li>D-80538 München (Germany)
+  <li>E-Mail: ^{mailtoHtml "gregor.kleen@tcs.ifi.lmu.de"}
+  <li>Telefon: +49 (0) 89 / 2180 - 9139
+
+<h4>Youth Protection
+<ul style="list-style-type: none">
+  <li>Robert Hofer
+  <li>Leader IT Operations Team (RBG)
+  <li>Oettingenstraße 67
+  <li>D-80538 München (Germany)
+  <li>E-Mail: ^{mailtoHtml "rbg@ifi.lmu.de"}
+  <li>Web: #
+    <a href="https://www.rz.ifi.lmu.de/">
+      https://www.rz.ifi.lmu.de/
+  <li>Telefon: +49 (0) 89 / 2180 - 9198
+
+
+<h3>Address
+
+<h4> IT Operations Team of the Department "Institut für Informatik" of the LMU Munich
+<ul style="list-style-type: none">
+  <li>Oettingenstraße 67
+  <li>D-80538 München (Germany)
+  <li>E-Mail: ^{mailtoHtml "rbg@ifi.lmu.de"}
+  <li>Web: #
+    <a href="https://www.rz.ifi.lmu.de/">
+      https://www.rz.ifi.lmu.de/
+  <li>Telefon: +49 (0) 89 / 2180 - 9198
+<p>
+  The IT Operations Team (RBG) is an organization of the department Institut für Informatik, #
+  which is part of the LMU Munich.<br>
+  The IT Operations Team is represented by its leader and is subject to supervision by the #
+  IT commissary of the directorate of the department.
+
+<h4>Department "Institut für Informatik" of the LMU Munich
+<ul style="list-style-type: none">
+  <li>Oettingenstraße 67
+  <li>D-80538 München (Germany)
+  <li>Telefon: +49 (0) 89 / 2180 - 9141
+  <li>E-Mail: ^{mailtoHtml "geschaeftsstelle@ifi.lmu.de"}
+  <li>Web: #
+    <a href="https://www.ifi.lmu.de/">
+      https://www.ifi.lmu.de/
+<p>
+  The department Institut für Informatik is a part of the LMU Munich.<br>
+  The department is represented by its director.
+
+<h4>LMU - Ludwig-Maximilians-Universität München
+<ul style="list-style-type: none">
+  <li>Geschwister-Scholl-Platz 1
+  <li>D-80539 München (Germany)
+  <li>Telefon: +49 (0) 89 / 2180 - 0
+  <li>E-Mail: ^{mailtoHtml "praesidium@lmu.de"}
+  <li>Web: #
+    <a href="https://www.lmu.de/">
+      https://www.lmu.de/
+<p>
+  The LMU Munich is a corporate body of public law.<br>
+  It is legally represented by its president.
+
+
+<h3>VAT ID of the LMU
+
+<p>
+  VAT ID as per § 27 a Umsatzsteuergesetz: DE 811205325
+
+
+<h3>Responsible Supervisory Body
+
+<p>
+  Bayerisches Staatsministerium für Bildung und Kultus, Wissenschaft und Kunst<br>
+  80327 München (Germany)