From d764468ebe82e1696b2e97fd3f379e4f43faa8d6 Mon Sep 17 00:00:00 2001
From: I502720 <axel.herbstreith@sap.com>
Date: Mon, 15 Feb 2021 13:39:42 +0100
Subject: [PATCH] removed doublicated entry

---
 .../res/layout/fragment_ppa_more_info.xml     | 27 ++-----------------
 .../src/main/res/values-bg/strings.xml        |  6 ++---
 .../src/main/res/values-de/strings.xml        |  6 ++---
 .../src/main/res/values-en/strings.xml        |  6 ++---
 .../src/main/res/values-pl/strings.xml        |  6 ++---
 .../src/main/res/values-ro/strings.xml        |  6 ++---
 .../src/main/res/values-tr/strings.xml        |  6 ++---
 .../src/main/res/values/strings.xml           |  6 ++---
 8 files changed, 16 insertions(+), 53 deletions(-)

diff --git a/Corona-Warn-App/src/main/res/layout/fragment_ppa_more_info.xml b/Corona-Warn-App/src/main/res/layout/fragment_ppa_more_info.xml
index 7cfb588b676..3d6dfdd6af5 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_ppa_more_info.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_ppa_more_info.xml
@@ -679,7 +679,7 @@
                     app:srcCompat="@drawable/bullet_point" />
 
                 <TextView
-                    android:id="@+id/other_info_point_2_text"
+                    android:id="@+id/other_info_point_3_text"
                     style="@style/subtitle"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -691,29 +691,6 @@
                     app:layout_constraintStart_toStartOf="@id/body_start"
                     app:layout_constraintTop_toBottomOf="@+id/other_info_point_1_text" />
 
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/other_info_point_2"
-                    android:layout_width="@dimen/bullet_point_size"
-                    android:layout_height="@dimen/bullet_point_size"
-                    android:layout_marginTop="@dimen/spacing_tiny"
-                    android:importantForAccessibility="no"
-                    app:layout_constraintStart_toStartOf="@id/body_start"
-                    app:layout_constraintTop_toTopOf="@id/other_info_point_2_text"
-                    app:srcCompat="@drawable/bullet_point" />
-
-                <TextView
-                    android:id="@+id/other_info_point_3_text"
-                    style="@style/subtitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="13dp"
-                    android:layout_marginTop="15dp"
-                    android:focusable="true"
-                    android:text="@string/onboarding_ppa_more_info_other_info_point_3_text"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="@id/body_start"
-                    app:layout_constraintTop_toBottomOf="@+id/other_info_point_2_text" />
-
                 <androidx.appcompat.widget.AppCompatImageView
                     android:id="@+id/other_info_point_3"
                     android:layout_width="@dimen/bullet_point_size"
@@ -732,7 +709,7 @@
                     android:layout_marginStart="13dp"
                     android:layout_marginTop="15dp"
                     android:focusable="true"
-                    android:text="@string/onboarding_ppa_more_info_other_info_point_4_text"
+                    android:text="@string/onboarding_ppa_more_info_other_info_point_3_text"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="@id/body_start"
                     app:layout_constraintTop_toBottomOf="@+id/other_info_point_3_text" />
diff --git a/Corona-Warn-App/src/main/res/values-bg/strings.xml b/Corona-Warn-App/src/main/res/values-bg/strings.xml
index fe6c5b45578..fa9512b0c64 100644
--- a/Corona-Warn-App/src/main/res/values-bg/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-bg/strings.xml
@@ -602,11 +602,9 @@
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 1 text-->
     <string name="onboarding_ppa_more_info_other_info_point_1_text">"Посочената от Вас възрастова група"</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 2 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Посочената от Вас възрастова група"</string>
+    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Времето между Вашето последно излагане с повишен риск и регистрирането на теста"</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 3 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Времето между Вашето последно излагане с повишен риск и регистрирането на теста"</string>
-    <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 4 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_4_text">"Информация относно това дали сте споделили резултата от теста си, за да предупредите останалите потребители"</string>
+    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Информация относно това дали сте споделили резултата от теста си, за да предупредите останалите потребители"</string>
     <!-- YTXT: onboarding privacy preserving analytics (ppa) - more info - very secret body-->
     <string name="onboarding_ppa_more_info_much_privacy_body">"Тази информация не може да се използва за установяване на самоличността Ви – Вашата анонимност ще бъде запазена.\nДанните ще бъдат анализирани за статистически цели и няма да се използват за създаване на профил."</string>
 
diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml
index 182dc4ed60c..06327db50af 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -605,11 +605,9 @@
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 1 text-->
     <string name="onboarding_ppa_more_info_other_info_point_1_text">"Angaben dazu, welche Altersgruppe Sie angegeben haben."</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 2 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Angaben dazu, welche Altersgruppe Sie angegeben haben."</string>
+    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Angaben zum Zeitraum zwischen der letzten Begegnung mit erhöhtem Risiko und der Testregistrierung."</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 3 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Angaben zum Zeitraum zwischen der letzten Begegnung mit erhöhtem Risiko und der Testregistrierung."</string>
-    <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 4 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_4_text">"Angaben dazu, ob Sie Ihr Testergebnis geteilt und andere gewarnt haben."</string>
+    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Angaben dazu, ob Sie Ihr Testergebnis geteilt und andere gewarnt haben."</string>
     <!-- YTXT: onboarding privacy preserving analytics (ppa) - more info - very secret body-->
     <string name="onboarding_ppa_more_info_much_privacy_body">"Die Angaben können nicht mit Ihrer Person verknüpft werden. Ihre Identität bleibt weiterhin geheim.\nDie Angaben werden statistisch ausgewertet, sie werden nicht zu einem Profil gespeichert."</string>
 
diff --git a/Corona-Warn-App/src/main/res/values-en/strings.xml b/Corona-Warn-App/src/main/res/values-en/strings.xml
index 25689274df8..8cf84fc5222 100644
--- a/Corona-Warn-App/src/main/res/values-en/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/strings.xml
@@ -602,11 +602,9 @@
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 1 text-->
     <string name="onboarding_ppa_more_info_other_info_point_1_text">"Information about the age group you specified."</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 2 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Information about the age group you specified."</string>
+    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Information about the time between your last exposure with increased risk and the test registration."</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 3 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Information about the time between your last exposure with increased risk and the test registration."</string>
-    <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 4 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_4_text">"Information about whether you shared your test result and warned others."</string>
+    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Information about whether you shared your test result and warned others."</string>
     <!-- YTXT: onboarding privacy preserving analytics (ppa) - more info - very secret body-->
     <string name="onboarding_ppa_more_info_much_privacy_body">"This information cannot be linked with you personally. Your identity will remain confidential.\nThe information will be analyzed for statistical purposes. It will not be saved for a profile."</string>
 
diff --git a/Corona-Warn-App/src/main/res/values-pl/strings.xml b/Corona-Warn-App/src/main/res/values-pl/strings.xml
index e4194b5b794..0223e645bd3 100644
--- a/Corona-Warn-App/src/main/res/values-pl/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-pl/strings.xml
@@ -602,11 +602,9 @@
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 1 text-->
     <string name="onboarding_ppa_more_info_other_info_point_1_text">"Informacja o podanej przez Ciebie grupie wiekowej."</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 2 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Informacja o podanej przez Ciebie grupie wiekowej."</string>
+    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Informacja o czasie, który upłynął między Twoim ostatnim narażeniem o podwyższonym ryzyku a rejestracją testu."</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 3 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Informacja o czasie, który upłynął między Twoim ostatnim narażeniem o podwyższonym ryzyku a rejestracją testu."</string>
-    <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 4 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_4_text">"Informacja o udostępnieniu wyniku testu i ostrzeżeniu innych osób."</string>
+    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Informacja o udostępnieniu wyniku testu i ostrzeżeniu innych osób."</string>
     <!-- YTXT: onboarding privacy preserving analytics (ppa) - more info - very secret body-->
     <string name="onboarding_ppa_more_info_much_privacy_body">"Tych informacji nie można powiązać z Twoją osobą. Twoja tożsamość zostanie zachowana w poufności.\nInformacje zostaną przeanalizowane w celach statystycznych. Nie zostaną zapisane w profilu."</string>
 
