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 fc49c3ebb20fe28e2e6b205f8fadb43ddeb2e628..076fd4c95532f602e7e46778b861fe7e9d834f6d 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 &gt; 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 &lt; 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 0000000000000000000000000000000000000000..b641a9be20ae4076fa743daa0b5ede91997136db
--- /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 &gt; 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 &lt; 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 66f4eddbb30c0dc5c6e1a415b625df29fe6f5f72..97061edf82bca7596eb2cceb9b44db8599dabcb5 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>