From db8becf358ef46ba4ea2d8fe5c5fbc0014e33c6d Mon Sep 17 00:00:00 2001
From: Chilja Gossow <49635654+chiljamgossow@users.noreply.github.com>
Date: Wed, 16 Dec 2020 09:29:05 +0100
Subject: [PATCH] new texts (#1906)
---
.../ContactDiaryOnboardingFragment.kt | 2 +-
.../overview/ContactDiaryOverviewFragment.kt | 2 +-
...ude_contact_diary_overview_nested_item.xml | 5 ++--
.../res/menu/menu_contact_diary_overview.xml | 3 +--
.../res/values-de/contact_diary_strings.xml | 24 ++++++++++++++++++-
.../main/res/values/contact_diary_strings.xml | 24 ++++++++++++++++++-
6 files changed, 51 insertions(+), 9 deletions(-)
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
index 065596dcd..c037f5c4e 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/onboarding/ContactDiaryOnboardingFragment.kt
@@ -1,8 +1,8 @@
package de.rki.coronawarnapp.contactdiary.ui.onboarding
import android.os.Bundle
-import androidx.fragment.app.Fragment
import android.view.View
+import androidx.fragment.app.Fragment
import androidx.navigation.ActionOnlyNavDirections
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.ui.ContactDiaryActivity
diff --git a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt
index b68f69c5b..6711d86dd 100644
--- a/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt
+++ b/Corona-Warn-App/src/main/java/de/rki/coronawarnapp/contactdiary/ui/overview/ContactDiaryOverviewFragment.kt
@@ -1,9 +1,9 @@
package de.rki.coronawarnapp.contactdiary.ui.overview
import android.os.Bundle
-import androidx.fragment.app.Fragment
import android.view.View
import android.widget.Toast
+import androidx.fragment.app.Fragment
import de.rki.coronawarnapp.R
import de.rki.coronawarnapp.contactdiary.ui.overview.adapter.ContactDiaryOverviewAdapter
import de.rki.coronawarnapp.databinding.ContactDiaryOverviewFragmentBinding
diff --git a/Corona-Warn-App/src/main/res/layout/include_contact_diary_overview_nested_item.xml b/Corona-Warn-App/src/main/res/layout/include_contact_diary_overview_nested_item.xml
index 3bdcce318..661d46f15 100644
--- a/Corona-Warn-App/src/main/res/layout/include_contact_diary_overview_nested_item.xml
+++ b/Corona-Warn-App/src/main/res/layout/include_contact_diary_overview_nested_item.xml
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:tools="http://schemas.android.com/tools"
- xmlns:android="http://schemas.android.com/apk/res/android"
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -44,4 +43,4 @@
</androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
\ No newline at end of file
+</layout>
diff --git a/Corona-Warn-App/src/main/res/menu/menu_contact_diary_overview.xml b/Corona-Warn-App/src/main/res/menu/menu_contact_diary_overview.xml
index 25bde48e7..7602e2025 100644
--- a/Corona-Warn-App/src/main/res/menu/menu_contact_diary_overview.xml
+++ b/Corona-Warn-App/src/main/res/menu/menu_contact_diary_overview.xml
@@ -1,5 +1,4 @@
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_contact_diary_information"
android:title="@string/menu_contact_diary_information" />
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 1124c81da..6da4843ba 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
@@ -75,4 +75,26 @@
<!-- XTXT: Header for contact diary overview screen -->
<string name="contact_diary_overview_header">Startseite</string>
-</resources>
\ No newline at end of file
+ <!-- XHED: Title for the contact diary edit locations -->
+ <string name="contact_diary_edit_locations_title">Orte bearbeiten</string>
+ <!-- XHED: Title for the contact diary edit persons -->
+ <string name="contact_diary_edit_persons_title">Personen bearbeiten</string>
+ <!-- XBUT: Button text for the contact diary edit screen button to delete all locations/persons -->
+ <string name="contact_diary_remove_all_button">Alle entfernen</string>
+ <!-- XBUT: Button text for the contact diary dialog to delete all locations/persons -->
+ <string name="contact_diary_delete_button_positive">Entfernen</string>
+ <!-- XBUT: Button text for the contact diary dialog to delete all locations/persons -->
+ <string name="contact_diary_delete_button_negative">Abbrechen</string>
+ <!-- XHED: Title for the contact diary dialog to delete all locations -->
+ <string name="contact_diary_delete_locations_title">Wollen Sie wirklich alle Orte entfernen?</string>
+ <!-- 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>
+ <!-- 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>
+ <!-- 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>
+</resources>
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 31d261f1c..b7172f438 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
@@ -74,4 +74,26 @@
<!-- XTXT: Header for contact diary overview screen -->
<string name="contact_diary_overview_header"/>
-</resources>
\ No newline at end of file
+ <!-- XHED: Title for the contact diary edit locations -->
+ <string name="contact_diary_edit_locations_title">Orte bearbeiten</string>
+ <!-- XHED: Title for the contact diary edit persons -->
+ <string name="contact_diary_edit_persons_title">Personen bearbeiten</string>
+ <!-- XBUT: Button text for the contact diary edit screen button to delete all locations/persons -->
+ <string name="contact_diary_remove_all_button">Alle entfernen</string>
+ <!-- XBUT: Button text for the contact diary dialog to delete all locations/persons -->
+ <string name="contact_diary_delete_button_positive">Entfernen</string>
+ <!-- XBUT: Button text for the contact diary dialog to delete all locations/persons -->
+ <string name="contact_diary_delete_button_negative">Abbrechen</string>
+ <!-- XHED: Title for the contact diary dialog to delete all locations -->
+ <string name="contact_diary_delete_locations_title">Wollen Sie wirklich alle Orte entfernen?</string>
+ <!-- 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>
+ <!-- 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>
+ <!-- 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>
+</resources>
--
GitLab