diff --git a/Corona-Warn-App/src/main/res/values-ro/strings.xml b/Corona-Warn-App/src/main/res/values-ro/strings.xml
index 9ce9afbc8aa..d67b2dbb535 100644
--- a/Corona-Warn-App/src/main/res/values-ro/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-ro/strings.xml
@@ -602,11 +602,9 @@
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 1 text-->
     <string name="onboarding_ppa_more_info_other_info_point_1_text">"Informații despre grupul de vârstă pe care l-ați specificat."</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 2 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Informații despre grupul de vârstă pe care l-ați specificat."</string>
+    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Informații despre timpul dintre ultima dvs. expunere cu risc crescut și înregistrarea testului."</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 3 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Informații despre timpul dintre ultima dvs. expunere cu risc crescut și înregistrarea testului."</string>
-    <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 4 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_4_text">"Informații dacă ați partajat rezultatul testului și i-ați avertizat pe ceilalți."</string>
+    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Informații dacă ați partajat rezultatul testului și i-ați avertizat pe ceilalți."</string>
     <!-- YTXT: onboarding privacy preserving analytics (ppa) - more info - very secret body-->
     <string name="onboarding_ppa_more_info_much_privacy_body">"Aceste informații nu pot fi legate de dvs. în mod personal. Identitatea dvs. va rămâne confidențială.\nInformațiile vor fi analizate în scop statistic. Ele nu vor fi salvate pentru un profil."</string>
 
diff --git a/Corona-Warn-App/src/main/res/values-tr/strings.xml b/Corona-Warn-App/src/main/res/values-tr/strings.xml
index 7a438156d0d..dd8f24235a1 100644
--- a/Corona-Warn-App/src/main/res/values-tr/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-tr/strings.xml
@@ -602,11 +602,9 @@
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 1 text-->
     <string name="onboarding_ppa_more_info_other_info_point_1_text">"Belirttiğiniz yaş grubu hakkında bilgi."</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 2 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Belirttiğiniz yaş grubu hakkında bilgi."</string>
+    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Yüksek riskli son maruz kalmanız ile test kaydınız arasındaki süre hakkında bilgi."</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 3 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Yüksek riskli son maruz kalmanız ile test kaydınız arasındaki süre hakkında bilgi."</string>
-    <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 4 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_4_text">"Test sonucunuzu paylaşıp diğer kullanıcı uyarıp uyarmadığınız hakkında bilgi."</string>
+    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Test sonucunuzu paylaşıp diğer kullanıcı uyarıp uyarmadığınız hakkında bilgi."</string>
     <!-- YTXT: onboarding privacy preserving analytics (ppa) - more info - very secret body-->
     <string name="onboarding_ppa_more_info_much_privacy_body">"Bu bilgilerin kişisel olarak sizinle bağlantısı kurulamaz. Kimliğiniz gizli tutulacaktır.\nBilgiler istatistiksel amaçlar doğrultusunda analiz edilecektir. Profil oluşturmak için kaydedilmeyecektir."</string>
 
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 3192a1e0c05..db9fe666995 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -616,11 +616,9 @@
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 1 text-->
     <string name="onboarding_ppa_more_info_other_info_point_1_text">"Information about the age group you specified."</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 2 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Information about the age group you specified."</string>
+    <string name="onboarding_ppa_more_info_other_info_point_2_text">"Information about the time between your last exposure with increased risk and the test registration."</string>
     <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 3 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Information about the time between your last exposure with increased risk and the test registration."</string>
-    <!-- XTXT: onboarding privacy preserving analytics (ppa) - more info - other info point 4 text-->
-    <string name="onboarding_ppa_more_info_other_info_point_4_text">"Information about whether you shared your test result and warned others."</string>
+    <string name="onboarding_ppa_more_info_other_info_point_3_text">"Information about whether you shared your test result and warned others."</string>
     <!-- YTXT: onboarding privacy preserving analytics (ppa) - more info - very secret body-->
     <string name="onboarding_ppa_more_info_much_privacy_body">"This information cannot be linked with you personally. Your identity will remain confidential.\nThe information will be analyzed for statistical purposes. It will not be saved for a profile."</string>