diff --git a/Corona-Warn-App/src/main/res/layout/fragment_information_technical.xml b/Corona-Warn-App/src/main/res/layout/fragment_information_technical.xml
index 2d648ab3d6bedc5e45b1281e73caa299ca072adc..056e4cb18b2b57ed87b826e47f18c7fa4710073d 100644
--- a/Corona-Warn-App/src/main/res/layout/fragment_information_technical.xml
+++ b/Corona-Warn-App/src/main/res/layout/fragment_information_technical.xml
@@ -34,12 +34,13 @@
android:clipToPadding="false"
android:scrollbarStyle="outsideOverlay">
+ <!-- Won't be translated, for that it's hardcoded -->
<include
android:id="@+id/information_technical_header_details"
layout="@layout/include_information_details"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:body="@{FormatterHelper.parseHtmlFromAssets(context, @string/information_technical_html_path)}"
+ app:body='@{FormatterHelper.parseHtmlFromAssets(context, "technical.html")}'
app:illustration="@{@drawable/ic_information_illustration_technical}"
app:illustrationDescription="@{@string/information_technical_illustration_description}" />
diff --git a/Corona-Warn-App/src/main/res/values-de/strings.xml b/Corona-Warn-App/src/main/res/values-de/strings.xml
index acbccdd6b1ae0e552fe92c1f41441338118c4f0e..55d0a29283b21d7e3b5a919631106225fb4dfdf4 100644
--- a/Corona-Warn-App/src/main/res/values-de/strings.xml
+++ b/Corona-Warn-App/src/main/res/values-de/strings.xml
@@ -2012,17 +2012,21 @@
Incompatibility warning card
###################################### -->
+ <!-- XHED: Incompitability card title -->
<string name="incompatible_headline">Inkompatibilitätswarnung</string>
+ <!-- XTXT: Incompitability card content -->
<string name="incompatible_advertising_not_supported">Ihr Smartphone kann
COVID-19-Benachrichtigungen über die Bluetooth-Schnittstelle lediglich empfangen, jedoch
nicht versenden. Das heißt, dass Sie über diese Schnittstelle von Risiko-Begegnungen gewarnt
werden können, jedoch nicht selbst warnen können. Warnungen, die im Rahmen von Check-ins
erfolgen, können Sie sowohl empfangen als auch selbst versenden.
</string>
+ <!-- XTXT: Incompitability card content -->
<string name="incompatible_scanning_not_supported">Ihr Smartphone kann
COVID-19-Benachrichtigungen über die Bluetooth-Schnittstelle weder empfangen noch senden.
Warnungen, die im Rahmen von Check-ins erfolgen, können Sie sowohl empfangen als auch selbst
versenden.
</string>
+ <!-- XTXT: Incompitability faq link -->
<string name="incompatible_link">"https://www.coronawarn.app/de/faq/#incompatibility_warning"</string>
</resources>
diff --git a/Corona-Warn-App/src/main/res/values/antigen_strings.xml b/Corona-Warn-App/src/main/res/values/antigen_strings.xml
index 33f7d90f08b49c644ff0107aaa07c45d5d29ca8e..f4319848e488e04a6f4167d3c17a650f198e8cd8 100644
--- a/Corona-Warn-App/src/main/res/values/antigen_strings.xml
+++ b/Corona-Warn-App/src/main/res/values/antigen_strings.xml
@@ -141,60 +141,60 @@
Rapid Antigen Test Profile
###################################### -->
<!-- XHED: Create RAT profile card title -->
- <string name="rat_profile_create_card_title">Schnelltest-Profil anlegen</string>
+ <string name="rat_profile_create_card_title">"Create Rapid Test Profile"</string>
<!-- XTXT: Create RAT profile card subtitle -->
- <string name="rat_profile_create_card_subtitle">Legen Sie ein Profil mit Ihren persönlichen Daten an, die Sie dann per QR-Code bei jedem Schnelltest vorlegen können.</string>
+ <string name="rat_profile_create_card_subtitle">"You can create a profile with your personal data, which you can submit via QR code during every rapid test."</string>
<!-- XHED: Open RAT profile card title -->
- <string name="rat_profile_open_card_title">Schnelltest-Profil</string>
+ <string name="rat_profile_open_card_title">"Rapid Test Profile"</string>
<!-- XTXT: Open RAT profile card subtitle -->
- <string name="rat_profile_open_card_subtitle">Sparen Sie Zeit und zeigen Sie Ihr Schnelltest-Profil bei der Teststelle vor.</string>
+ <string name="rat_profile_open_card_subtitle">"Save time and present your rapid test profile at the testing point."</string>
<!-- XHED: Create RAT profile title -->
- <string name="rat_profile_create_title">Schnelltest-Profil</string>
+ <string name="rat_profile_create_title">"Rapid Test Profile"</string>
<!-- XTXT: Create RAT profile first name hint -->
- <string name="rat_profile_create_first_name_hint">Vorname</string>
+ <string name="rat_profile_create_first_name_hint">"First Name"</string>
<!-- XTXT: Create RAT profile last name hint -->
- <string name="rat_profile_create_last_name_hint">Nachname</string>
+ <string name="rat_profile_create_last_name_hint">"Last Name"</string>
<!-- XTXT: Create RAT profile birth date hint -->
- <string name="rat_profile_create_birth_date_hint">Geburtsdatum</string>
+ <string name="rat_profile_create_birth_date_hint">"Date of Birth"</string>
<!-- XBUT: Create RAT profile save button -->
- <string name="rat_profile_create_button">Speichern</string>
+ <string name="rat_profile_create_button">"Save"</string>
<!-- XTXT: Create RAT profile description -->
- <string name="rat_profile_create_description">Legen Sie Ihre persönlichen Daten als QR-Code ab, um die Registrierung an der Teststelle zu beschleunigen.</string>
+ <string name="rat_profile_create_description">"Save your personal data as a QR code to speed up registration at testing points."</string>
<!-- XTXT: Create RAT profile street hint -->
- <string name="rat_profile_create_street_hint">Straße und Hausnummer</string>
+ <string name="rat_profile_create_street_hint">"Street and House Number"</string>
<!-- XTXT: Create RAT profile post code hint -->
- <string name="rat_profile_create_zip_code_hint">PLZ</string>
+ <string name="rat_profile_create_zip_code_hint">"Postal Code"</string>
<!-- XTXT: Create RAT profile city hint -->
- <string name="rat_profile_create_city_hint">Ort</string>
+ <string name="rat_profile_create_city_hint">"City"</string>
<!-- XTXT: Create RAT profile phone hint -->
- <string name="rat_profile_create_phone_hint">Telefonnummer</string>
+ <string name="rat_profile_create_phone_hint">"Phone Number"</string>
<!-- XTXT: Create RAT profile email hint -->
- <string name="rat_profile_create_email_hint">E-Mail-Adresse</string>
+ <string name="rat_profile_create_email_hint">"E-Mail Address"</string>
<!--RAT profile onboarding-->
- <string name="rat_profile_onboarding_image_content_description">Eine Frau mit einem Smartphone in der Hand steht vor einem Gebäude. Ein QR-Code symbolisiert das zu scannende Schnelltest-Profil.</string>
+ <string name="rat_profile_onboarding_image_content_description">"A woman with a smartphone in her hand is standing in front of a building. A QR code symbolizes the rapid test profile to be scanned."</string>
<!-- XTXT: Create RAT profile onboarding title -->
- <string name="rat_profile_onboarding_title">Legen Sie Ihre persönlichen Daten als QR-Code ab, um die Registrierung an der Teststelle zu beschleunigen.</string>
+ <string name="rat_profile_onboarding_title">"Save your personal data as a QR code to speed up registration at testing points."</string>
<!-- XTXT: Create RAT profile onboarding subtitle -->
- <string name="rat_profile_onboarding_subtitle">Mit Ihrem eigenen Schnelltest-Profil müssen Sie Ihre persönlichen Daten nicht bei jedem neuen Schnelltest erneut ausfüllen.</string>
+ <string name="rat_profile_onboarding_subtitle">"When you create a rapid test profile, you will not have to fill out your personal data again before every rapid test."</string>
<!-- XTXT: Create RAT profile onboarding next button -->
- <string name="rat_profile_onboarding_next">Weiter</string>
+ <string name="rat_profile_onboarding_next">"Continue"</string>
<!-- XTXT: Create RAT profile onboarding privacy -->
- <string name="rat_profile_onboarding_privacy">Ausführliche Informationen zur Datenverarbeitung und Ihrem Einverständnis.</string>
+ <string name="rat_profile_onboarding_privacy">"Detailed Information on Data Processing and Your Consent"</string>
<!-- XTXT: Create RAT Qr code profile description-->
- <string name="rat_qr_code_profile_description">Bitte zeigen Sie diesen QR-Code an der Teststelle vor, um Ihre persönlichen Daten schnell erfassen zu lassen. Bitte halten zusätzlich Sie Ihren Personalausweis bereit.</string>
+ <string name="rat_qr_code_profile_description">"Please present this QR code at the testing point so your personal data can be recorded more quickly. Also keep your ID card at hand."</string>
<!-- XTXT: Create RAT Qr code profile birth date-->
- <string name="rat_qr_code_profile_birth_date">geboren %1$s</string>
+ <string name="rat_qr_code_profile_birth_date">"Born %1$s"</string>
<!-- XBUT: Create RAT Qr code profile next button-->
- <string name="rat_qr_code_profile_next_button">Weiter</string>
+ <string name="rat_qr_code_profile_next_button">"Continue"</string>
<!-- XTXT: Create RAT Qr code profile delete item-->
- <string name="rat_qr_code_profile_delete_item">Entfernen</string>
+ <string name="rat_qr_code_profile_delete_item">"Remove"</string>
<!-- XTXT: Create RAT Qr code profile delete dialog title-->
- <string name="rat_qr_code_profile_dialog_title">Wollen Sie das Schnelltest-Profil wirklich entfernen?</string>
+ <string name="rat_qr_code_profile_dialog_title">"Do you want to remove the rapid test profile?"</string>
<!-- XTXT: Create RAT Qr code profile delete dialog message-->
- <string name="rat_qr_code_profile_dialog_message">Bitte denken Sie daran, dass der QR-Code danach nicht mehr zum Registrieren verwendet werden kann.</string>
+ <string name="rat_qr_code_profile_dialog_message">"Please consider that if you do, the QR code can no longer be used for registration."</string>
<!-- XTXT: Create RAT Qr code profile delete dialog positive button-->
- <string name="rat_qr_code_profile_dialog_positive_button">Löschen</string>
+ <string name="rat_qr_code_profile_dialog_positive_button">"Delete"</string>
<!-- XTXT: Create RAT Qr code profile delete dialog negative button-->
- <string name="rat_qr_code_profile_dialog_negative_button">Abbrechen</string>
+ <string name="rat_qr_code_profile_dialog_negative_button">"Cancel"</string>
</resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values/release_info_strings.xml b/Corona-Warn-App/src/main/res/values/release_info_strings.xml
index f0effc754445ae3de034dfaa55176b64f545b266..700fee76ef5384fd23a1b7cb2183624ceed8035c 100644
--- a/Corona-Warn-App/src/main/res/values/release_info_strings.xml
+++ b/Corona-Warn-App/src/main/res/values/release_info_strings.xml
@@ -17,34 +17,26 @@
<!-- XHED: Titles for the release info screen bullet points -->
<string-array name="new_release_title">
- <item>"Registration of Rapid Antigen Tests"</item>
- <item>"Display of Proof"</item>
- <item>"Technical Hotline Now Available from Outside Germany"</item>
- <item>"TAN Hotline Now Available from Outside Germany"</item>
+ <item>"Record Troubleshooting Logs"</item>
+ <item>"Create Rapid Test Profiles"</item>
</string-array>
<!-- XTXT: Text bodies for the release info screen bullet points -->
<string-array name="new_release_body">
- <item>"In addition to the results of PCR tests, you can now also display the results of rapid antigen tests in the app and use them to warn others."</item>
- <item>"If you want, you can use the app to prove your personal infection status (a negative rapid test, for example). Please note, however, that you are under no obligation to use the app to prove your infection status. You can also prove your infection status in another manner compliant with the legal regulations at your residence."</item>
- <item>"You can now reach the technical hotline from outside Germany as well, under the number +49 30 498 75401. The fees from your telephone provider will apply."</item>
- <item>"If you are diagnosed with coronavirus, you can now request a TAN from outside Germany, under the number +49 30 498 75402. The fees from your telephone provider will apply."</item>
+ <item>"You can now generate an error log in the technical support feature for the app. It records the steps that you perform in the app, to simplify the analysis of potential errors and help us correct them more quickly."</item>
+ <item>"You can now create a rapid test profile in your personal data. Your profile can then be scanned at testing points quickly and easily via QR code."</item>
</string-array>
<!-- XTXT: Text labels that will be converted to Links -->
<string-array name="new_release_linkified_labels">
<item />
<item />
- <item />
- <item />
</string-array>
<!-- XTXT: URL destinations for the lables in new_release_linkified_labels -->
<string-array name="new_release_target_urls">
<item />
<item />
- <item />
- <item />
</string-array>
</resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values/strings.xml b/Corona-Warn-App/src/main/res/values/strings.xml
index 299f7e77966746536c17fd881a22eb706adce27b..37807573d4cf9e810b91389bec9d2a3ad8ecf1d3 100644
--- a/Corona-Warn-App/src/main/res/values/strings.xml
+++ b/Corona-Warn-App/src/main/res/values/strings.xml
@@ -1,13 +1,5 @@
<?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">
-
- <!-- ####################################
- Non translatable
- ###################################### -->
-
- <!-- XTXT: Path to the full blown legal html, currently not translated -->
- <string name="information_technical_html_path" translatable="false">"technical.html"</string>
-
<!-- ####################################
Generics
###################################### -->
@@ -74,9 +66,9 @@
<!-- XTXT: risk card - Days since installation if < 14 days -->
<string name="risk_card_body_days_since_installation">"Installed %s days ago"</string>
<!-- XTXT: risk card - Days since installation if today -->
- <string name="risk_card_body_installation_today"></string>
- !-- XTXT: risk card - Days since installation if yesterday -->
- <string name="risk_card_body_installation_yesterday"></string>
+ <string name="risk_card_body_installation_today">"Installed today"</string>
+ <!-- XTXT: risk card - Days since installation if yesterday -->
+ <string name="risk_card_body_installation_yesterday">"Installed yesterday"</string>
<!-- XTXT: risk card - tracing active for x out of 14 days -->
<string name="risk_card_body_saved_days">"Exposure logging was active for %1$s of the past 14 days"</string>
<!-- XTXT: risk card- tracing active for 14 out of 14 days -->
@@ -877,10 +869,10 @@
<string name="debugging_debuglog_action_start_recording">"Start"</string>
<!-- XBUT: Button text to stop the log recording -->
<string name="debugging_debuglog_action_stop_recording">"Stop and Delete"</string>
- <!-- XBUT: Button text to send the log recording to the server -->
+ <!-- XBUT: Button text to send the log recording to the server-->
<string name="debugging_debuglog_action_share_log">"Send Error Report"</string>
<!-- XBUT: Button text to export the log -->
- <string name="debugging_debuglog_action_local_log_export">"Save Locally and Continue"</string>
+ <string name="debugging_debuglog_action_local_log_export">"Share and Continue"</string>
<!-- YTXT: Status text if a debug log is being recorded -->
<string name="debugging_debuglog_status_recording">"Recording Active"</string>
<!-- YTXT: Status text if a debug log is being recorded but there is not enough free storage space -->
@@ -907,6 +899,7 @@
<string name="debugging_debuglog_stop_confirmation_discard_button">"Continue Analysis"</string>
<!-- YTXT: Dialog message if there is not enough free storage to start a debug log -->
<string name="debugging_debuglog_start_low_storage_error">"You need at least 200 MB of memory to start the error analysis. Please free up memory."</string>
+
<!-- XHED: Title for debug legal screen -->
<string name="debugging_debuglog_legal_dialog_title">"Detailed Information on Sending Error Reports"</string>
<!-- YTXT: Section Title for debug legal screen -->
@@ -1193,10 +1186,7 @@
<!-- Submission Positive Other Warning No Consent -->
<!-- YTXT: Body text for the positive result additional warning page-->
- <string name="submission_positive_other_warning_no_consent_body_first_part">"Because you tested positive for coronavirus, you can now warn others through the app."</string>
- <!-- YTXT: Body text for the positive result additional warning page-->
- <string name="submission_positive_other_warning_no_consent_body_second_part">"The warning feature works in several countries. The following countries are currently participating:"</string>
-
+ <string name="submission_positive_other_warning_no_consent_body_first_part">"Because you have been diagnosed with coronavirus, you can warn others through the app. If you took a rapid test, the warning feature only works in Germany. If you took a PCR test, the warning feature works in the following countries:"</string>
<!-- Test result positive and no consent given -->
<!-- XHED: Title for test result positive and no consent given-->
@@ -1959,16 +1949,7 @@
<!-- XACT: Button/Dialog label to cancel something-->
<string name="generic_action_abort">"Cancel"</string>
<!-- XACT: Button/Dialog label to remove something-->
- <string name="generic_action_remove">Remove</string>
-
- <!-- ####################################
- Incompatibility warning card
- ###################################### -->
- <string name="incompatible_headline"></string>
- <string name="incompatible_advertising_not_supported"></string>
- <string name="incompatible_scanning_not_supported"></string>
-
- <string name="incompatible_link">"https://www.coronawarn.app/en/faq/#incompatibility_warning"</string>
+ <string name="generic_action_remove">"Remove"</string>
<!-- ####################################
Trace Location
@@ -2026,4 +2007,13 @@
<string name="trace_location_attendee_invalid_qr_code_dialog_positive_button">"OK"</string>
<!-- XBUT: Trace location check-ins invalid qr code dialog negative button -->
<string name="trace_location_attendee_invalid_qr_code_dialog_negative_button">"Cancel"</string>
-</resources>
+
+ <!-- ####################################
+ Incompatibility warning card
+ ###################################### -->
+
+ <string name="incompatible_headline">"Incompatibility Warning"</string>
+ <string name="incompatible_advertising_not_supported">"Your smartphone can only receive COVID-19 notifications via Bluetooth, but not send them. This means you can be warned of exposures through this interface, but you cannot warn others of exposures yourself. You can send and receive warnings that result from check-ins."</string>
+ <string name="incompatible_scanning_not_supported">"Your smartphone cannot send or receive COVID-19 notifications via Bluetooth. You can send and receive warnings that result from check-ins."</string>
+ <string name="incompatible_link">"https://www.coronawarn.app/en/faq/#incompatibility_warning"</string>
+</resources>
\ No newline at end of file