Commit 8be1938d authored by Simon Metzler's avatar Simon Metzler

Small changes to dse

parent ac00bd83
Pipeline #339 passed with stages
in 6 minutes and 12 seconds
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent" android:id="@+id/gridLayout">
......@@ -32,7 +33,8 @@
android:text="@string/dse_page7_feedback_text"
android:layout_width="264dp"
android:layout_height="83dp" android:id="@+id/dse_page7_feedback_text"
android:fontFamily="@font/roboto_light" android:lineSpacingExtra="2sp" android:padding="2dp" android:paddingStart="10dp" android:paddingEnd="10dp"
android:fontFamily="@font/roboto_light" android:lineSpacingExtra="2sp" android:padding="2dp"
android:paddingStart="10dp" android:paddingEnd="10dp"
android:textAlignment="viewStart" tools:layout_conversion_absoluteHeight="207dp"
tools:layout_conversion_absoluteWidth="384dp"
app:layout_constraintStart_toStartOf="parent"
......
......@@ -34,7 +34,7 @@
<string name="dse_page1_decline_popup_title">Unfortunately you cannot play Akamu</string>
<string name="dse_page1_decline_popup_text">Akamu doesn\'t work without your personal data. Read the privacy policy to learn why.</string>
<string name="dse_page1_consent_popup_title">Corresponding Laws</string>
<string name="dse_page1_consent_popup_text">Article 6 paragraph 1 a) DSGVO\nArticle 7 paragraph 1 DSGVO\n§ 13 paragraph 2 and 3 TMG</string>
<string name="dse_page1_consent_popup_text">Article 6 paragraph 1 a) GDPR\nArticle 7 paragraph 1 GDPR\n§ 13 paragraph 2 and 3 TMG</string>
<string name="dse_page2_email_title">We store your <b>email address</b>. Other users <u>cannot</u> see your email address.</string>
<string name="dse_page2_email_question">Why?</string>
......@@ -63,19 +63,19 @@
<string name="dse_page5_title"><b>What you can do</b></string>
<string name="dse_page5_revoke"><b>Revoke</b> your consent <font color="blue"><i>§§</i></font></string>
<string name="dse_page5_revoke_popup_text">Article 7 paragraph 3 DSGVO\n§ 13 paragraph 2 No. 4 TMG</string>
<string name="dse_page5_revoke_popup_text">Article 7 paragraph 3 GDPR\n§ 13 paragraph 2 No. 4 TMG</string>
<string name="dse_page5_information"><b>Request information</b> about what we know about you, what we do with that data where and for how long. <font color="blue"><i>§§</i></font></string>
<string name="dse_page5_information_popup_text">Article 15 DSGVO</string>
<string name="dse_page5_information_popup_text">Article 15 GDPR</string>
<string name="dse_page5_transfer"><b>Transfer of your data</b> to another person responsible. <font color="blue"><i>§§</i></font></string>
<string name="dse_page5_transfer_popup_text">Article 20 DSGVO</string>
<string name="dse_page5_transfer_popup_text">Article 20 GDPR</string>
<string name="dse_page5_correct"><b>Correct</b> your data. <font color="blue"><i>§§</i></font></string>
<string name="dse_page5_correct_popup">Artikel 16 DSGVO</string>
<string name="dse_page5_correct_popup">Artikel 16 GDRP</string>
<string name="dse_page5_restriction"><b>Restriction of data</b>, e.g. the semester information. <font color="blue"><i>§§</i></font></string>
<string name="dse_page5_restriction_popup_text">Article 18</string>
<string name="dse_page5_restriction_popup_text">Article 18 GDPR</string>
<string name="dse_page5_delete"><b>Delete</b> - "Your right to be forgotten" <font color="blue"><i>§§</i></font></string>
<string name="dse_page5_delete_popup_text">Article 17 DSGVO</string>
<string name="dse_page5_delete_popup_text">Article 17 GDPR</string>
<string name="dse_page5_complain"><b>Complain</b> to the competent supervisory authority. <font color="blue"><i>§§</i></font></string>
<string name="dse_page5_complain_popup_text">Article 80 and Article 57 (1) f) DSGVO</string>
<string name="dse_page5_complain_popup_text">Article 80 and Article 57 (1) f) GDPR</string>
<string name="dse_page5_contact">To get more information or exercise your rights send us an email to <b>datenschutz@akamu.de</b></string>
<string name="dse_page6_title"><b>Responsible is</b></string>
......@@ -84,8 +84,8 @@
<string name="dse_page6_change">Akamu reserves the right to <b>change the privacy policy</b> at any time - in compliance with legal requirements. In this case Akamu will inform you immediately.\nYou can always find the privacy policy on <font color="blue">akamu.de/pp</font> or in the app under the menu on the dashboard.</string>
<string name="dse_page7_state">Privacy policy as of <b>November 11, 2018</b>.</string>
<string name="dse_page7_text">Only with <b>your consent</b> to the Privacy Policy we can use your data legitimately. You can <b>revoke</b> your consent at <b>any time</b>.</string>
<string name="dse_page7_popup_text">Article 6 paragraph 1 a) DSGVO\nArticle 7 paragraph 1 DSGVO\n§ 13 paragraph 2 and 3 TMG</string>
<string name="dse_page7_text">Only with <b>your consent</b> to the Privacy Policy we can use your data legitimately. You can <b>revoke</b> your consent at <b>any time</b>. <font color="blue"><i>§§</i></font></string>
<string name="dse_page7_popup_text">Article 6 paragraph 1 a) GDPR\nArticle 7 paragraph 1 GDPR\n§ 13 paragraph 2 and 3 TMG</string>
<string name="dse_page7_accept">I am informed about the privacy policy and agree to it</string>
<string name="dse_page7_decline">I do not want to share my data</string>
<string name="dse_page7_feedback_text">Please help us to improve the presentation of our privacy policy with your feedback.</string>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment