From bfa5d299dd3082327b98b12cdfc0d130b40ffed1 Mon Sep 17 00:00:00 2001
From: marcmuschko <marc.muschko@sap.com>
Date: Thu, 4 Jun 2020 15:47:26 +0200
Subject: [PATCH] Small design / layout adjustments, translatable support
 number / FAQ link (#163)

* added translatable website for FAQ and technical contact

* final strings for main overview added

* added spacing to scroll views to bottom buttons / guidelines

* restrucured app information menu order

* fixed missing text in app information, added divider to contact page

* text style adjustment onboarding

* text style adjustment app information menu and main overview risk list
---
 .../de/rki/coronawarnapp/ui/UiConstants.kt    |  8 ---
 .../information/InformationContactFragment.kt |  9 ++-
 .../ui/information/InformationFragment.kt     |  4 +-
 .../rki/coronawarnapp/ui/main/MainFragment.kt |  3 +-
 .../main/res/layout/fragment_information.xml  | 24 +++----
 .../res/layout/fragment_information_about.xml |  2 +-
 .../layout/fragment_information_contact.xml   | 13 +++-
 .../main/res/layout/fragment_main_share.xml   |  1 +
 .../main/res/layout/fragment_onboarding.xml   |  1 +
 .../fragment_onboarding_notifications.xml     |  1 +
 .../layout/fragment_onboarding_privacy.xml    |  1 +
 .../res/layout/fragment_onboarding_test.xml   |  1 +
 .../layout/fragment_onboarding_tracing.xml    |  1 +
 .../main/res/layout/fragment_risk_details.xml |  1 +
 .../main/res/layout/include_onboarding.xml    |  2 +-
 .../src/main/res/layout/include_row.xml       |  2 +-
 .../src/main/res/values/strings.xml           | 62 +++++++++++++------
 17 files changed, 88 insertions(+), 48 deletions(-)
 delete mode 100644 Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/UiConstants.kt

diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/UiConstants.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/UiConstants.kt
deleted file mode 100644
index 4179af0c1..000000000
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/UiConstants.kt
+++ /dev/null
@@ -1,8 +0,0 @@
-package de.rki.coronawarnapp.ui
-
-object UiConstants {
-    const val INFORMATION_URI = "https://www.bundesregierung.de/c19app-intern"
-
-    // todo move to strings if translatable is needed? if yes include regex in CallHelper to filter non-numerical chars excluding '+'
-    const val TECHNICAL_HOTLINE = "tel:+49 800 7540001"
-}
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationContactFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationContactFragment.kt
index 3f0c11ba0..3da4c84a6 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationContactFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationContactFragment.kt
@@ -4,9 +4,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.FragmentInformationContactBinding
 import de.rki.coronawarnapp.ui.BaseFragment
-import de.rki.coronawarnapp.ui.UiConstants
 import de.rki.coronawarnapp.ui.main.MainActivity
 import de.rki.coronawarnapp.util.CallHelper
 
@@ -38,7 +38,12 @@ class InformationContactFragment : BaseFragment() {
             (activity as MainActivity).goBack()
         }
         binding.informationContactNavigationRowPhone.navigationRow.setOnClickListener {
-            CallHelper.call(this, UiConstants.TECHNICAL_HOTLINE)
+            CallHelper.call(
+                this,
+                requireContext().getString(
+                    R.string.information_contact_phone_call_number
+                )
+            )
         }
     }
 }
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt
index befc5d4ef..76866d570 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/information/InformationFragment.kt
@@ -4,9 +4,9 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import de.rki.coronawarnapp.R
 import de.rki.coronawarnapp.databinding.FragmentInformationBinding
 import de.rki.coronawarnapp.ui.BaseFragment
-import de.rki.coronawarnapp.ui.UiConstants
 import de.rki.coronawarnapp.ui.main.MainActivity
 import de.rki.coronawarnapp.util.OpenUrlHelper
 
@@ -55,7 +55,7 @@ class InformationFragment : BaseFragment() {
             )
         }
         binding.informationHelp.mainRow.setOnClickListener {
-            OpenUrlHelper.navigate(this, UiConstants.INFORMATION_URI)
+            OpenUrlHelper.navigate(this, requireContext().getString(R.string.main_about_link))
         }
         binding.informationLegal.mainRow.setOnClickListener {
             doNavigate(
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
index 917504354..30cef5f1b 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/ui/main/MainFragment.kt
@@ -14,7 +14,6 @@ import de.rki.coronawarnapp.databinding.FragmentMainBinding
 import de.rki.coronawarnapp.notification.NotificationHelper
 import de.rki.coronawarnapp.timer.TimerHelper
 import de.rki.coronawarnapp.ui.BaseFragment
-import de.rki.coronawarnapp.ui.UiConstants
 import de.rki.coronawarnapp.ui.viewmodel.SettingsViewModel
 import de.rki.coronawarnapp.ui.viewmodel.SubmissionViewModel
 import de.rki.coronawarnapp.ui.viewmodel.TracingViewModel
@@ -108,7 +107,7 @@ class MainFragment : BaseFragment() {
             doNavigate(MainFragmentDirections.actionMainFragmentToSettingsTracingFragment())
         }
         binding.mainAbout.mainCard.setOnClickListener {
-            OpenUrlHelper.navigate(this, UiConstants.INFORMATION_URI)
+            OpenUrlHelper.navigate(this, requireContext().getString(R.string.main_about_link))
         }
         binding.mainHeaderShare.buttonIcon.setOnClickListener {
             doNavigate(MainFragmentDirections.actionMainFragmentToMainSharingFragment())
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information.xml b/Corona-Warn-App/src/main/res/layout/fragment_information.xml
index 777b2aee4..5c8d871ef 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information.xml
@@ -50,14 +50,14 @@
                     app:title="@{@string/information_about_title}" />
 
                 <include
-                    android:id="@+id/information_privacy"
+                    android:id="@+id/information_help"
                     layout="@layout/include_row"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/information_about"
-                    app:title="@{@string/information_privacy_title}" />
+                    app:title="@{@string/information_help_title}" />
 
                 <include
                     android:id="@+id/information_terms"
@@ -66,38 +66,38 @@
                     android:layout_height="wrap_content"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/information_privacy"
+                    app:layout_constraintTop_toBottomOf="@+id/information_help"
                     app:title="@{@string/information_terms_title}" />
 
                 <include
-                    android:id="@+id/information_contact"
+                    android:id="@+id/information_privacy"
                     layout="@layout/include_row"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/information_terms"
-                    app:title="@{@string/information_contact_title}" />
+                    app:title="@{@string/information_privacy_title}" />
 
                 <include
-                    android:id="@+id/information_help"
+                    android:id="@+id/information_technical"
                     layout="@layout/include_row"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/information_contact"
-                    app:title="@{@string/information_help_title}" />
+                    app:layout_constraintTop_toBottomOf="@+id/information_privacy"
+                    app:title="@{@string/information_technical_title}" />
 
                 <include
-                    android:id="@+id/information_technical"
+                    android:id="@+id/information_contact"
                     layout="@layout/include_row"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/information_help"
-                    app:title="@{@string/information_technical_title}" />
+                    app:layout_constraintTop_toBottomOf="@+id/information_technical"
+                    app:title="@{@string/information_contact_title}" />
 
                 <include
                     android:id="@+id/information_legal"
@@ -106,7 +106,7 @@
                     android:layout_height="wrap_content"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/information_technical"
+                    app:layout_constraintTop_toBottomOf="@+id/information_contact"
                     app:title="@{@string/information_legal_title}" />
 
                 <TextView
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
index 66c542935..155009e57 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_about.xml
@@ -45,7 +45,7 @@
 
                 <TextView
                     android:id="@+id/information_about_body_emphasized"
-                    style="@style/textMultilineEmphasized"
+                    style="@style/textMultiline"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginTop="@dimen/spacing_small"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml
index 69814d93f..54f232162 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_contact.xml
@@ -37,12 +37,23 @@
                     layout="@layout/include_information_details"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    app:body="@{@string/information_contact_body}"
                     app:headline="@{@string/information_contact_headline}"
                     app:illustration="@{@drawable/ic_information_illustration_contact}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
 
+                <include
+                    android:id="@+id/divider"
+                    layout="@layout/include_divider"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/spacing_normal"
+                    app:layout_constraintEnd_toEndOf="@+id/guideline_end"
+                    app:layout_constraintStart_toStartOf="@id/guideline_start"
+                    app:layout_constraintTop_toBottomOf="@+id/information_contact_header_details" />
+
                 <TextView
                     android:id="@+id/information_contact_subtitle_phone"
                     style="@style/textLargeEmphasized"
@@ -52,7 +63,7 @@
                     android:text="@string/information_contact_subtitle_phone"
                     app:layout_constraintEnd_toStartOf="@+id/guideline_end"
                     app:layout_constraintStart_toEndOf="@+id/guideline_start"
-                    app:layout_constraintTop_toBottomOf="@+id/information_contact_header_details" />
+                    app:layout_constraintTop_toBottomOf="@+id/divider" />
 
                 <include
                     android:id="@+id/information_contact_navigation_row_phone"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_main_share.xml b/Corona-Warn-App/src/main/res/layout/fragment_main_share.xml
index e9d8c18f5..d364e5d2a 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_main_share.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_main_share.xml
@@ -30,6 +30,7 @@
             style="@style/fadingScrollView"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginBottom="@dimen/spacing_normal"
             android:fillViewport="true"
             app:layout_constraintBottom_toTopOf="@+id/main_share_button"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml
index bcb443501..9fe27530d 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding.xml
@@ -13,6 +13,7 @@
             layout="@layout/include_onboarding"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginBottom="@dimen/spacing_normal"
             app:body="@{@string/onboarding_body}"
             app:bodyEmphasized="@{@string/onboarding_body_emphasized}"
             app:headline="@{@string/onboarding_headline}"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_notifications.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_notifications.xml
index e49dd7f0d..dcad119a2 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_notifications.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_notifications.xml
@@ -20,6 +20,7 @@
             layout="@layout/include_onboarding"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginBottom="@dimen/spacing_normal"
             app:body="@{@string/onboarding_notifications_body}"
             app:headline="@{@string/onboarding_notifications_headline}"
             app:illustration="@{@drawable/ic_onboarding_illustration_notification}"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_privacy.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_privacy.xml
index 142abe258..8cc273636 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_privacy.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_privacy.xml
@@ -20,6 +20,7 @@
             layout="@layout/include_onboarding"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginBottom="@dimen/spacing_normal"
             app:body="@{@string/onboarding_privacy_body}"
             app:bodyEmphasized="@{@string/onboarding_privacy_body_emphasized}"
             app:headline="@{@string/onboarding_privacy_headline}"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_test.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_test.xml
index 7320e3241..13f45ca11 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_test.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_test.xml
@@ -20,6 +20,7 @@
             layout="@layout/include_onboarding"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginBottom="@dimen/spacing_normal"
             app:body="@{@string/onboarding_test_body}"
             app:headline="@{@string/onboarding_test_headline}"
             app:illustration="@{@drawable/ic_onboarding_illustration_test}"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_tracing.xml b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_tracing.xml
index cb906cfba..a8a4f608b 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_onboarding_tracing.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_onboarding_tracing.xml
@@ -20,6 +20,7 @@
             layout="@layout/include_onboarding"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginBottom="@dimen/spacing_normal"
             app:body="@{@string/onboarding_tracing_body}"
             app:bodyEmphasized="@{@string/onboarding_tracing_body_emphasized}"
             app:headline="@{@string/onboarding_tracing_headline}"
diff --git a/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml b/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
index 658a2059d..aa31ef4b5 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_risk_details.xml
@@ -28,6 +28,7 @@
             style="@style/fadingScrollView"
             android:layout_width="0dp"
             android:layout_height="0dp"
+            android:layout_marginBottom="@dimen/spacing_normal"
             android:fillViewport="true"
             app:layout_constraintBottom_toTopOf="@+id/risk_details_button_enable_tracing"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/Corona-Warn-App/src/main/res/layout/include_onboarding.xml b/Corona-Warn-App/src/main/res/layout/include_onboarding.xml
index 091237a3c..868466029 100644
--- a/Corona-Warn-App/src/main/res/layout/include_onboarding.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_onboarding.xml
@@ -62,7 +62,7 @@
 
             <TextView
                 android:id="@+id/onboarding_subtitle"
-                style="@style/textMultilineEmphasized"
+                style="@style/textMultiline"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/spacing_small"
diff --git a/Corona-Warn-App/src/main/res/layout/include_row.xml b/Corona-Warn-App/src/main/res/layout/include_row.xml
index ec63a3bb6..2141885a8 100644
--- a/Corona-Warn-App/src/main/res/layout/include_row.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_row.xml
@@ -64,7 +64,7 @@
 
             <TextView
                 android:id="@+id/main_row_item_headline"
-                style="@style/textLargeEmphasized"
+                style="@style/textMultiline"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:text="@{title}"
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 28de42d8a..566334e6c 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -192,6 +192,8 @@
     <string name="main_about_headline">Häufige Fragen</string>
     <!-- XTXT: main, explains faq on card -->
     <string name="main_about_body">Hier finden Sie Antworten auf häufig gestellte Fragen rund um die Corona-Warn-App.</string>
+    <!-- NOTR todo insert english link in translation file http://www.bundesregierung.de/corona-warn-app-faq-englisch -->
+    <string name="main_about_link">http://www.bundesregierung.de/corona-warn-app-faq</string>
 
     <!-- ####################################
                Main - Share
@@ -213,32 +215,54 @@
                 Main - Overview
     ###################################### -->
 
+    <!-- XHED: App overview page title -->
     <string name="main_overview_title">Ãœberblick</string>
+    <!-- XHED: App overview subtitle for tracing explanation-->
     <string name="main_overview_subtitle_tracing">Risiko-Ermittlung</string>
-    <string name="main_overview_body_tracing">Die Risiko-Ermittung ist eine der drei zentralen Funktionen der App. Ist sie aktiv, werden Begegnungen aufgezeichnet. Sie brauchen sich um ncihts mehr zu kümmern.</string>
+    <!-- YTXT: App overview body text about tracing -->
+    <string name="main_overview_body_tracing">Die Risiko-Ermittlung ist eine der drei zentralen Funktionen der App. Ist sie aktiv, werden Begegnungen aufgezeichnet. Sie brauchen sich um nichts mehr zu kümmern.</string>
+    <!-- XHED: App overview subtitle for risk explanation -->
     <string name="main_overview_subtitle_risk">Infektionsrisiko</string>
-    <string name="main_overview_body_risk">Sind Sie innerhalb der letzten 14 Tage einer corona- positiven Person begegnet, berechnet die App Ihr persönliches Infektionsrisiko. Als Grundlage dafür misst sie, über welche dauer und mit welchem Abstand eine Begegnung stattfand.</string>
+    <!-- YTXT: App overview body text about risk levels -->
+    <string name="main_overview_body_risk">Sind Sie innerhalb der letzten 14 Tage einer Corona-positiven Person begegnet, berechnet die App Ihr persönliches Infektionsrisiko. Als Grundlage dafür misst sie, über welche Dauer und mit welchem Abstand eine Begegnung stattfand.</string>
+    <!-- XHED: App overview subtitle for risk level list -->
     <string name="main_overview_subtitle_risk_levels">Folgende Risikostufen können angezeigt werden:</string>
+    <!-- XTXT: App overview increased risk level -->
     <string name="main_overview_subtitle_increased_risk">Erhöhtes Risiko</string>
+    <!-- XTXT: App overview low risk level -->
     <string name="main_overview_subtitle_low_risk">Niedriges Risiko</string>
+    <!-- XTXT: App overview unknown risk level -->
     <string name="main_overview_subtitle_unknown_risk">Unbekanntes Risiko</string>
+    <!-- XHED: App overview subtitle for test procedure explanation -->
     <string name="main_overview_headline_test">Benachrichtigung Anderer</string>
-    <string name="main_overview_body_test">Eine weitere zentrale Funktion. Hier können Sie Ihren Test registrieren und seinen Status abfragen. Bei einem positiven Test können Sie andere warnen und damit Infektionsketten unterbrechen.</string>
-    <string name="main_overview_headline_glossary">Wichtige Begriffe:</string>
-    <string name="main_overview_subtitle_glossary_tracing">Begegnungs-Aufzeichnung</string>
-    <string name="main_overview_body_glossary_tracing">Liste der empfangenen und vorübergehend im Betriebssystemspeicher abgelegten kurzlebigen Zufallscodes. Diese Liste wird bei der Risiko-Überprüfung gelesen. Alle Zufallscodes werden nach 14 Tagen automatisch gelöscht.</string>
-    <string name="main_overview_subtitle_glossary_calculation">Risiko-Überprüfung</string>
-    <string name="main_overview_body_glossary_calculation">Abfrage der Begegnungs-Aufzeichnung und Abgleich mit den gemeldeten Infektionen anderer Nutzerinnen und Nutzer. Die Risiko-Überprüfung erfolgt automatisch ungefähr alle zwei Stunden. </string>
-    <string name="main_overview_subtitle_glossary_contact">Risiko-Begegnung</string>
-    <string name="main_overview_body_glossary_contact">Jede Begegnungen mit einer Corona-positiv getesteten Person, der Sie über einen längeren Zeitraum und in geringer Distanz begegnet sind.</string>
-    <string name="main_overview_subtitle_glossary_notification">Risiko-Benachrichtigung</string>
-    <string name="main_overview_body_glossary_notification">Die Anzeige von Risiko-Begegnungen in der Corona-Warn-App.</string>
-    <string name="main_overview_subtitle_glossary_keys">Zufallscode</string>
-    <string name="main_overview_body_glossary_keys">Die Zufallscodes sind zufällig erzeugte Zahlen- und Buchstabenkombinationen. Sie werden zwischen benachbarten Smartphones ausgetauscht. Zufallskennungen lassen sich nicht einer bestimmten Person zuordnen und werden nach 14 Tagen automatisch gelöscht. Eine Corona-positiv getestete Person kann ihre Zufallscodes der letzten bis zu 14 Tage freiwillig mit anderen CWA-Nutzern teilen.</string>
-
-    <!-- ####################################
-               Risk Details
-    ###################################### -->
+    <!-- YTXT: App overview body text about rest procedure -->
+    <string name="main_overview_body_test">Eine weitere zentrale Funktion. Hier können Sie Ihren Test registrieren und seinen Status abfragen. Bei einem positiven Test können Sie andere warnen und damit Infektionsketten unterbrechen.</string>
+    <!-- XHED: App overview headline for glossary -->
+   <string name="main_overview_headline_glossary">Wichtige Begriffe:</string>
+    <!-- XHED: App overview subtitle for glossary key storage -->
+   <string name="main_overview_subtitle_glossary_tracing">Begegnungs-Aufzeichnung</string>
+    <!-- YTXT: App overview body for glossary key storage -->
+   <string name="main_overview_body_glossary_tracing">Liste der empfangenen und vorübergehend im Betriebssystemspeicher abgelegten kurzlebigen Zufallscodes. Diese Liste wird bei der Risiko-Überprüfung gelesen. Alle Zufallscodes werden nach 14 Tagen automatisch gelöscht.</string>
+    <!-- XHED: App overview subtitle for glossary risk calculation  -->
+   <string name="main_overview_subtitle_glossary_calculation">Risiko-Überprüfung</string>
+    <!-- YTXT: App overview body for glossary risk calculation -->
+   <string name="main_overview_body_glossary_calculation">Abfrage der Begegnungs-Aufzeichnung und Abgleich mit den gemeldeten Infektionen anderer Nutzerinnen und Nutzer. Die Risiko-Überprüfung erfolgt automatisch ungefähr alle zwei Stunden.</string>
+    <!-- XHED: App overview subtitle for glossary contact  -->
+   <string name="main_overview_subtitle_glossary_contact">Risiko-Begegnungen</string>
+    <!-- YTXT: App overview body for glossary contact -->
+   <string name="main_overview_body_glossary_contact">Jene Begegnungen mit einer Corona-positiv getesteten Person, die über einen längeren Zeitraum und in geringer Distanz stattfanden.</string>
+    <!-- XHED: App overview subtitle for glossary notifications -->
+   <string name="main_overview_subtitle_glossary_notification">Risiko-Benachrichtigung</string>
+    <!-- YTXT: App overview body for glossary notifications -->
+   <string name="main_overview_body_glossary_notification">Die Anzeige von Risiko-Begegnungen in der Corona-Warn-App.</string>
+    <!-- XHED: App overview subtitle for glossary keys -->
+   <string name="main_overview_subtitle_glossary_keys">Zufallscode</string>
+    <!-- YTXT: App overview body for glossary keys -->
+   <string name="main_overview_body_glossary_keys">Die Zufallscodes sind zufällig erzeugte Zahlen- und Buchstabenkombinationen. Sie werden zwischen benachbarten Smartphones ausgetauscht. Zufallskennungen lassen sich nicht einer bestimmten Person zuordnen und werden nach 14 Tagen automatisch gelöscht. Eine Corona-positiv getestete Person kann ihre Zufallscodes der letzten bis zu 14 Tage freiwillig mit anderen CWA-Nutzern teilen.</string>
+
+   <!-- ####################################
+              Risk Details
+   ###################################### -->
 
     <!-- XHED: risk details - headline, how a user should act -->
     <string name="risk_details_headline_behavior">Verhalten</string>
@@ -421,6 +445,8 @@
     <string name="information_contact_subtitle_phone">Technische Hotline:</string>
     <!-- XLNK: Button / hyperlink to phone call for technical contact and hotline information page -->
     <string name="information_contact_button_phone">+49 (0)800 7540001</string>
+    <!-- MOTR todo phone number to be called replace in english file-->
+    <string name="information_contact_phone_call_number">tel:+49 800 7540001</string>
     <!-- XTXT: Body text for technical contact and hotline information page -->
     <string name="information_contact_body_phone">Unser Kundenservice ist für Sie da.</string>
     <!-- YTXT: Body text for technical contact and hotline information page -->
-- 
GitLab