From 7689a4634b08417ee52af934db1e36e8a40f5b67 Mon Sep 17 00:00:00 2001
From: Ralf Gehrer <ralfgehrer@users.noreply.github.com>
Date: Thu, 4 Mar 2021 13:37:55 +0100
Subject: [PATCH] Contact Journal - text differences in the popups
(EXPOSUREAPP-5370) #2492
---
.../ui/location/ContactDiaryAddLocationFragment.kt | 2 +-
.../ui/person/ContactDiaryAddPersonFragment.kt | 2 +-
.../src/main/res/values-de/contact_diary_strings.xml | 10 +++++++---
.../src/main/res/values/contact_diary_strings.xml | 4 ++++
4 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt
index 8e35cbf81..3470b9903 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/location/ContactDiaryAddLocationFragment.kt
@@ -108,7 +108,7 @@ class ContactDiaryAddLocationFragment : Fragment(R.layout.contact_diary_add_loca
DialogHelper.DialogInstance(
requireActivity(),
R.string.contact_diary_delete_location_title,
- R.string.contact_diary_delete_locations_message,
+ R.string.contact_diary_delete_location_message,
R.string.contact_diary_delete_button_positive,
R.string.contact_diary_delete_button_negative,
positiveButtonFunction = {
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt
index e54cede4d..9bb29a89c 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/person/ContactDiaryAddPersonFragment.kt
@@ -108,7 +108,7 @@ class ContactDiaryAddPersonFragment :
DialogHelper.DialogInstance(
requireActivity(),
R.string.contact_diary_delete_person_title,
- R.string.contact_diary_delete_persons_message,
+ R.string.contact_diary_delete_person_message,
R.string.contact_diary_delete_button_positive,
R.string.contact_diary_delete_button_negative,
positiveButtonFunction = {
diff --git a/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml b/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml
index 623060853..14b896c15 100644
--- a/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/contact_diary_strings.xml
@@ -104,17 +104,21 @@
<!-- XHED: Title for the contact diary dialog to delete all persons -->
<string name="contact_diary_delete_persons_title">"Wollen Sie wirklich alle Personen entfernen?"</string>
<!-- XTXT: Message for the contact diary dialog to delete all locations -->
- <string name="contact_diary_delete_locations_message">"Wenn Sie einen Ort entfernen, werden alle Einträge für diesen Ort aus dem Tagebuch gelöscht."</string>
+ <string name="contact_diary_delete_locations_message">"Wenn Sie alle Orte entfernen, werden alle Einträge für alle Orte aus dem Tagebuch gelöscht."</string>
<!-- XTXT: Message for the contact diary dialog to delete all persons -->
- <string name="contact_diary_delete_persons_message">"Wenn Sie eine Person entfernen, werden alle Einträge für diese Person aus dem Tagebuch gelöscht."</string>
+ <string name="contact_diary_delete_persons_message">"Wenn Sie alle Personen entfernen, werden alle Einträge für alle Personen aus dem Tagebuch gelöscht."</string>
<!-- XACT: edit icon description for screen readers -->
<string name="contact_diary_edit_icon_content_description">"Eintrag bearbeiten"</string>
<!-- XACT: edit icon description for screen readers -->
<string name="contact_diary_delete_icon_content_description">"Eintrag löschen"</string>
<!-- XHED: Title for the contact diary dialog to delete delete a single location -->
- <string name="contact_diary_delete_location_title">"Wollen Sie wirklich diesen Ort entfernen?"</string>
+ <string name="contact_diary_delete_location_title">"Wollen Sie diesen Ort wirklich entfernen?"</string>
<!-- XHED: Title for the contact diary dialog to delete delete a single person -->
<string name="contact_diary_delete_person_title">"Wollen Sie wirklich diese Person entfernen?"</string>
+ <!-- XTXT: Message for the contact diary dialog to delete a single location -->
+ <string name="contact_diary_delete_location_message">"Wenn Sie einen Ort entfernen, werden alle Einträge für diesen Ort aus dem Tagebuch gelöscht."</string>
+ <!-- XTXT: Message for the contact diary dialog to delete a single person -->
+ <string name="contact_diary_delete_person_message">"Wenn Sie eine Person entfernen, werden alle Einträge für diese Person aus dem Tagebuch gelöscht."</string>
<!-- XHED: Title for the contact diary comment info screen -->
<string name="contact_diary_comment_info_screen_title">"Notiz"</string>
diff --git a/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml b/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
index 5a610c209..dad9ca91c 100644
--- a/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
+++ b/Corona-Warn-App/src/main/res/values/contact_diary_strings.xml
@@ -115,6 +115,10 @@
<string name="contact_diary_delete_location_title">"Do you really want to remove this place?"</string>
<!-- XHED: Title for the contact diary dialog to delete delete a single person -->
<string name="contact_diary_delete_person_title">"Do you really want to remove this person?"</string>
+ <!-- XTXT: Message for the contact diary dialog to delete a single location -->
+ <string name="contact_diary_delete_location_message">"Wenn Sie einen Ort entfernen, werden alle Einträge für diesen Ort aus dem Tagebuch gelöscht."</string>
+ <!-- XTXT: Message for the contact diary dialog to delete a single person -->
+ <string name="contact_diary_delete_person_message">"Wenn Sie eine Person entfernen, werden alle Einträge für diese Person aus dem Tagebuch gelöscht."</string>
<!-- XHED: Title for the contact journal export email subject -->
<string name="contact_diary_export_subject" translatable="false">"Mein Kontakt-Tagebuch"</string>
--
GitLab