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 00fa392059492859cdd5bf40bda047d7d1bb48d9..52d155bb37cdcc1e113f0f795856f0f7f5343980 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
@@ -1,103 +1,103 @@
<?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">
<!-- ####################################
- Contact Diary
- ###################################### -->
- <string name="contact_diary_day_person_tab_title">""</string>
- <string name="contact_diary_day_person_fab_title">""</string>
- <string name="contact_diary_day_location_tab_title">""</string>
- <string name="contact_diary_day_location_fab_title">""</string>
- <string name="contact_diary_location_list_no_items_title">""</string>
- <string name="contact_diary_location_list_no_items_subtitle">""</string>
- <string name="contact_diary_person_list_no_items_title">""</string>
- <string name="contact_diary_person_list_no_items_subtitle">""</string>
- <string name="contact_diary_person_bottom_sheet_title">""</string>
- <string name="contact_diary_person_bottom_sheet_text_input_hint">""</string>
- <string name="contact_diary_person_bottom_sheet_save_button">""</string>
- <string name="contact_diary_location_bottom_sheet_title">""</string>
- <string name="contact_diary_location_bottom_sheet_text_input_hint">""</string>
- <string name="contact_diary_location_bottom_sheet_save_button">""</string>
+ Contact Diary
+ ###################################### -->
+ <string name="contact_diary_day_person_tab_title">"People"</string>
+ <string name="contact_diary_day_person_fab_title">"Person"</string>
+ <string name="contact_diary_day_location_tab_title">"Places"</string>
+ <string name="contact_diary_day_location_fab_title">"Place"</string>
+ <string name="contact_diary_location_list_no_items_title">"No places defined yet"</string>
+ <string name="contact_diary_location_list_no_items_subtitle">"Create a place and add it to your contact journal."</string>
+ <string name="contact_diary_person_list_no_items_title">"No people defined yet"</string>
+ <string name="contact_diary_person_list_no_items_subtitle">"Create a person and add them to your contact journal."</string>
+ <string name="contact_diary_person_bottom_sheet_title">"Person"</string>
+ <string name="contact_diary_person_bottom_sheet_text_input_hint">"First name, last name"</string>
+ <string name="contact_diary_person_bottom_sheet_save_button">"Save"</string>
+ <string name="contact_diary_location_bottom_sheet_title">"Place"</string>
+ <string name="contact_diary_location_bottom_sheet_text_input_hint">"Description"</string>
+ <string name="contact_diary_location_bottom_sheet_save_button">"Save"</string>
<!-- XHED: Title for the contact diary card displayed in the homescreen -->
- <string name="contact_diary_homescreen_card_header">""</string>
+ <string name="contact_diary_homescreen_card_header">"Contact Journal"</string>
<!-- XTXT: Body for the contact diary card displayed in the homescreen -->
- <string name="contact_diary_homescreen_card_body">""</string>
+ <string name="contact_diary_homescreen_card_body">"Keep track of where you have been and whom you met."</string>
<!-- XBUT: Button text for the contact diary card button in the homescreen -->
- <string name="contact_diary_homescreen_card_button_text">""</string>
+ <string name="contact_diary_homescreen_card_button_text">"Manage Journal"</string>
<!-- XBUT: Button text for the contact diary card button in the homescreen -->
- <string name="contact_diary_onboarding_button_text">""</string>
+ <string name="contact_diary_onboarding_button_text">"Manage Journal"</string>
<!-- XTXT: Title for the contact diary onboarding screen -->
- <string name="contact_diary_information_card_title">""</string>
+ <string name="contact_diary_information_card_title">"Keep track of your contacts."</string>
<!-- XTXT: Contact diary onboarding screen -->
- <string name="contact_diary_onboarding_body">""</string>
+ <string name="contact_diary_onboarding_body">"Create an overview of your contacts in the last 14 days, so you’ll have a complete list at hand quickly if needed."</string>
<!-- XTXT: Contact diary onboarding screen first functionality -->
- <string name="contact_diary_onboarding_functionality_first_section">""</string>
+ <string name="contact_diary_onboarding_functionality_first_section">"Enter the people you have met."</string>
<!-- XTXT: Contact diary onboarding screen second functionality -->
- <string name="contact_diary_onboarding_functionality_second_section">""</string>
+ <string name="contact_diary_onboarding_functionality_second_section">"Enter the places where you’ve encountered others."</string>
<!-- XTXT: Contact diary onboarding screen third functionality -->
- <string name="contact_diary_onboarding_functionality_third_section">""</string>
+ <string name="contact_diary_onboarding_functionality_third_section">"You are the only one who can access your journal entries. Your entries will be saved only on your smartphone."</string>
<!-- XTXT: Contact diary onboarding screen fourth functionality -->
- <string name="contact_diary_onboarding_functionality_fourth_section">""</string>
+ <string name="contact_diary_onboarding_functionality_fourth_section">"You can remove entries for people and places from your journal at any time. Journal entries will be deleted automatically after 16 days."</string>
<!-- XTXT: Contact diary onboarding screen fifth functionality -->
- <string name="contact_diary_onboarding_functionality_fifth_section">""</string>
+ <string name="contact_diary_onboarding_functionality_fifth_section">"You can export your contact journal in plain text format and then print out the entries, edit them, or provide them to your public health authority as needed."</string>
<!-- XTXT: Title for the contact diary onboarding screen -->
- <string name="contact_diary_title">""</string>
+ <string name="contact_diary_title">"Contact Journal"</string>
<!-- XTXT: Body for legal information of the contact diary onboarding screen -->
- <string name="contact_diary_onboarding_legal_information">""</string>
+ <string name="contact_diary_onboarding_legal_information">"For more information, please refer to the privacy notice."</string>
<!-- XTXT: Menu information entry for contact diary overview screen -->
- <string name="menu_contact_diary_information">""</string>
+ <string name="menu_contact_diary_information">"Information"</string>
<!-- XTXT: Menu export entry for contact diary overview screen -->
- <string name="menu_contact_export_entries">""</string>
+ <string name="menu_contact_export_entries">"Export Entries"</string>
<!-- XTXT: Menu edit persons entry for contact diary overview screen -->
- <string name="menu_contact_diary_edit_persons">""</string>
+ <string name="menu_contact_diary_edit_persons">"Edit People"</string>
<!-- XTXT: Menu edit locations entry for contact diary overview screen -->
- <string name="menu_contact_diary_edit_locations">""</string>
+ <string name="menu_contact_diary_edit_locations">"Edit Places"</string>
<!-- XTXT: Title for contact diary overview screen -->
- <string name="contact_diary_overview_title">""</string>
+ <string name="contact_diary_overview_title">"Contact Journal"</string>
<!-- XTXT: Subtitle for contact diary overview screen -->
- <string name="contact_diary_overview_subtitle">""</string>
+ <string name="contact_diary_overview_subtitle">"Write down the people you have met and places you have visited."</string>
<!-- XTXT: Header for contact diary overview screen -->
- <string name="contact_diary_overview_header">""</string>
+ <string name="contact_diary_overview_header">"Start Page"</string>
<!-- XTXT: content description of contact journal image on home screen -->
- <string name="contact_diary_homescreen_card_image_content_description">""</string>
+ <string name="contact_diary_homescreen_card_image_content_description">"A closed book with a bookmark"</string>
<!-- XTXT: content description of contact journal header image on onboarding screen -->
- <string name="contact_diary_onboarding_image_content_description">""</string>
+ <string name="contact_diary_onboarding_image_content_description">"Several people are outside, looking at their smartphones."</string>
<!-- XTXT: content description of contact journal background image on edit persons screen -->
- <string name="contact_diary_edit_persons_image_content_description">""</string>
+ <string name="contact_diary_edit_persons_image_content_description">"A silhouette of a woman who is walking across a meadow."</string>
<!-- XTXT: content description of contact journal background image on edit locations screen -->
- <string name="contact_diary_edit_locations_image_content_description">""</string>
+ <string name="contact_diary_edit_locations_image_content_description">"A building is marked with a location flag."</string>
<!-- XHED: Title for the contact diary edit locations -->
- <string name="contact_diary_edit_locations_title">""</string>
+ <string name="contact_diary_edit_locations_title">"Edit Places"</string>
<!-- XHED: Title for the contact diary edit persons -->
- <string name="contact_diary_edit_persons_title">""</string>
+ <string name="contact_diary_edit_persons_title">"Edit People"</string>
<!-- XBUT: Button text for the contact diary edit screen button to delete all locations/persons -->
- <string name="contact_diary_remove_all_button">""</string>
+ <string name="contact_diary_remove_all_button">"Remove All"</string>
<!-- XBUT: Button text for the contact diary dialog to delete all locations/persons -->
- <string name="contact_diary_delete_button_positive">""</string>
+ <string name="contact_diary_delete_button_positive">"Remove"</string>
<!-- XBUT: Button text for the contact diary dialog to delete all locations/persons -->
- <string name="contact_diary_delete_button_negative">""</string>
+ <string name="contact_diary_delete_button_negative">"Cancel"</string>
<!-- XHED: Title for the contact diary dialog to delete all locations -->
- <string name="contact_diary_delete_locations_title">""</string>
+ <string name="contact_diary_delete_locations_title">"Do you really want to remove all places?"</string>
<!-- XHED: Title for the contact diary dialog to delete all persons -->
- <string name="contact_diary_delete_persons_title">""</string>
+ <string name="contact_diary_delete_persons_title">"Do you really want to remove all people?"</string>
<!-- XTXT: Message for the contact diary dialog to delete all locations -->
- <string name="contact_diary_delete_locations_message">""</string>
+ <string name="contact_diary_delete_locations_message">"If you remove a place, all the entries for that place will be removed from your journal."</string>
<!-- XTXT: Message for the contact diary dialog to delete all persons -->
- <string name="contact_diary_delete_persons_message">""</string>
+ <string name="contact_diary_delete_persons_message">"If you remove a person, all the entries for that person will be removed from your journal."</string>
<!-- XACT: edit icon description for screen readers -->
- <string name="contact_diary_edit_icon_content_description">""</string>
+ <string name="contact_diary_edit_icon_content_description">"Edit Entry"</string>
<!-- XACT: edit icon description for screen readers -->
- <string name="contact_diary_delete_icon_content_description">""</string>
+ <string name="contact_diary_delete_icon_content_description">"Delete Entry"</string>
<!-- XHED: Title for the contact diary dialog to delete delete a single location -->
- <string name="contact_diary_delete_location_title">""</string>
+ <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">""</string>
+ <string name="contact_diary_delete_person_title">"Do you really want to remove this person?"</string>
<!-- XHED: Title for the contact journal export email subject -->
<string name="contact_diary_export_subject" translatable="false">"Mein Kontakt-Tagebuch"</string>
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 33d0390bcdfe62891af0f2559c214eb2eb823ddf..d95ca3cae07f8a3f6f8b83873cee1eaa69a27819 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -99,9 +99,9 @@
<!-- XTXT: Notification body - Reminder to share a positive test result-->
<string name="notification_body_share_positive_result">"Please share your test result and warn others."</string>
<!-- XHED: Notification title - test result is ready -->
- <string name="notification_headline_test_result_ready">"Your Test Result"</string>
+ <string name="notification_headline_test_result_ready">"Corona-Warn-App"</string>
<!-- XTXT: Notification body - test result is ready -->
- <string name="notification_body_test_result_ready">"There is important news. Please open your Corona-Warn-App."</string>
+ <string name="notification_body_test_result_ready">"You have new messages from your Corona-Warn-App."</string>
<!-- ####################################
App Auto Update
@@ -158,7 +158,7 @@
<string name="risk_card_check_failed_no_internet_restart_button">"Restart"</string>
<!-- XTXT: risk card - Low risk state - No days with low risk encounters -->
- <string name="risk_card_low_risk_no_encounters_body">"No exposure up to now"</string>
+ <string name="risk_card_low_risk_no_encounters_body">"No exposures"</string>
<!-- XTXT: risk card - Low risk state - Days with low risk encounters -->
<plurals name="risk_card_low_risk_encounter_days_body">
<item quantity="one">"Exposures with low risk on one day"</item>
@@ -214,13 +214,13 @@
<!-- XHED: Share app link page title -->
<string name="main_share_title">"Share the Corona-Warn-App"</string>
<!-- XHED: Share app link page subtitle -->
- <string name="main_share_headline">"Let\'s fight coronavirus together"</string>
+ <string name="main_share_headline">"Let’s fight coronavirus together"</string>
<!-- YTXT: Share app link page body -->
<string name="main_share_body">"The more people who use the app, the faster we can break chains of infection. Please invite your family and friends to download the app."</string>
<!-- XBUT: Share app link page button -->
<string name="main_share_button">"Send Download Link"</string>
<!-- YMSG: Message when sharing is executed -->
- <string name="main_share_message">"Fighting coronavirus together"<xliff:g id="line_break">"\n"</xliff:g>"I\'m in on this, you too?"<xliff:g id="line_break">"\n"</xliff:g><xliff:g id="link_play_store">"https://www.corona-warn-app.de"</xliff:g>"\n"<xliff:g id="line_break">"\n"</xliff:g></string>
+ <string name="main_share_message">"Fighting coronavirus together"<xliff:g id="line_break">"\n"</xliff:g>"I’m in on this, you too?"<xliff:g id="line_break">"\n"</xliff:g><xliff:g id="link_play_store">"https://www.corona-warn-app.de"</xliff:g>"\n"<xliff:g id="line_break">"\n"</xliff:g></string>
<!-- XACT: main (share) - illustraction description, explanation image -->
<string name="main_share_illustration_description">"A man shares the Corona-Warn-App with four other persons."</string>
@@ -235,7 +235,7 @@
<!-- XHED: App overview subtitle for tracing explanation-->
<string name="main_overview_subtitle_tracing">"Exposure Logging"</string>
<!-- YTXT: App overview body text about tracing -->
- <string name="main_overview_body_tracing">"Exposure logging is one of the three central features of the app. When you activate it, encounters with people\'s smartphones are logged. You don\'t have to do anything else."</string>
+ <string name="main_overview_body_tracing">"Exposure logging is one of the three central features of the app. When you activate it, encounters with people’s smartphones are logged. You don’t have to do anything else."</string>
<!-- XHED: App overview subtitle for risk explanation -->
<string name="main_overview_subtitle_risk">"Risk of Infection"</string>
<!-- YTXT: App overview body text about risk levels -->
@@ -397,11 +397,11 @@
<!-- XACT: Onboarding (together) page title -->
<string name="onboarding_onboarding_accessibility_title">"Onboarding page 1 of 6: Fighting coronavirus together"</string>
<!-- XHED: onboarding(together) - fight corona -->
- <string name="onboarding_headline">"Let\'s fight coronavirus together"</string>
+ <string name="onboarding_headline">"Let’s fight coronavirus together"</string>
<!-- XHED: onboarding(together) - two/three line headline under an illustration -->
<string name="onboarding_subtitle">"More protection for you and for us all. By using the Corona-Warn-App we can break chains of infection much quicker."</string>
<!-- YTXT: onboarding(together) - inform about the app -->
- <string name="onboarding_body">"Turn your smartphone into a coronavirus warning system. Get an overview of your risk status and find out whether you\'ve had close contact with anyone diagnosed with coronavirus in the last 14 days."</string>
+ <string name="onboarding_body">"Turn your smartphone into a coronavirus warning system. Get an overview of your risk status and find out whether you’ve had close contact with anyone diagnosed with coronavirus in the last 14 days."</string>
<!-- YTXT: onboarding(together) - explain application -->
<string name="onboarding_body_emphasized">"The app logs encounters between individuals by exchanging encrypted, random IDs between their smartphones, whereby no personal data whatsoever is accessed."</string>
<!-- XACT: onboarding(together) - illustraction description, header image -->
@@ -448,7 +448,7 @@
<!-- XACT: onboarding(tracing) - dialog about energy optimized header text -->
<string name="onboarding_energy_optimized_dialog_headline">"Allow prioritized background activity"</string>
<!-- YMSI: onboarding(tracing) - dialog about energy optimized -->
- <string name="onboarding_energy_optimized_dialog_body">"Enable prioritized background activity to allow the app to determine your risk status in the background any time (recommended). This disables battery life optimization for the Corona-Warn-App only. We do not expect this to cause a significant decrease in your smartphone\'s battery life.\n\nIf you do not allow this setting, we recommend you to open the app manually at least once every 24 hours."</string>
+ <string name="onboarding_energy_optimized_dialog_body">"Enable prioritized background activity to allow the app to determine your risk status in the background any time (recommended). This disables battery life optimization for the Corona-Warn-App only. We do not expect this to cause a significant decrease in your smartphone’s battery life.\n\nIf you do not allow this setting, we recommend you to open the app manually at least once every 24 hours."</string>
<!-- XBUT: onboarding(tracing) - dialog about energy optimized, open device settings -->
<string name="onboarding_energy_optimized_dialog_button_positive">"Allow"</string>
<!-- XBUT: onboarding(tracing) - dialog about energy optimized, continue in app -->
@@ -464,7 +464,7 @@
<!-- XHED: onboarding(tracing) - location explanation for bluetooth headline -->
<string name="onboarding_tracing_location_headline">"Allow location access"</string>
<!-- XTXT: onboarding(tracing) - location explanation for bluetooth body text -->
- <string name="onboarding_tracing_location_body">"Your location cannot be accessed. Google and/or Android requires access to your smartphone\'s location to use Bluetooth."</string>
+ <string name="onboarding_tracing_location_body">"Your location cannot be accessed. Google and/or Android requires access to your smartphone’s location to use Bluetooth."</string>
<!-- XBUT: onboarding(tracing) - button enable tracing -->
<string name="onboarding_tracing_location_button">"Open Device Settings"</string>
<!-- XACT: Onboarding (test) page title -->
@@ -472,7 +472,7 @@
<!-- XHED: onboarding(test) - about positive tests -->
<string name="onboarding_test_headline">"If you are diagnosed with coronavirus…"</string>
<!-- XHED: onboarding(test) - two/three line headline under an illustration -->
- <string name="onboarding_test_subtitle">"… please report this in the Corona-Warn-App. Sharing your test results is voluntary and secure. Please do this for the sake of everyone\'s health."</string>
+ <string name="onboarding_test_subtitle">"… please report this in the Corona-Warn-App. Sharing your test results is voluntary and secure. Please do this for the sake of everyone’s health."</string>
<!-- YTXT: onboarding(test) - explain test -->
<string name="onboarding_test_body">"Your notification is encrypted securely and processed on a secure server. People whose encrypted random IDs your smartphone has collected will now receive a warning along with information about what they should now do."</string>
<!-- XACT: onboarding(test) - illustraction description, header image -->
@@ -653,7 +653,7 @@
<!-- XHED: Page title for about information page, also menu item / button text -->
<string name="information_about_title">"About the App"</string>
<!-- XHED: Subtitle for about information page -->
- <string name="information_about_headline">"Let\'s fight coronavirus together"</string>
+ <string name="information_about_headline">"Let’s fight coronavirus together"</string>
<!-- YTXT: Body text for about information page -->
<string name="information_about_body_emphasized">"Robert Koch Institute (RKI) is Germany’s federal public health body. The RKI publishes the Corona-Warn-App on behalf of the Federal Government. The app is intended as a digital complement to public health measures already introduced: social distancing, hygiene, and face masks."</string>
<!-- YTXT: Body text for about information page -->
@@ -755,7 +755,7 @@
<!-- XHED: Dialog title for already paired test error: tan -->
<string name="submission_error_dialog_web_test_paired_title_tan">"TAN is invalid"</string>
<!-- XMSG: Dialog body for already paired test via tan - error: tan -->
- <string name="submission_error_dialog_web_test_paired_body_tan">"The TAN is invalid or has already been used. For further information, call the number listed under \"Request TAN\"."</string>
+ <string name="submission_error_dialog_web_test_paired_body_tan">"The TAN is invalid or has already been used. For further information, call the number listed under “Request TANâ€."</string>
<!-- XBUT: Positive button for already paired test error -->
<string name="submission_error_dialog_web_test_paired_button_positive">"Back"</string>
@@ -862,7 +862,7 @@
<!-- XHED: Page headline for pending test result next steps -->
<string name="submission_test_result_pending_steps_waiting_heading">"Your test result is not available yet."</string>
<!-- YTXT: Body text for next steps section of waiting test result page -->
- <string name="submission_test_result_pending_steps_waiting_body">"As soon as your test result becomes available, it will be displayed in the app."</string>
+ <string name="submission_test_result_pending_steps_waiting_body">"As soon as your test result becomes available, it will be displayed in the app.\n\nYou will also receive your test result outside of the app. The public health authorities will notify you, should your test be positive.\n\nIn you are notified of a positive test result outside the app, please remove the test currently registered in the app. Call the number shown under “Request TAN†to get a TAN. You can then use this TAN to register your result in the app and warn others."</string>
<!-- XBUT: test result pending : refresh button -->
<string name="submission_test_result_pending_refresh_button">"Update"</string>
<!-- XBUT: test result pending : remove the test button -->
@@ -1023,8 +1023,8 @@
<!-- YTXT: submission done further info bullet points -->
<string-array name="submission_done_further_info_bullet_points">
<item>"Your quarantine period is usually 14 days. Please observe your symptoms and monitor how they develop."</item>
- <item>"You will be asked by your public health authority to create a list of people you have had contact with. This should include all people with whom you have had close contact with (less than 2 meters, face-to-face conversation) for over 15 minutes in the two days before you developed symptoms."</item>
- <item>"Please particularly consider people who will not be notified directly by the app since they don\'t own a smartphone, or haven\'t installed the app."</item>
+ <item>"You will be asked by the public health authority to create a list of people you have had contact with. This should include all people with whom you have had close contact with (less than 2 meters, face-to-face conversation) for over 15 minutes in the two days before you developed symptoms. You can use your contact journal for this: simply export the entries and then print them out or send them via e-mail."</item>
+ <item>"Please particularly consider people who will not be notified directly by the app since they don’t own a smartphone, or haven’t installed the app."</item>
<item>"Even when you no longer have any symptoms and you feel well again, you could still be infectious."</item>
</string-array>
<!-- XBUT: submission finished button -->
@@ -1276,7 +1276,7 @@
<!-- XTXT: error dialog - detailed text if there is an error during external navigation / external action -->
<string name="errors_external_action">"You cannot perform this action. Please contact the hotline."</string>
<!-- XTXT: error dialog - phone still needs Google Play Services or Google Mobile Services update -->
- <string name="errors_google_update_needed">"Your Corona-Warn-App is correctly installed, but the \"COVID-19 Exposure Notifications System\" is not available on your smartphone\'s operating system. This means that you cannot use the Corona-Warn-App. For further information, please see our FAQ page: https://www.coronawarn.app/en/faq/"</string>
+ <string name="errors_google_update_needed">"Your Corona-Warn-App is correctly installed, but the “COVID-19 Exposure Notifications System†is not available on your smartphone’s operating system. This means that you cannot use the Corona-Warn-App. For further information, please see our FAQ page: https://www.coronawarn.app/en/faq/"</string>
<!-- XTXT: error dialog - either Google API Error (10) or reached request limit per day -->
<string name="errors_google_api_error">"The Corona-Warn-App is running correctly, but we cannot update your current risk status. Exposure logging remains active and is working correctly. For further information, please see our FAQ page: https://www.coronawarn.app/en/faq/"</string>
<!-- XTXT: error dialog - Error title when the provideDiagnosisKeys quota limit was reached. -->