From 45cc9ec4b425ce1ea25c3637c7a89221d8fd9cf5 Mon Sep 17 00:00:00 2001
From: harambasicluka <64483219+harambasicluka@users.noreply.github.com>
Date: Mon, 7 Jun 2021 13:57:58 +0200
Subject: [PATCH] restructuring of non translatable strings (#3365)
---
.../main/res/values/contact_diary_strings.xml | 28 ---------------
.../values/contact_diary_strings_export.xml | 34 +++++++++++++++++++
.../green_certificate_attribute_strings.xml | 7 ++--
3 files changed, 38 insertions(+), 31 deletions(-)
create mode 100644 Corona-Warn-App/src/main/res/values/contact_diary_strings_export.xml
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 fc49c3ebb..076fd4c95 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
@@ -125,34 +125,6 @@
<!-- XTXT: Message for the contact diary dialog to delete a single person -->
<string name="contact_diary_delete_person_message">"If you remove a person, all the entries for that person will be removed from your journal."</string>
- <!-- EXPORT -->
- <!-- XHED: Title for the contact journal export email subject -->
- <string name="contact_diary_export_subject" translatable="false">"Mein Kontakt-Tagebuch"</string>
- <!-- XTXT: Intro text for the contact journal email export part one-->
- <string name="contact_diary_export_intro_one" translatable="false">"Kontakte der letzten 15 Tage (%1$s - %2$s)"</string>
- <!-- XTXT: Intro text for the contact journal email export part two-->
- <string name="contact_diary_export_intro_two" translatable="false">"Die nachfolgende Liste dient dem zuständigen Gesundheitsamt zur Kontaktnachverfolgung gem. § 25 IfSG."</string>
- <!-- XTXT: Phone number prefix in the contact journal export-->
- <string name="contact_diary_export_prefix_phone" translatable="false">"Tel."</string>
- <!-- XTXT: EMail prefix in the contact journal export-->
- <string name="contact_diary_export_prefix_email" translatable="false">"E-Mail"</string>
- <!-- XTXT: Additional information about duration that was longer than 15 minutes in the contact journal export-->
- <string name="contact_diary_export_durations_longer_than_15min" translatable="false">"Kontaktdauer > 15 Minuten"</string>
- <!-- XTXT: Additional information about duration that was less than 15 minutes in the contact journal export-->
- <string name="contact_diary_export_durations_less_than_15min" translatable="false">"Kontaktdauer < 15 Minuten"</string>
- <!-- XTXT: Additional information about wearing a mask in the contact journal export-->
- <string name="contact_diary_export_wearing_mask" translatable="false">"mit Maske"</string>
- <!-- XTXT: Additional information about wearing no mask in the contact journal export-->
- <string name="contact_diary_export_wearing_no_mask" translatable="false">"ohne Maske"</string>
- <!-- XTXT: Additional information about being indoors in the contact journal export-->
- <string name="contact_diary_export_indoor" translatable="false">"im Gebäude"</string>
- <!-- XTXT: Additional information about being outdoor in the contact journal export-->
- <string name="contact_diary_export_outdoor" translatable="false">"im Freien"</string>
- <!-- XTXT: Location duration prefix in the contact journal export-->
- <string name="contact_diary_export_location_duration_prefix" translatable="false">"Dauer"</string>
- <!-- XTXT: Location duration postfix in the contact journal export-->
- <string name="contact_diary_export_location_duration_suffix" translatable="false">"h"</string>
-
<!-- XHED: Title for the contact diary comment info screen -->
<string name="contact_diary_comment_info_screen_title">"Note"</string>
<!-- XTXT: Description for contact diary comment info screen -->
diff --git a/Corona-Warn-App/src/main/res/values/contact_diary_strings_export.xml b/Corona-Warn-App/src/main/res/values/contact_diary_strings_export.xml
new file mode 100644
index 000000000..b641a9be2
--- /dev/null
+++ b/Corona-Warn-App/src/main/res/values/contact_diary_strings_export.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" tools:ignore="MissingTranslation">
+ <!-- ####################################
+ Special string files for the strings that should
+ always keep the german version independent from
+ the selected system language
+ ###################################### -->
+ <!-- XHED: Title for the contact journal export email subject -->
+ <string name="contact_diary_export_subject" translatable="false">"Mein Kontakt-Tagebuch"</string>
+ <!-- XTXT: Intro text for the contact journal email export part one-->
+ <string name="contact_diary_export_intro_one" translatable="false">"Kontakte der letzten 15 Tage (%1$s - %2$s)"</string>
+ <!-- XTXT: Intro text for the contact journal email export part two-->
+ <string name="contact_diary_export_intro_two" translatable="false">"Die nachfolgende Liste dient dem zuständigen Gesundheitsamt zur Kontaktnachverfolgung gem. § 25 IfSG."</string>
+ <!-- XTXT: Phone number prefix in the contact journal export-->
+ <string name="contact_diary_export_prefix_phone" translatable="false">"Tel."</string>
+ <!-- XTXT: EMail prefix in the contact journal export-->
+ <string name="contact_diary_export_prefix_email" translatable="false">"E-Mail"</string>
+ <!-- XTXT: Additional information about duration that was longer than 15 minutes in the contact journal export-->
+ <string name="contact_diary_export_durations_longer_than_15min" translatable="false">"Kontaktdauer > 15 Minuten"</string>
+ <!-- XTXT: Additional information about duration that was less than 15 minutes in the contact journal export-->
+ <string name="contact_diary_export_durations_less_than_15min" translatable="false">"Kontaktdauer < 15 Minuten"</string>
+ <!-- XTXT: Additional information about wearing a mask in the contact journal export-->
+ <string name="contact_diary_export_wearing_mask" translatable="false">"mit Maske"</string>
+ <!-- XTXT: Additional information about wearing no mask in the contact journal export-->
+ <string name="contact_diary_export_wearing_no_mask" translatable="false">"ohne Maske"</string>
+ <!-- XTXT: Additional information about being indoors in the contact journal export-->
+ <string name="contact_diary_export_indoor" translatable="false">"im Gebäude"</string>
+ <!-- XTXT: Additional information about being outdoor in the contact journal export-->
+ <string name="contact_diary_export_outdoor" translatable="false">"im Freien"</string>
+ <!-- XTXT: Location duration prefix in the contact journal export-->
+ <string name="contact_diary_export_location_duration_prefix" translatable="false">"Dauer"</string>
+ <!-- XTXT: Location duration postfix in the contact journal export-->
+ <string name="contact_diary_export_location_duration_suffix" translatable="false">"h"</string>
+</resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values/green_certificate_attribute_strings.xml b/Corona-Warn-App/src/main/res/values/green_certificate_attribute_strings.xml
index 66f4eddbb..97061edf8 100644
--- a/Corona-Warn-App/src/main/res/values/green_certificate_attribute_strings.xml
+++ b/Corona-Warn-App/src/main/res/values/green_certificate_attribute_strings.xml
@@ -1,8 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2" tools:ignore="MissingTranslation">
<!-- ####################################
- Special string files for the strings that should always keep the german / englisch version independent from the selected system language
+ Special string files for the strings
+ that should always keep the german / english
+ version independent from the selected system language
###################################### -->
<!-- XTXT: Green Certificate Detail Screen Attribute: Name -->
<string name="green_certificate_attribute_name" translatable="false">"Name, Vorname / Name, First Name"</string>
--
GitLab