Strings, Adaptive Icons (#306)

* covid case inconsistency

* added translation tags

* text correction

* added smaller splash screen and asset for round icons

* launcher icons

Corona-Warn-App/src/main/AndroidManifest.xml

@@ -20,10 +20,10 @@
     <application
         android:name="de.rki.coronawarnapp.CoronaWarnApplication"
         android:allowBackup="false"
-        android:icon="@drawable/ic_app_launch_icon"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@drawable/ic_app_launch_icon"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 

Corona-Warn-App/src/main/res/drawable-v24/ic_launcher_foreground.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="0.486"
+      android:scaleY="0.486"
+      android:translateX="15.12"
+      android:translateY="15.12">
+    <path
+        android:pathData="M80.944,97.81L80.944,107.53L81.427,108.013L81.631,107.84C83.059,108.627 84.029,110.143 84.029,111.888C84.029,114.444 81.957,116.516 79.401,116.516C76.846,116.516 74.774,114.444 74.774,111.888C74.774,109.875 76.063,108.166 77.859,107.53L77.859,98.613L78.342,98.293L77.859,97.81C73.907,97.484 70.309,95.918 67.452,93.5L60.58,100.373C61.4,102.093 61.103,104.212 59.679,105.636C57.872,107.443 54.943,107.443 53.136,105.636C51.328,103.829 51.328,100.899 53.136,99.092C54.56,97.668 56.679,97.371 58.399,98.192L65.271,91.319C63,88.635 61.481,85.297 61.035,81.627L61.445,81.396L60.962,80.913L51.241,80.913C50.605,82.709 48.897,83.997 46.883,83.997C44.327,83.997 42.256,81.926 42.256,79.37C42.256,76.815 44.327,74.743 46.883,74.743C48.897,74.743 50.605,76.032 51.241,77.828L51.725,78.311L52.196,77.828L60.962,77.828C61.288,73.876 62.853,70.278 65.271,67.421L58.399,60.549C56.679,61.369 54.56,61.072 53.136,59.648C51.328,57.841 51.328,54.911 53.136,53.104C54.943,51.297 57.872,51.297 59.679,53.104C61.103,54.528 61.4,56.648 60.58,58.367L67.452,65.24C70.309,62.822 73.907,61.257 77.859,60.93L77.859,51.891L78.342,51.693L77.859,51.21C76.063,50.574 74.774,48.866 74.774,46.852C74.774,44.296 76.846,42.225 79.401,42.225C81.957,42.225 84.029,44.296 84.029,46.852C84.029,48.866 82.74,50.574 80.944,51.21L80.944,60.93L81.427,61.414L81.804,61.022C85.953,61.56 89.67,63.472 92.486,66.286L118.664,40.107C108.616,30.059 94.735,23.844 79.401,23.844C48.735,23.844 23.875,48.704 23.875,79.37C23.875,110.036 48.735,134.897 79.401,134.897C94.735,134.897 108.616,128.682 118.664,118.633L92.486,92.454C89.477,95.461 85.439,97.439 80.944,97.81Z"
+        android:strokeWidth="1"
+        android:fillType="nonZero"
+        android:strokeColor="#00000000">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startY="26.287256"
+            android:startX="71.2695"
+            android:endY="116.28546"
+            android:endX="71.2695"
+            android:type="linear">
+          <item android:offset="0.5" android:color="#FF59112B"/>
+          <item android:offset="1" android:color="#FFBC1200"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+    <path
+        android:pathData="M81.427,98.293L81.427,108.013C83.223,108.649 84.512,110.358 84.512,112.372C84.512,114.927 82.44,116.999 79.885,116.999C77.329,116.999 75.257,114.927 75.257,112.372C75.257,110.358 76.546,108.649 78.342,108.013L78.342,98.293C74.391,97.967 70.792,96.402 67.936,93.984L61.063,100.856C61.883,102.576 61.587,104.695 60.163,106.119C58.356,107.926 55.426,107.926 53.619,106.119C51.812,104.312 51.812,101.382 53.619,99.575C55.043,98.151 57.162,97.855 58.882,98.675L65.754,91.802C63.336,88.946 61.771,85.347 61.445,81.396L51.725,81.396C51.089,83.192 49.38,84.481 47.366,84.481C44.811,84.481 42.739,82.409 42.739,79.853C42.739,77.298 44.811,75.226 47.366,75.226C49.38,75.226 51.089,76.515 51.725,78.311L61.445,78.311C61.771,74.359 63.336,70.761 65.754,67.904L58.882,61.032C57.162,61.852 55.043,61.555 53.619,60.131C51.812,58.324 51.812,55.395 53.619,53.588C55.426,51.78 58.356,51.78 60.163,53.588C61.587,55.012 61.883,57.131 61.063,58.851L67.936,65.723C70.792,63.305 74.391,61.74 78.342,61.414L78.342,51.693C76.546,51.057 75.257,49.349 75.257,47.335C75.257,44.78 77.329,42.708 79.885,42.708C82.44,42.708 84.512,44.78 84.512,47.335C84.512,49.349 83.223,51.057 81.427,51.693L81.427,61.414C85.922,61.785 89.96,63.762 92.969,66.769L119.148,40.59C109.099,30.542 95.218,24.327 79.885,24.327C49.218,24.327 24.358,49.187 24.358,79.853C24.358,110.52 49.218,135.38 79.885,135.38C95.218,135.38 109.099,129.165 119.148,119.116L92.969,92.938C89.96,95.944 85.922,97.922 81.427,98.293Z"
+        android:strokeWidth="1"
+        android:fillType="nonZero"
+        android:strokeColor="#00000000">
+      <aapt:attr name="android:fillColor">
+        <gradient 
+            android:startY="135.38"
+            android:startX="71.753"
+            android:endY="24.327"
+            android:endX="71.753"
+            android:type="linear">
+          <item android:offset="0" android:color="#FFBC1200"/>
+          <item android:offset="0.67" android:color="#FF80CDEC"/>
+          <item android:offset="1" android:color="#FFBDE0F9"/>
+        </gradient>
+      </aapt:attr>
+    </path>
+  </group>
+</vector>

Corona-Warn-App/src/main/res/drawable/ic_app_launch_icon.xml

-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="512dp"
-    android:height="512dp"
-    android:viewportWidth="512"
-    android:viewportHeight="512">
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="evenOdd"
-        android:pathData="M0,0h512v512h-512z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillType="nonZero"
-        android:pathData="M283.374,318.493L283.374,351.876L285.025,353.536L285.722,352.941C290.598,355.644 293.909,360.848 293.909,366.844C293.909,375.62 286.834,382.735 278.107,382.735C269.38,382.735 262.306,375.62 262.306,366.844C262.306,359.927 266.707,354.06 272.84,351.876L272.84,321.251L274.49,320.153L272.84,318.493C259.346,317.373 247.058,311.997 237.303,303.693L213.833,327.296C216.634,333.201 215.621,340.48 210.758,345.371C204.587,351.576 194.582,351.576 188.411,345.371C182.24,339.165 182.24,329.103 188.411,322.897C193.274,318.006 200.512,316.987 206.384,319.804L229.854,296.201C222.096,286.985 216.911,275.521 215.387,262.914L216.787,262.122L215.136,260.462L181.943,260.462C179.771,266.63 173.937,271.056 167.059,271.056C158.333,271.056 151.258,263.941 151.258,255.165C151.258,246.388 158.333,239.274 167.059,239.274C173.937,239.274 179.771,243.7 181.943,249.868L183.593,251.527L185.204,249.868L215.136,249.868C216.251,236.297 221.596,223.939 229.854,214.129L206.384,190.526C200.512,193.343 193.274,192.324 188.411,187.433C182.24,181.227 182.24,171.165 188.411,164.959C194.582,158.753 204.587,158.753 210.758,164.959C215.621,169.85 216.634,177.129 213.833,183.034L237.303,206.637C247.058,198.333 259.346,192.957 272.84,191.836L272.84,160.791L274.49,160.114L272.84,158.454C266.707,156.27 262.306,150.403 262.306,143.486C262.306,134.71 269.38,127.595 278.107,127.595C286.834,127.595 293.909,134.71 293.909,143.486C293.909,150.403 289.508,156.27 283.374,158.454L283.374,191.836L285.025,193.496L286.311,192.152C300.48,194 313.173,200.566 322.789,210.23L412.188,120.323C377.873,85.814 330.469,64.469 278.107,64.469C173.384,64.469 88.489,149.847 88.489,255.165C88.489,360.483 173.384,445.861 278.107,445.861C330.469,445.861 377.873,424.516 412.188,390.007L322.789,300.1C312.513,310.427 298.724,317.219 283.374,318.493Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="250.33847"
-                android:endY="381.9429"
-                android:startX="250.33847"
-                android:startY="72.85993"
-                android:type="linear">
-                <item
-                    android:color="#FF59112B"
-                    android:offset="0.5" />
-                <item
-                    android:color="#FFBC1200"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillType="nonZero"
-        android:pathData="M285.025,320.153L285.025,353.536C291.158,355.719 295.559,361.587 295.559,368.503C295.559,377.28 288.484,384.395 279.757,384.395C271.03,384.395 263.956,377.28 263.956,368.503C263.956,361.587 268.357,355.719 274.49,353.536L274.49,320.153C260.996,319.032 248.708,313.657 238.953,305.352L215.483,328.955C218.285,334.861 217.271,342.14 212.408,347.03C206.237,353.236 196.232,353.236 190.061,347.03C183.891,340.824 183.891,330.762 190.061,324.556C194.924,319.666 202.162,318.647 208.034,321.464L231.504,297.861C223.246,288.05 217.901,275.693 216.787,262.122L183.593,262.122C181.421,268.29 175.587,272.716 168.71,272.716C159.983,272.716 152.908,265.601 152.908,256.825C152.908,248.048 159.983,240.933 168.71,240.933C175.587,240.933 181.421,245.359 183.593,251.527L216.787,251.527C217.901,237.957 223.246,225.599 231.504,215.788L208.034,192.185C202.162,195.003 194.924,193.983 190.061,189.093C183.891,182.887 183.891,172.825 190.061,166.619C196.232,160.413 206.237,160.413 212.408,166.619C217.271,171.509 218.285,178.788 215.483,184.694L238.953,208.297C248.708,199.992 260.996,194.617 274.49,193.496L274.49,160.114C268.357,157.93 263.956,152.062 263.956,145.146C263.956,136.369 271.03,129.255 279.757,129.255C288.484,129.255 295.559,136.369 295.559,145.146C295.559,152.062 291.158,157.93 285.025,160.114L285.025,193.496C300.374,194.771 314.164,201.563 324.439,211.889L413.838,121.982C379.524,87.473 332.119,66.129 279.757,66.129C175.034,66.129 90.139,151.506 90.139,256.825C90.139,362.143 175.034,447.52 279.757,447.52C332.119,447.52 379.524,426.176 413.838,391.667L324.439,301.76C314.164,312.086 300.374,318.878 285.025,320.153Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="251.98851"
-                android:endY="66.129"
-                android:startX="251.98851"
-                android:startY="447.52"
-                android:type="linear">
-                <item
-                    android:color="#FFBC1200"
-                    android:offset="0" />
-                <item
-                    android:color="#FF80CDEC"
-                    android:offset="0.67" />
-                <item
-                    android:color="#FFBDE0F9"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-</vector>

Corona-Warn-App/src/main/res/drawable/ic_splash_logo_round.xml

+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="160dp"
+    android:height="160dp"
+    android:viewportWidth="160"
+    android:viewportHeight="160">
+  <path
+      android:pathData="M80.944,97.81L80.944,107.53L81.427,108.013L81.631,107.84C83.059,108.627 84.029,110.143 84.029,111.888C84.029,114.444 81.957,116.516 79.401,116.516C76.846,116.516 74.774,114.444 74.774,111.888C74.774,109.875 76.063,108.166 77.859,107.53L77.859,98.613L78.342,98.293L77.859,97.81C73.907,97.484 70.309,95.918 67.452,93.5L60.58,100.373C61.4,102.093 61.103,104.212 59.679,105.636C57.872,107.443 54.943,107.443 53.136,105.636C51.328,103.829 51.328,100.899 53.136,99.092C54.56,97.668 56.679,97.371 58.399,98.192L65.271,91.319C63,88.635 61.481,85.297 61.035,81.627L61.445,81.396L60.962,80.913L51.241,80.913C50.605,82.709 48.897,83.997 46.883,83.997C44.327,83.997 42.256,81.926 42.256,79.37C42.256,76.815 44.327,74.743 46.883,74.743C48.897,74.743 50.605,76.032 51.241,77.828L51.725,78.311L52.196,77.828L60.962,77.828C61.288,73.876 62.853,70.278 65.271,67.421L58.399,60.549C56.679,61.369 54.56,61.072 53.136,59.648C51.328,57.841 51.328,54.911 53.136,53.104C54.943,51.297 57.872,51.297 59.679,53.104C61.103,54.528 61.4,56.648 60.58,58.367L67.452,65.24C70.309,62.822 73.907,61.257 77.859,60.93L77.859,51.891L78.342,51.693L77.859,51.21C76.063,50.574 74.774,48.866 74.774,46.852C74.774,44.296 76.846,42.225 79.401,42.225C81.957,42.225 84.029,44.296 84.029,46.852C84.029,48.866 82.74,50.574 80.944,51.21L80.944,60.93L81.427,61.414L81.804,61.022C85.953,61.56 89.67,63.472 92.486,66.286L118.664,40.107C108.616,30.059 94.735,23.844 79.401,23.844C48.735,23.844 23.875,48.704 23.875,79.37C23.875,110.036 48.735,134.897 79.401,134.897C94.735,134.897 108.616,128.682 118.664,118.633L92.486,92.454C89.477,95.461 85.439,97.439 80.944,97.81Z"
+      android:strokeWidth="1"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="26.287256"
+          android:startX="71.2695"
+          android:endY="116.28546"
+          android:endX="71.2695"
+          android:type="linear">
+        <item android:offset="0.5" android:color="#FF59112B"/>
+        <item android:offset="1" android:color="#FFBC1200"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:pathData="M81.427,98.293L81.427,108.013C83.223,108.649 84.512,110.358 84.512,112.372C84.512,114.927 82.44,116.999 79.885,116.999C77.329,116.999 75.257,114.927 75.257,112.372C75.257,110.358 76.546,108.649 78.342,108.013L78.342,98.293C74.391,97.967 70.792,96.402 67.936,93.984L61.063,100.856C61.883,102.576 61.587,104.695 60.163,106.119C58.356,107.926 55.426,107.926 53.619,106.119C51.812,104.312 51.812,101.382 53.619,99.575C55.043,98.151 57.162,97.855 58.882,98.675L65.754,91.802C63.336,88.946 61.771,85.347 61.445,81.396L51.725,81.396C51.089,83.192 49.38,84.481 47.366,84.481C44.811,84.481 42.739,82.409 42.739,79.853C42.739,77.298 44.811,75.226 47.366,75.226C49.38,75.226 51.089,76.515 51.725,78.311L61.445,78.311C61.771,74.359 63.336,70.761 65.754,67.904L58.882,61.032C57.162,61.852 55.043,61.555 53.619,60.131C51.812,58.324 51.812,55.395 53.619,53.588C55.426,51.78 58.356,51.78 60.163,53.588C61.587,55.012 61.883,57.131 61.063,58.851L67.936,65.723C70.792,63.305 74.391,61.74 78.342,61.414L78.342,51.693C76.546,51.057 75.257,49.349 75.257,47.335C75.257,44.78 77.329,42.708 79.885,42.708C82.44,42.708 84.512,44.78 84.512,47.335C84.512,49.349 83.223,51.057 81.427,51.693L81.427,61.414C85.922,61.785 89.96,63.762 92.969,66.769L119.148,40.59C109.099,30.542 95.218,24.327 79.885,24.327C49.218,24.327 24.358,49.187 24.358,79.853C24.358,110.52 49.218,135.38 79.885,135.38C95.218,135.38 109.099,129.165 119.148,119.116L92.969,92.938C89.96,95.944 85.922,97.922 81.427,98.293Z"
+      android:strokeWidth="1"
+      android:fillType="nonZero"
+      android:strokeColor="#00000000">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startY="135.38"
+          android:startX="71.753"
+          android:endY="24.327"
+          android:endX="71.753"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFBC1200"/>
+        <item android:offset="0.67" android:color="#FF80CDEC"/>
+        <item android:offset="1" android:color="#FFBDE0F9"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>

Corona-Warn-App/src/main/res/drawable/splash_screen.xml

@@ -6,7 +6,7 @@
 
     <!-- logo -->
     <item
-        android:drawable="@drawable/ic_splash_logo"
+        android:drawable="@drawable/ic_splash_logo_round"
         android:gravity="center" />
 
 </layer-list>
\ No newline at end of file

Corona-Warn-App/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file

Corona-Warn-App/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file

Corona-Warn-App/src/main/res/values/ic_launcher_background.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
\ No newline at end of file

Corona-Warn-App/src/main/res/values/strings.xml

@@ -137,8 +137,6 @@
                      Menu
     ###################################### -->
 
-    <!-- Todo pluralize strings when necessary -->
-    <!-- Todo include date formats when necessary -->
     <!-- XMIT: application overview -->
     <string name="menu_help">Überblick</string>
     <!-- XMIT: application information -->
@@ -183,17 +181,22 @@
 
     <!-- XTXT: risk card - no contact yet -->
     <string name="risk_card_body_contact">Bisher keine Risiko-Begegnungen</string>
+    <!-- XTXT: risk card - number of contacts for one or more -->
     <plurals name="risk_card_body_contact_value">
         <item quantity="one">%1$s Risikobegegnung</item>
         <item quantity="other">%1$s Risikobegegnungen</item>
     </plurals>
     <!-- XTXT: risk card - tracing active for x out of 14 days -->
     <string name="risk_card_body_saved_days">%1$s von 14 Tagen aktiv</string>
+    <!-- XTXT; risk card - no update done yet -->
     <string name="risk_card_body_not_yet_fetched">Kontakte wurden noch nicht überprüft.</string>
+    <!-- XTXT: risk card - last successful update -->
     <string name="risk_card_body_time_fetched">Aktualisiert: %1$s</string>
+    <!-- XTXT: risk card - next update -->
     <string name="risk_card_body_next_update">Tägliche Aktualisierung</string>
     <!-- XBUT: risk card - update risk -->
     <string name="risk_card_button_update">Aktualisieren</string>
+    <!-- XBUT: risk card - update risk with time display -->
     <string name="risk_card_button_cooldown">Aktualisierung in %1$s</string>
     <!-- XBUT: risk card - activate tracing -->
     <string name="risk_card_button_enable_tracing">Risiko-Ermittlung einschalten</string>
@@ -203,6 +206,7 @@
     <string name="risk_card_low_risk_headline">Niedriges Risiko</string>
     <!-- XHED: risk card - increased risk headline -->
     <string name="risk_card_increased_risk_headline">Erhöhtes Risiko</string>
+    <!-- XTXT: risk card - increased risk days since last contact -->
     <plurals name="risk_card_increased_risk_body_contact_last">
         <item quantity="one">%1$s Tag seit der letzten Begegnung</item>
         <item quantity="other">%1$s Tage seit der letzten Begegnung</item>
@@ -213,6 +217,7 @@
     <string name="risk_card_unknown_risk_body">Da Sie die Risiko-Ermittlung noch nicht lange genug aktiviert haben, konnten wir für Sie kein Infektionsrisiko berechnen.</string>
     <!-- XHED: risk card - tracing stopped headline, due to no possible calculation -->
     <string name="risk_card_no_calculation_possible_headline">Risiko-Ermittlung gestoppt</string>
+    <!-- XTXT: risk card - last successfully calculated risk level -->
     <string name="risk_card_no_calculation_possible_body_saved_risk">Letzte Ermittlung:<xliff:g id="line_break">\n</xliff:g>%1$s</string>
     <!-- XHED: risk card -  outdated risk headline, calculation isn't possible -->
     <string name="risk_card_outdated_risk_headline">Risiko-Ermittlung nicht möglich</string>
@@ -332,7 +337,7 @@
     <!-- XMSG: risk details - contact your doctor, bullet point -->
     <string name="risk_details_behavior_increased_body_1">- Ihre Hausärztin/Ihren Hausarzt</string>
     <!-- XMSG: risk details - panel doctor on-call service, bullet point -->
-    <string name="risk_details_behavior_increased_body_2">- Den Kassenärztlichen Bereitschaftsdienst unter der Telefonnummer: 116117</string>
+    <string name="risk_details_behavior_increased_body_2">- Den ärztlichen Bereitschaftsdienst unter der Telefonnummer: 116117</string>
     <!-- XMSG: risk details - public health department, bullet point -->
     <string name="risk_details_behavior_increased_body_3">- Ihr Gesundheitsamt</string>
     <!-- XHED: risk details - infection risk headline, below behaviors -->
@@ -345,13 +350,18 @@
     <string name="risk_details_information_body_unknown_risk">Da Sie die Risiko-Ermittlung noch nicht lange genug aktiviert haben, konnten wir für Sie kein Infektionsrisiko berechnen.</string>
     <!-- XMSG: risk details - risk calculation wasn't possible for 24h, below behaviors -->
     <string name="risk_details_information_body_outdated_risk">Ihre Risiko-Berechnung konnte seit mehr als 24 Stunden nicht aktualisiert werden.</string>
-    <string name="risk_details_information_body_low_risk">Sie haben ein niedriges Infektionsrisiko, da keine Begegnung mit nachweislich Coronapositiv getesteten Personen aufgezeichnet wurde oder sich Ihre Begegnung auf kurze Zeit und einen größeren Abstand beschränkt hat.</string> <!-- final -->
+    <!-- YTXT: risk details - low risk explanation text -->
+    <string name="risk_details_information_body_low_risk">Sie haben ein niedriges Infektionsrisiko, da keine Begegnung mit nachweislich Coronapositiv getesteten Personen aufgezeichnet wurde oder sich Ihre Begegnung auf kurze Zeit und einen größeren Abstand beschränkt hat.</string>
+    <!-- YTXT: risk details - increased risk explanation text with variable for day(s) since last contact -->
     <plurals name="risk_details_information_body_increased_risk">
         <item quantity="one">Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tag mindestens einer- Corona positiv-getesteten Person über einen längeren Zeitraum und mit einem geringen Abstand begegnet sind.</item>
         <item quantity="other">Sie haben ein erhöhtes Infektionsrisiko, da Sie zuletzt vor %1$s Tagen mindestens einer- Corona positiv-getesteten Person über einen längeren Zeitraum und mit einem geringen Abstand begegnet sind.</item>
     </plurals>
-    <string name="risk_details_information_body_notice">Das Infektionsrisiko wird anhand der Daten der Risiko-Ermittlung unter Berücksichtigung von Abstand und Dauer lokal auf Ihrem Smartphone berechnet. Ihr Infektionsrisiko ist für niemanden einsehbar und wird nicht weitergegeben.</string> <!-- final -->
+    <!-- YTXT: risk details - risk calculation explanation -->
+    <string name="risk_details_information_body_notice">Das Infektionsrisiko wird anhand der Daten der Risiko-Ermittlung unter Berücksichtigung von Abstand und Dauer lokal auf Ihrem Smartphone berechnet. Ihr Infektionsrisiko ist für niemanden einsehbar und wird nicht weitergegeben.</string>
+    <!-- NOTR -->
     <string name="risk_details_button_update">@string/risk_card_button_update</string>
+    <!-- NOTR -->
     <string name="risk_details_button_enable_tracing">@string/risk_card_button_enable_tracing</string>
     <!-- XACT: risk details page title -->
     <string name="risk_details_accessibility_title">Ihr Risikostatus</string>
@@ -500,11 +510,11 @@
     <!-- XHED: settings(notification) - notification page title -->
     <string name="settings_notifications_title">Benachrichtigungen</string>
     <!-- XHED: settings(notification) - multiline headline below illustration, active -->
-    <string name="settings_notifications_headline_active">Möchten Sie Benachrichtigungen zu Ihrem Covid-19-Risikostatus aktivieren?</string>
+    <string name="settings_notifications_headline_active">Möchten Sie Benachrichtigungen zu Ihrem COVID-19-Risikostatus aktivieren?</string>
     <!-- XHED: settings(notification) - multiline headline below illustration, inactive -->
     <string name="settings_notifications_headline_inactive">Benachrichtigungen sind ausgestellt</string>
     <!-- XTXT: settings(notification) - text in row on settings overview -->
-    <string name="settings_notifications_body_description">Erlauben Sie automatische Benachrichtigungen zu Covid-19-Risikostatus.</string>
+    <string name="settings_notifications_body_description">Erlauben Sie automatische Benachrichtigungen zu COVID-19-Risikostatus.</string>
     <string name="settings_notifications_body_active">Legen Sie fest, zu welchen Themen Sie informiert beiben möchten.</string>
     <!-- XTXT: settings(notification) - explains what the user has to do to activate settings -->
     <string name="settings_notifications_body_inactive">Um Benachrichtigungen zu aktivieren, müssen Sie Benachrichtigungen für die Corona-Warn-App in Ihren Geräte-Einstellungen zulassen.</string>
@@ -984,10 +994,15 @@
     <!-- ####################################
                Generic Error Messages
         ###################################### -->
+    <!-- XHED: error dialog - headline -->
     <string name="errors_generic_headline">Etwas ist schief gelaufen</string>
+    <!-- XTXT: error dialog - short text for error reason -->
     <string name="errors_generic_details_headline">Ursache</string>
+    <!-- XBUT: error dialog - button close -->
     <string name="errors_generic_button_positive">Okay</string>
+    <!-- XBUT: error dialog - button show details -->
     <string name="errors_generic_button_negative">Details</string>
+    <!-- XTXT: error dialog - text when no error description is available  -->
     <string name="errors_generic_text_unknown_error_cause">Ein unbekanntes Problem ist aufgetreten</string>
 
     <!-- ####################################