diff --git a/Corona-Warn-App/src/main/res/values-bg/green_certificate_strings.xml b/Corona-Warn-App/src/main/res/values-bg/green_certificate_strings.xml
index ddae0a81127cfe8a2349f50c4d572b3b68e19b95..fa89d6092649084bd11e75f81ffd1d159ab31e15 100644
--- a/Corona-Warn-App/src/main/res/values-bg/green_certificate_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-bg/green_certificate_strings.xml
@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?><resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
     <!-- XTXT: Request green certificate title -->
-    <string name="request_green_certificate_title">"Сертификат за тест за COVID"</string>
+    <string name="request_green_certificate_title">"COVID сертификат за тестване"</string>
     <!-- XTXT: Request green certificate subtitle -->
-    <string name="request_green_certificate_subtitle">"Можете да използвате приложението, за да заявите официален електронен сертификат за тестване, който ще бъде добавен в приложението."</string>
+    <string name="request_green_certificate_subtitle">"Можете да използвате приложението, за да заявите официален цифров сертификат за тестване, който ще бъде добавен вътре."</string>
     <!-- XTXT: Request green certificate body section 1 -->
-    <string name="request_green_certificate_body_1">"Сертификатът за тестване се издава само ако получите отрицателен резултат от теста."</string>
+    <string name="request_green_certificate_body_1">"Сертификат за тестване се издава само ако резултатът от теста е отрицателен."</string>
     <!-- XTXT: Request green certificate body section 2 -->
     <string name="request_green_certificate_body_2">"Сертификатът за тестване е валидно доказателство за отрицателен резултат от тест в рамките на ЕС (например при пътуване)."</string>
     <!-- XTXT: Request green certificate body section 3 -->
-    <string name="request_green_certificate_body_3">"Сертификатът за тестване съдържа валидни данни, които позволяват на приложението за проверка да валидира сертификата ви."</string>
+    <string name="request_green_certificate_body_3">"Сертификатът за тестване съдържа данни, които позволяват на приложението за проверка да валидира сертификата Ви."</string>
     <!-- XBUT: Request green certificate agree button -->
-    <string name="request_green_certificate_agree_button">"Заявете тестов сертификат"</string>
+    <string name="request_green_certificate_agree_button">"Заявете сертификат за тест"</string>
     <!-- XBUT: Request green certificate disagree button -->
     <string name="request_green_certificate_disagree_button">"Не, благодаря!"</string>
     <!-- XTXT: Request green certificate birth date description -->
@@ -26,25 +26,77 @@
     <!-- XBUT: Request green certificate exit dialog negative button -->
     <string name="request_gc_dialog_negative_button">"Отказ"</string>
     <!-- XTXT: Detail green certificate title -->
-    <string name="detail_green_certificate_title">"Електронен сертификат на ЕС за тестване за COVID"</string>
+    <string name="detail_green_certificate_title">"Цифров COVID сертификат на ЕС за тестване"</string>
     <!-- XTXT: Detail green certificate test type -->
     <string name="detail_green_certificate_test_type">"Тест за SARS-CoV-2"</string>
     <!-- XTXT: Detail green certificate card title -->
     <string name="detail_green_certificate_card_title">"Сертификат за тестване"</string>
+    <!-- XTXT: Detail green certificate card subtitle -->
+    <string name="detail_green_certificate_card_subtitle">"Тестът е извършен на %1$s %2$s"</string>
     <!-- XTXT: Detail green certificate travel notice link en -->
     <string name="green_certificate_travel_notice_link_en">"https://reopen.europa.eu/en"</string>
     <!-- XTXT: Detail green certificate travel notice link de -->
     <string name="green_certificate_travel_notice_link_de">"https://reopen.europa.eu/de"</string>
+    <!-- XTXT: Detail green certificate menu item: delete -->
+    <string name="green_certificate_details_menu_item_delete">"Изтриване"</string>
+    <!-- XTXT: Detail green certificate diaglog title -->
+    <string name="green_certificate_details_dialog_remove_test_title">"Желаете ли да изтриете сертификата за тестване?"</string>
+    <!-- XTXT: Detail green certificate diaglog message -->
+    <string name="green_certificate_details_dialog_remove_test_message">"Ако изтриете този сертификат, повече няма да можете да го използвате за доказателство чрез приложението."</string>
+    <!-- XTXT: Detail green certificate diaglog positive -->
+    <string name="green_certificate_details_dialog_remove_test_button_positive">"Изтриване"</string>
+    <!-- XTXT: Detail green certificate diaglog negative -->
+    <string name="green_certificate_details_dialog_remove_test_button_negative">"Отказ"</string>
+
     <!-- XTXT: Green certificate main screen title -->
     <string name="certification_screen_title">"Сертификати"</string>
     <!-- XTXT: Green certificate menu item -->
     <string name="menu_certification_information">"Информация"</string>
     <!-- XTXT: Green certificate main screen header text -->
-    <string name="green_certification_header_info">"Тук се показват електронните ви сертификати за ваксиниране и за тествания."</string>
+    <string name="green_certification_header_info">"Тук се показват цифровите Ви сертификати за ваксиниране и за тествания."</string>
     <!-- XTXT: Green certificate info card title 1st line -->
     <string name="info_banner_title_1">"Електронен COVID-19"</string>
     <!-- XTXT: Green certificate info card title 2nd line  -->
-    <string name="info_banner_title_2">"Сертификат за тест за COVID"</string>
+    <string name="info_banner_title_2">"COVID сертификат за тестване"</string>
     <!-- XTXT: Green certificate info card body  -->
-    <string name="info_banner_body">"Регистрирайте тест на началния екран и дайте съгласие да получите електронен сертификат за тестване. Той ще се покаже тук веднага щом е наличен."</string>
+    <string name="info_banner_body">"Регистрирайте тест от началния екран и дайте съгласие да получите цифров сертификат за тестване. Той ще се покаже тук веднага щом стане наличен."</string>
+
+    <!-- XTXT: Test certificate time -->
+    <string name="test_certificate_time">"Тестът е извършен на %1$s, %2$s"</string>
+    <!-- XTXT: Test error label -->
+    <string name="test_certificate_error_label">"Грешка при извличането на сертификата"</string>
+    <!-- XBUT: Test error retry button -->
+    <string name="test_certificate_error_retry_button">"Опитайте пак"</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_try_again">"Не беше установена връзка. Опитайте отново."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_dcc_not_supported_by_lab">"Не можете да заявите сертификат за направен тест, тъй като пунктът не поддържа издаването на такива. Моля, изтрийте сертификата или се свържете с горещата линия за технически проблеми, посочена в „Информация за приложението“ -&gt; „Технически въпроси“."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_no_network">"Няма връзка с интернет. Моля, проверете я и опитайте отново."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_e2e_error_call_hotline">"Възникна грешка. Моля, опитайте по-късно или се свържете с горещата линия за технически проблеми, посочена в „Информация за приложението“ -&gt; „Технически въпроси“."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_try_again_dcc_not_available_yet">"Вашият сертификат още не е наличен. Моля, опитайте отново. Ако грешката продължи да възниква, се обърнете към горещата линия за технически проблеми, посочена в „Информация за приложението“ -&gt; „Технически въпроси“."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_client_error_call_hotline">"Възникна грешка. Моля, опитайте по-късно или се свържете с горещата линия за технически проблеми, посочена в „Информация за приложението“ -&gt; „Технически въпроси“."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_dcc_expired">"Сертификатът вече не е актуален. Можете да го изтриете от Corona-Warn-App."</string>
+    <!-- XBUT: Test error delete button -->
+    <string name="test_certificate_error_delete_button">"Изтриване на сертификата за тестване"</string>
+    <!-- XTXT: Test error refresh dialog title -->
+    <string name="test_certificate_refresh_dialog_title">"Все още има проблем със заявката."</string>
+    <!-- XBUT: Test error refresh dialog confirm button -->
+    <string name="test_certificate_refresh_dialog_confirm_button">"OK"</string>
+    <!-- XTXT: Test error delete dialog title -->
+    <string name="test_certificate_delete_dialog_title">"Желаете ли да изтриете сертификата?"</string>
+    <!-- XTXT: Test error delete dialog body -->
+    <string name="test_certificate_delete_dialog_body">"Ако изтриете този сертификат, не можете да го заявите отново."</string>
+    <!-- XBUT: Test error delete dialog confirm button -->
+    <string name="test_certificate_delete_dialog_confirm_button">"Изтриване"</string>
+    <!-- XBUT: Test error delete dialog cancel button -->
+    <string name="test_certificate_delete_dialog_cancel_button">"Отказ"</string>
+    <!-- XTXT: Test error card body refreshing -->
+    <string name="test_certificate_error_label_refreshing">"Вашият сертификат се създава..."</string>
+    <!-- XTXT: Test error card body refreshing -->
+    <string name="test_certificate_error_refreshing_status">"Вашият сертификат се заявява. Това може да отнеме няколко минути..."</string>
 </resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values-bg/vaccination_strings.xml b/Corona-Warn-App/src/main/res/values-bg/vaccination_strings.xml
index fe8bd5d56c8839e6420023b221c98576bb25c0d9..384be191b9e1bf252f265e196ef4963d4ab79370 100644
--- a/Corona-Warn-App/src/main/res/values-bg/vaccination_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-bg/vaccination_strings.xml
@@ -36,21 +36,21 @@
     <string name="vaccination_list_vaccination_card_subtitle">"Извършено на %1$s"</string>
     <!-- XTXT: Vaccination List immunity information card body-->
     <plurals name="vaccination_list_immunity_card_body">
-        <item quantity="one">"Получихте всички планирани за момента ваксинации, но защитата ви от ваксиниране ще е пълна след %1$d ден."</item>
-        <item quantity="other">"Получихте всички планирани за момента ваксинации, но защитата ви от ваксиниране ще е пълна едва след %1$d дни."</item>
-        <item quantity="zero">"Получихте всички планирани за момента ваксинации, но защитата ви от ваксиниране ще е пълна едва след %1$d дни."</item>
-        <item quantity="two">"Получихте всички планирани за момента ваксинации, но защитата ви от ваксиниране ще е пълна едва след %1$d дни."</item>
-        <item quantity="few">"Получихте всички планирани за момента ваксинации, но защитата ви от ваксиниране ще е пълна едва след %1$d дни."</item>
-        <item quantity="many">"Получихте всички планирани за момента ваксинации, но защитата ви от ваксиниране ще е пълна едва след %1$d дни."</item>
+        <item quantity="one">"Получихте всички планирани за момента ваксинации, но ваксинационната Ви защита ще е пълна след %1$d ден."</item>
+        <item quantity="other">"Получихте всички планирани за момента ваксинации, но ваксинационната Ви защита ще е пълна едва след %1$d дни."</item>
+        <item quantity="zero">"Получихте всички планирани за момента ваксинации, но ваксинационната Ви защита ще е пълна едва след %1$d дни."</item>
+        <item quantity="two">"Получихте всички планирани за момента ваксинации, но ваксинационната Ви защита ще е пълна едва след %1$d дни."</item>
+        <item quantity="few">"Получихте всички планирани за момента ваксинации, но ваксинационната Ви защита ще е пълна едва след %1$d дни."</item>
+        <item quantity="many">"Получихте всички планирани за момента ваксинации, но ваксинационната Ви защита ще е пълна едва след %1$d дни."</item>
     </plurals>
     <!-- XBUT: Vaccination List register additional vaccination button -->
     <string name="vaccination_list_register_new_vaccination_button">"Регистрирайте друго ваксиниране"</string>
     <!-- XBUT: Vaccination List delete button -->
     <string name="vaccination_list_delete_button">"Изтриване"</string>
     <!-- XTXT: Vaccination List deletion dialog title-->
-    <string name="vaccination_list_deletion_dialog_title">"Желаете ли да изтриете ваксинационния сертификат?"</string>
+    <string name="vaccination_list_deletion_dialog_title">"Желаете ли да изтриете сертификата за ваксиниране?"</string>
     <!-- XTXT: Vaccination List deletion dialog message-->
-    <string name="vaccination_list_deletion_dialog_message">"Ако изтриете сертификата, приложението вече няма да може да използва тази ваксинация за удостоверяване на вашия ваксинационен статус."</string>
+    <string name="vaccination_list_deletion_dialog_message">"Ако изтриете сертификата за ваксиниране, приложението вече няма да може да използва ваксинацията за удостоверяване на вашия ваксинационен статус."</string>
     <!-- XBUT: Vaccination List deletion dialog positive button-->
     <string name="vaccination_list_deletion_dialog_positive_button">"Изтриване"</string>
     <!-- XBUT: Vaccination List deletion dialog negative button-->
@@ -66,11 +66,13 @@
     <!-- XHED: Title for Vaccination Certificate Registration Home Card -->
     <string name="vaccination_card_registration_title_line_2">"за ваксиниране"</string>
     <!-- YTXT: Body text for Vaccination Certificate Registration Home Card -->
-    <string name="vaccination_card_registration_body">"Добавете ваксинационните си сертификати в приложението, за да са винаги с вас. За да направите това, сканирайте QR кода от вашия документ."</string>
+    <string name="vaccination_card_registration_body">"Добавете ваксинационните си сертификати в приложението, за да са винаги с Вас. За целта сканирайте QR кода от Вашия документ."</string>
     <!-- XBUT: button for Vaccination Certificate Registration Home Card -->
     <string name="vaccination_card_register">"Добавяне"</string>
     <!-- XHED: Homescreen vaccination status card title -->
-    <string name="vaccination_card_status_title">"Електронно доказателство за ваксиниране"</string>
+    <string name="vaccination_card_status_title_line_1">"Цифрово"</string>
+    <!-- XHED: Homescreen vaccination status card title -->
+    <string name="vaccination_card_status_title_line_2">"Доказателство за ваксинация"</string>
     <!-- XHED: Homescreen vaccination status card vaccination name -->
     <string name="vaccination_card_status_vaccination_name">"Ваксиниране срещу SARS-CoV-2"</string>
     <!-- XTXT: Homescreen card incomplete vaccination status label -->
@@ -84,17 +86,19 @@
         <item quantity="few">"Пълна защита от ваксиниране след %1$d дни"</item>
         <item quantity="many">"Пълна защита от ваксиниране след %1$d дни"</item>
     </plurals>
+    <!-- XTXT: Homescreen card complete vaccination status label -->
+    <string name="vaccination_card_status_vaccination_complete">"Валидно до %s"</string>
 
     <!-- XTXT: Vaccination QR code scan error message-->
     <string name="error_vc_invalid">"Този QR не е валиден ваксинационен сертификат.\n\nЗа да разберете как можете да се сдобиете със сертификат за извършена ваксинация, вижте страницата ни с често задавани въпроси (ЧЗВ)."</string>
     <!-- XTXT: Vaccination QR code scan error message-->
-    <string name="error_vc_not_yet_supported">"Този ваксинационен сертификат все още не се поддържа във версията на Вашето приложение. Моля, актуализирайте приложението си или се свържете с горещата линия за технически проблеми, посочена в „Информация за приложението“."</string>
+    <string name="error_vc_not_yet_supported">"Този сертификат за ваксиниране все още не се поддържа във версията на вашето приложение. Моля, актуализирайте приложението си или се свържете с горещата линия за технически проблеми от “Информация за приложението”."</string>
     <!-- XTXT: Vaccination QR code scan error message-->
     <string name="error_vc_scan_again">"Ваксинационният сертификат не може да бъде запазен на смартфона Ви. Моля, опитайте отново по-късно или се свържете с горещата линия за технически проблеми, посочена в „Информация за приложението“."</string>
     <!-- XTXT: Vaccination QR code scan error message-->
     <string name="error_vc_already_registered">"Ваксинационният сертификат вече е регистриран в приложението Ви."</string>
     <!-- XTXT: Vaccination QR code scan error message-->
-    <string name="error_vc_different_person">"Личната информация в този ваксинационен сертификат не съответства на тази във вече регистрираните сертификати. В приложението можете да регистрирате сертификати само за едно лице."</string>
+    <string name="error_vc_different_person">"Личната информация в този сертификат за ваксиниране не съответства на тази във вече регистрираните сертификати. В приложението можете да регистрирате сертификати само за едно лице."</string>
 
     <!-- XTXT: Vaccination Consent title-->
     <string name="vaccination_consent_title">"Вашето съгласие"</string>
@@ -107,7 +111,7 @@
     <!-- XTXT: Vaccination Consent qr code text -->
     <string name="vaccination_consent_qr_info_qr_code_text">"Тези сертификати се считат за валидно доказателство в рамките на ЕС (например при пътуване)."</string>
     <!-- XTXT: Vaccination Consent time text  -->
-    <string name="vaccination_consent_qr_info_time_text">"След като добавите сертификат, той ще се запази в смартфона Ви. Ще се споделя с останалите само ако представите сертификат за ваксиниране."</string>
+    <string name="vaccination_consent_qr_info_time_text">"След като добавите сертификат, той ще се запази в смартфона Ви. Ще се споделя с останалите само ако представите ваксинационен сертификат."</string>
     <!-- XTXT: Text for vaccination consent legal information button -->
     <string name="vaccination_consent_onboarding_legal_information">"За повече информация относно обработката на данни, прочетете декларацията за поверителност."</string>
     <!-- XBUT: Text for vaccination consent accept button -->
diff --git a/Corona-Warn-App/src/main/res/values-en/green_certificate_strings.xml b/Corona-Warn-App/src/main/res/values-en/green_certificate_strings.xml
index 4d945372179f5d78a3cd8891514823e8e52f5377..f0daa94caf21542f19635794aae920a0adea4add 100644
--- a/Corona-Warn-App/src/main/res/values-en/green_certificate_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/green_certificate_strings.xml
@@ -8,7 +8,7 @@
     <!-- XTXT: Request green certificate body section 2 -->
     <string name="request_green_certificate_body_2">"The test certificate is valid proof of a negative test result within the EU (e.g. for travel)."</string>
     <!-- XTXT: Request green certificate body section 3 -->
-    <string name="request_green_certificate_body_3">"The test certificate contains valid that enables the verification app to validate your certificate."</string>
+    <string name="request_green_certificate_body_3">"The test certificate contains data that enables the verification app to validate your certificate."</string>
     <!-- XBUT: Request green certificate agree button -->
     <string name="request_green_certificate_agree_button">"Request Test Certificate"</string>
     <!-- XBUT: Request green certificate disagree button -->
@@ -31,10 +31,23 @@
     <string name="detail_green_certificate_test_type">"SARS-CoV-2 Test"</string>
     <!-- XTXT: Detail green certificate card title -->
     <string name="detail_green_certificate_card_title">"Test Certificate"</string>
+    <!-- XTXT: Detail green certificate card subtitle -->
+    <string name="detail_green_certificate_card_subtitle">"Test performed on %1$s %2$s"</string>
     <!-- XTXT: Detail green certificate travel notice link en -->
     <string name="green_certificate_travel_notice_link_en">"https://reopen.europa.eu/en"</string>
     <!-- XTXT: Detail green certificate travel notice link de -->
     <string name="green_certificate_travel_notice_link_de">"https://reopen.europa.eu/de"</string>
+    <!-- XTXT: Detail green certificate menu item: delete -->
+    <string name="green_certificate_details_menu_item_delete">"Remove"</string>
+    <!-- XTXT: Detail green certificate diaglog title -->
+    <string name="green_certificate_details_dialog_remove_test_title">"Do you want to remove the test certificate?"</string>
+    <!-- XTXT: Detail green certificate diaglog message -->
+    <string name="green_certificate_details_dialog_remove_test_message">"If you remove the test certificate, you can no longer use it as proof in the app."</string>
+    <!-- XTXT: Detail green certificate diaglog positive -->
+    <string name="green_certificate_details_dialog_remove_test_button_positive">"Remove"</string>
+    <!-- XTXT: Detail green certificate diaglog negative -->
+    <string name="green_certificate_details_dialog_remove_test_button_negative">"Cancel"</string>
+
     <!-- XTXT: Green certificate main screen title -->
     <string name="certification_screen_title">"Certificates"</string>
     <!-- XTXT: Green certificate menu item -->
@@ -47,4 +60,43 @@
     <string name="info_banner_title_2">"COVID Test Certificate"</string>
     <!-- XTXT: Green certificate info card body  -->
     <string name="info_banner_body">"Register a test on the home screen and agree to receive a digital test certificate. As soon as the certificate is available, it is displayed here."</string>
+
+    <!-- XTXT: Test certificate time -->
+    <string name="test_certificate_time">"Test performed on %1$s, %2$s"</string>
+    <!-- XTXT: Test error label -->
+    <string name="test_certificate_error_label">"Error during certificate retrieval"</string>
+    <!-- XBUT: Test error retry button -->
+    <string name="test_certificate_error_retry_button">"Try Again"</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_try_again">"Could not establish a connection. Please try again."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_dcc_not_supported_by_lab">"You cannot request a test certificate because this testing point does not support the issuing of test certificates. Please remove the certificate or contact the technical hotline via App Information -&gt; Technical Hotline."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_no_network">"Your Internet connection was lost. Please check the connection and try again."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_e2e_error_call_hotline">"An error occurred. Please try again later or contact the technical hotline via App Information -&gt; Technical Hotline."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_try_again_dcc_not_available_yet">"Your certificate it not available yet. Please try again. If the error persists, please contact the technical hotline via App Information -&gt; Technical Hotline."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_client_error_call_hotline">"An error occurred. Please try again later or contact the technical hotline via App Information -&gt; Technical Hotline."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_dcc_expired">"This certificate is no longer current. You can remove it from the Corona-Warn-App."</string>
+    <!-- XBUT: Test error delete button -->
+    <string name="test_certificate_error_delete_button">"Remove Test Certificate"</string>
+    <!-- XTXT: Test error refresh dialog title -->
+    <string name="test_certificate_refresh_dialog_title">"There are still problems with the request."</string>
+    <!-- XBUT: Test error refresh dialog confirm button -->
+    <string name="test_certificate_refresh_dialog_confirm_button">"OK"</string>
+    <!-- XTXT: Test error delete dialog title -->
+    <string name="test_certificate_delete_dialog_title">"Do you want to remove the certificate?"</string>
+    <!-- XTXT: Test error delete dialog body -->
+    <string name="test_certificate_delete_dialog_body">"If you remove the certificate, you cannot request it again."</string>
+    <!-- XBUT: Test error delete dialog confirm button -->
+    <string name="test_certificate_delete_dialog_confirm_button">"Remove"</string>
+    <!-- XBUT: Test error delete dialog cancel button -->
+    <string name="test_certificate_delete_dialog_cancel_button">"Cancel"</string>
+    <!-- XTXT: Test error card body refreshing -->
+    <string name="test_certificate_error_label_refreshing">"Your certificate is being created..."</string>
+    <!-- XTXT: Test error card body refreshing -->
+    <string name="test_certificate_error_refreshing_status">"Your certificate is being requested. This may take a few minutes..."</string>
 </resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values-en/vaccination_strings.xml b/Corona-Warn-App/src/main/res/values-en/vaccination_strings.xml
index e9f2c33cfe132f9ed57c4cc8c892449411360a5d..fa39d43df4de775da395fd08bf2c95b527a0c7b0 100644
--- a/Corona-Warn-App/src/main/res/values-en/vaccination_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-en/vaccination_strings.xml
@@ -70,7 +70,9 @@
     <!-- XBUT: button for Vaccination Certificate Registration Home Card -->
     <string name="vaccination_card_register">"Add"</string>
     <!-- XHED: Homescreen vaccination status card title -->
-    <string name="vaccination_card_status_title">"Digital Proof of Vaccination"</string>
+    <string name="vaccination_card_status_title_line_1">"Digital"</string>
+    <!-- XHED: Homescreen vaccination status card title -->
+    <string name="vaccination_card_status_title_line_2">"Proof of Vaccination"</string>
     <!-- XHED: Homescreen vaccination status card vaccination name -->
     <string name="vaccination_card_status_vaccination_name">"SARS-CoV-2 Vaccination"</string>
     <!-- XTXT: Homescreen card incomplete vaccination status label -->
@@ -84,6 +86,8 @@
         <item quantity="few">"Full vaccination protection in %1$d days"</item>
         <item quantity="many">"Full vaccination protection in %1$d days"</item>
     </plurals>
+    <!-- XTXT: Homescreen card complete vaccination status label -->
+    <string name="vaccination_card_status_vaccination_complete">"Valid through %s"</string>
 
     <!-- XTXT: Vaccination QR code scan error message-->
     <string name="error_vc_invalid">"This QR code is not a valid vaccination certificate.\n\nFor more information about how to receive your vaccination certificate, please see our FAQ page."</string>
diff --git a/Corona-Warn-App/src/main/res/values-pl/green_certificate_strings.xml b/Corona-Warn-App/src/main/res/values-pl/green_certificate_strings.xml
index 0ab72d844ebb07cf949604ed985321f1a6f6bdb7..1c42258b5bd01afb2a222eb2d78d5eabc754be71 100644
--- a/Corona-Warn-App/src/main/res/values-pl/green_certificate_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-pl/green_certificate_strings.xml
@@ -8,7 +8,7 @@
     <!-- XTXT: Request green certificate body section 2 -->
     <string name="request_green_certificate_body_2">"Certyfikat testu jest ważnym dowodem negatywnego wyniku testu na terenie UE (np. dla celów podróży)."</string>
     <!-- XTXT: Request green certificate body section 3 -->
-    <string name="request_green_certificate_body_3">"Certyfikat zawiera ważne dane, które umożliwiają aplikacji weryfikacyjnej jego walidację."</string>
+    <string name="request_green_certificate_body_3">"Certyfikat testu zawiera dane, które umożliwiają aplikacji weryfikacyjnej jego walidację."</string>
     <!-- XBUT: Request green certificate agree button -->
     <string name="request_green_certificate_agree_button">"PoproÅ› o certyfikat testu"</string>
     <!-- XBUT: Request green certificate disagree button -->
@@ -31,10 +31,23 @@
     <string name="detail_green_certificate_test_type">"Test SARS-CoV-2"</string>
     <!-- XTXT: Detail green certificate card title -->
     <string name="detail_green_certificate_card_title">"Certyfikat testu"</string>
+    <!-- XTXT: Detail green certificate card subtitle -->
+    <string name="detail_green_certificate_card_subtitle">"Test wykonany dnia %1$s %2$s"</string>
     <!-- XTXT: Detail green certificate travel notice link en -->
     <string name="green_certificate_travel_notice_link_en">"https://reopen.europa.eu/en"</string>
     <!-- XTXT: Detail green certificate travel notice link de -->
     <string name="green_certificate_travel_notice_link_de">"https://reopen.europa.eu/de"</string>
+    <!-- XTXT: Detail green certificate menu item: delete -->
+    <string name="green_certificate_details_menu_item_delete">"Usuń"</string>
+    <!-- XTXT: Detail green certificate diaglog title -->
+    <string name="green_certificate_details_dialog_remove_test_title">"Czy chcesz usunąć certyfikat testu?"</string>
+    <!-- XTXT: Detail green certificate diaglog message -->
+    <string name="green_certificate_details_dialog_remove_test_message">"Po usunięciu certyfikatu testu jego użycie jako dowodu w aplikacji nie będzie już możliwe."</string>
+    <!-- XTXT: Detail green certificate diaglog positive -->
+    <string name="green_certificate_details_dialog_remove_test_button_positive">"Usuń"</string>
+    <!-- XTXT: Detail green certificate diaglog negative -->
+    <string name="green_certificate_details_dialog_remove_test_button_negative">"Anuluj"</string>
+
     <!-- XTXT: Green certificate main screen title -->
     <string name="certification_screen_title">"Certyfikaty"</string>
     <!-- XTXT: Green certificate menu item -->
@@ -47,4 +60,43 @@
     <string name="info_banner_title_2">"Certyfikat testu na COVID"</string>
     <!-- XTXT: Green certificate info card body  -->
     <string name="info_banner_body">"Zarejestruj test na ekranie głównym i wyraź zgodę na otrzymanie cyfrowego certyfikatu testu. Gdy tylko certyfikat będzie dostępny, pojawi się w tym miejscu."</string>
+
+    <!-- XTXT: Test certificate time -->
+    <string name="test_certificate_time">"Test wykonany dnia %1$s, %2$s"</string>
+    <!-- XTXT: Test error label -->
+    <string name="test_certificate_error_label">"BÅ‚Ä…d podczas pobierania certyfikatu"</string>
+    <!-- XBUT: Test error retry button -->
+    <string name="test_certificate_error_retry_button">"Spróbuj ponownie"</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_try_again">"Nie udało się nawiązać połączenia. Spróbuj ponownie."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_dcc_not_supported_by_lab">"Nie możesz zażądać wydania certyfikatu testu, ponieważ ten punkt testowania nie wydaje certyfikatów testów. Usuń certyfikat lub skontaktuj się z infolinią techniczną, korzystając z opcji: Informacje o aplikacji -&gt; Infolinia techniczna."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_no_network">"Połączenie internetowe zostało utracone. Sprawdź połączenie i spróbuj ponownie."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_e2e_error_call_hotline">"Wystąpił błąd. Spróbuj ponownie później lub skontaktuj się z infolinią techniczną, korzystając z opcji: Informacje o aplikacji -&gt; Infolinia techniczna."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_try_again_dcc_not_available_yet">"Twój certyfikat nie jest jeszcze dostępny. Spróbuj ponownie. Jeśli błąd będzie nadal występował, skontaktuj się z infolinią techniczną, korzystając z opcji: Informacje o aplikacji -&gt; Infolinia techniczna."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_client_error_call_hotline">"Wystąpił błąd. Spróbuj ponownie później lub skontaktuj się z infolinią techniczną, korzystając z opcji: Informacje o aplikacji -&gt; Infolinia techniczna."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_dcc_expired">"Ten certyfikat nie jest już aktualny. Możesz go usunąć z aplikacji Corona-Warn-App."</string>
+    <!-- XBUT: Test error delete button -->
+    <string name="test_certificate_error_delete_button">"Usuń certyfikat testu"</string>
+    <!-- XTXT: Test error refresh dialog title -->
+    <string name="test_certificate_refresh_dialog_title">"Nadal występują problemy z żądaniem."</string>
+    <!-- XBUT: Test error refresh dialog confirm button -->
+    <string name="test_certificate_refresh_dialog_confirm_button">"OK"</string>
+    <!-- XTXT: Test error delete dialog title -->
+    <string name="test_certificate_delete_dialog_title">"Czy chcesz usunąć certyfikat?"</string>
+    <!-- XTXT: Test error delete dialog body -->
+    <string name="test_certificate_delete_dialog_body">"Po usunięciu certyfikatu nie można zażądać go ponownie."</string>
+    <!-- XBUT: Test error delete dialog confirm button -->
+    <string name="test_certificate_delete_dialog_confirm_button">"Usuń"</string>
+    <!-- XBUT: Test error delete dialog cancel button -->
+    <string name="test_certificate_delete_dialog_cancel_button">"Anuluj"</string>
+    <!-- XTXT: Test error card body refreshing -->
+    <string name="test_certificate_error_label_refreshing">"Certyfikat jest tworzony..."</string>
+    <!-- XTXT: Test error card body refreshing -->
+    <string name="test_certificate_error_refreshing_status">"Żądanie dotyczące certyfikatu jest przetwarzane. Może to potrwać kilka minut..."</string>
 </resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values-pl/vaccination_strings.xml b/Corona-Warn-App/src/main/res/values-pl/vaccination_strings.xml
index fbf8ad38370692383771ad67cd0f82eaf5a0b287..58bcf8c675e9fa32b8d0c9a27d5841a2e89a2931 100644
--- a/Corona-Warn-App/src/main/res/values-pl/vaccination_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-pl/vaccination_strings.xml
@@ -70,7 +70,9 @@
     <!-- XBUT: button for Vaccination Certificate Registration Home Card -->
     <string name="vaccination_card_register">"Dodaj"</string>
     <!-- XHED: Homescreen vaccination status card title -->
-    <string name="vaccination_card_status_title">"Cyfrowy dowód szczepienia"</string>
+    <string name="vaccination_card_status_title_line_1">"Cyfrowy"</string>
+    <!-- XHED: Homescreen vaccination status card title -->
+    <string name="vaccination_card_status_title_line_2">"Dowód szczepienia"</string>
     <!-- XHED: Homescreen vaccination status card vaccination name -->
     <string name="vaccination_card_status_vaccination_name">"Szczepienie przeciwko SARS-CoV-2"</string>
     <!-- XTXT: Homescreen card incomplete vaccination status label -->
@@ -84,6 +86,8 @@
         <item quantity="few">"Pełna ochrona poszczepienna za %1$d dni"</item>
         <item quantity="many">"Pełna ochrona poszczepienna za %1$d dni"</item>
     </plurals>
+    <!-- XTXT: Homescreen card complete vaccination status label -->
+    <string name="vaccination_card_status_vaccination_complete">"Ważne do %s"</string>
 
     <!-- XTXT: Vaccination QR code scan error message-->
     <string name="error_vc_invalid">"Ten kod QR nie jest ważnym świadectwem szczepienia.\n\nWięcej informacji na temat tego, jak otrzymać swoje świadectwo szczepienia, znajduje się na naszej stronie „Często zadawane pytania”."</string>
diff --git a/Corona-Warn-App/src/main/res/values-ro/green_certificate_strings.xml b/Corona-Warn-App/src/main/res/values-ro/green_certificate_strings.xml
index 348c6a1a29591723d6f8606f85c57b92eb9308d2..ac9cc94ace505c368451612aa96704a73282b1f4 100644
--- a/Corona-Warn-App/src/main/res/values-ro/green_certificate_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-ro/green_certificate_strings.xml
@@ -31,10 +31,23 @@
     <string name="detail_green_certificate_test_type">"Test SARS-CoV-2"</string>
     <!-- XTXT: Detail green certificate card title -->
     <string name="detail_green_certificate_card_title">"Certificat de test"</string>
+    <!-- XTXT: Detail green certificate card subtitle -->
+    <string name="detail_green_certificate_card_subtitle">"Test efectuat pe %1$s %2$s"</string>
     <!-- XTXT: Detail green certificate travel notice link en -->
     <string name="green_certificate_travel_notice_link_en">"https://reopen.europa.eu/en"</string>
     <!-- XTXT: Detail green certificate travel notice link de -->
     <string name="green_certificate_travel_notice_link_de">"https://reopen.europa.eu/de"</string>
+    <!-- XTXT: Detail green certificate menu item: delete -->
+    <string name="green_certificate_details_menu_item_delete">"Eliminare"</string>
+    <!-- XTXT: Detail green certificate diaglog title -->
+    <string name="green_certificate_details_dialog_remove_test_title">"Doriți să eliminați certificatul de test?"</string>
+    <!-- XTXT: Detail green certificate diaglog message -->
+    <string name="green_certificate_details_dialog_remove_test_message">"Dacă eliminați certificatul de test, nu îl mai puteți utiliza ca dovadă în aplicație."</string>
+    <!-- XTXT: Detail green certificate diaglog positive -->
+    <string name="green_certificate_details_dialog_remove_test_button_positive">"Eliminare"</string>
+    <!-- XTXT: Detail green certificate diaglog negative -->
+    <string name="green_certificate_details_dialog_remove_test_button_negative">"Anulare"</string>
+
     <!-- XTXT: Green certificate main screen title -->
     <string name="certification_screen_title">"Certificate"</string>
     <!-- XTXT: Green certificate menu item -->
@@ -47,4 +60,43 @@
     <string name="info_banner_title_2">"Certificat de test COVID"</string>
     <!-- XTXT: Green certificate info card body  -->
     <string name="info_banner_body">"Înregistrați un test pe ecranul inițial și consimțiți să primiți un certificat de test digital. De îndată ce este disponibil certificatul, acesta este afișat aici."</string>
+
+    <!-- XTXT: Test certificate time -->
+    <string name="test_certificate_time">"Test efectuat pe %1$s, %2$s"</string>
+    <!-- XTXT: Test error label -->
+    <string name="test_certificate_error_label">"Eroare la obținerea certificatului"</string>
+    <!-- XBUT: Test error retry button -->
+    <string name="test_certificate_error_retry_button">"Încercați din nou"</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_try_again">"Nu a putut fi stabilită o conexiune. Încercați din nou."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_dcc_not_supported_by_lab">"Nu puteți solicita un certificat de test deoarece acest punct de testare nu suportă emiterea de certificate de test. Eliminați certificatul sau contactați hotline-ul tehnic prin Informații aplicație -&gt; Hotline tehnic."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_no_network">"Conexiunea dvs. la internet a fost pierdută. Verificați conexiunea și încercați din nou."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_e2e_error_call_hotline">"A apărut o eroare. Încercați din nou mai târziu sau contactați hotline-ul tehnic prin Informații aplicație -&gt; Hotline tehnic."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_try_again_dcc_not_available_yet">"Certificatul dvs. nu este disponibil încă. Încercați din nou. Dacă eroarea persistă, contactați hotline-ul tehnic prin Informații aplicație -&gt; Hotline tehnic."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_client_error_call_hotline">"A apărut o eroare. Încercați din nou mai târziu sau contactați hotline-ul tehnic prin Informații aplicație -&gt; Hotline tehnic."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_dcc_expired">"Acest certificat nu mai este de actualitate. Îl puteți elimina din Corona-Warn-App."</string>
+    <!-- XBUT: Test error delete button -->
+    <string name="test_certificate_error_delete_button">"Eliminare certificat de test"</string>
+    <!-- XTXT: Test error refresh dialog title -->
+    <string name="test_certificate_refresh_dialog_title">"Încă există probleme cu cererea dvs."</string>
+    <!-- XBUT: Test error refresh dialog confirm button -->
+    <string name="test_certificate_refresh_dialog_confirm_button">"OK"</string>
+    <!-- XTXT: Test error delete dialog title -->
+    <string name="test_certificate_delete_dialog_title">"Doriți să eliminați certificatul?"</string>
+    <!-- XTXT: Test error delete dialog body -->
+    <string name="test_certificate_delete_dialog_body">"Dacă eliminați certificatul, nu îl puteți solicita din nou."</string>
+    <!-- XBUT: Test error delete dialog confirm button -->
+    <string name="test_certificate_delete_dialog_confirm_button">"Eliminare"</string>
+    <!-- XBUT: Test error delete dialog cancel button -->
+    <string name="test_certificate_delete_dialog_cancel_button">"Anulare"</string>
+    <!-- XTXT: Test error card body refreshing -->
+    <string name="test_certificate_error_label_refreshing">"Certificatul dvs. este în curs de creare..."</string>
+    <!-- XTXT: Test error card body refreshing -->
+    <string name="test_certificate_error_refreshing_status">"Certificatul dvs. este în curs de solicitare. Acest lucru poate dura câteva minute..."</string>
 </resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values-ro/vaccination_strings.xml b/Corona-Warn-App/src/main/res/values-ro/vaccination_strings.xml
index 276ff68ee28120c6141de936946719d1c965f212..a6fefa697ef42368e6dcbaaa13d9d0c75db14272 100644
--- a/Corona-Warn-App/src/main/res/values-ro/vaccination_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-ro/vaccination_strings.xml
@@ -70,7 +70,9 @@
     <!-- XBUT: button for Vaccination Certificate Registration Home Card -->
     <string name="vaccination_card_register">"Adăugare"</string>
     <!-- XHED: Homescreen vaccination status card title -->
-    <string name="vaccination_card_status_title">"Dovada digitală a vaccinării"</string>
+    <string name="vaccination_card_status_title_line_1">"Dovada vaccinării"</string>
+    <!-- XHED: Homescreen vaccination status card title -->
+    <string name="vaccination_card_status_title_line_2">"digitale"</string>
     <!-- XHED: Homescreen vaccination status card vaccination name -->
     <string name="vaccination_card_status_vaccination_name">"Vaccinare SARS-CoV-2"</string>
     <!-- XTXT: Homescreen card incomplete vaccination status label -->
@@ -84,6 +86,8 @@
         <item quantity="few">"Protecția prin vaccinare este completă în %1$d zile"</item>
         <item quantity="many">"Protecția prin vaccinare este completă în %1$d zile"</item>
     </plurals>
+    <!-- XTXT: Homescreen card complete vaccination status label -->
+    <string name="vaccination_card_status_vaccination_complete">"Valabil până la %s"</string>
 
     <!-- XTXT: Vaccination QR code scan error message-->
     <string name="error_vc_invalid">"Acest cod QR nu este un certificat de vaccinare valabil.\n\nPentru mai multe informații despre modul în care puteți primi certificatul dvs. de vaccinare, consultați pagina noastră de întrebări frecvente."</string>
diff --git a/Corona-Warn-App/src/main/res/values-tr/green_certificate_strings.xml b/Corona-Warn-App/src/main/res/values-tr/green_certificate_strings.xml
index fc5992cfe8200a789105192fd25303a52d7474e0..2fdfd113ef26b3330a2f44859b3bd25faa9f0bc0 100644
--- a/Corona-Warn-App/src/main/res/values-tr/green_certificate_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-tr/green_certificate_strings.xml
@@ -8,7 +8,7 @@
     <!-- XTXT: Request green certificate body section 2 -->
     <string name="request_green_certificate_body_2">"Test sertifikası, AB’de geçerli bir negatif test sonucu kanıtıdır (ör. seyahat için)."</string>
     <!-- XTXT: Request green certificate body section 3 -->
-    <string name="request_green_certificate_body_3">"Test sertifikası, doğrulama uygulamasının sertifikanızı doğrulamasını sağlayan geçerli değer içerir."</string>
+    <string name="request_green_certificate_body_3">"Test sertifikası, doğrulama uygulamasının sertifikanızı doğrulamasını sağlayan verileri içerir."</string>
     <!-- XBUT: Request green certificate agree button -->
     <string name="request_green_certificate_agree_button">"Test Sertifikası Talep Et"</string>
     <!-- XBUT: Request green certificate disagree button -->
@@ -31,10 +31,23 @@
     <string name="detail_green_certificate_test_type">"SARS-CoV-2 Testi"</string>
     <!-- XTXT: Detail green certificate card title -->
     <string name="detail_green_certificate_card_title">"Test Sertifikası"</string>
+    <!-- XTXT: Detail green certificate card subtitle -->
+    <string name="detail_green_certificate_card_subtitle">"Testin gerçekleştirildiği tarih: %1$s %2$s"</string>
     <!-- XTXT: Detail green certificate travel notice link en -->
     <string name="green_certificate_travel_notice_link_en">"https://reopen.europa.eu/en"</string>
     <!-- XTXT: Detail green certificate travel notice link de -->
     <string name="green_certificate_travel_notice_link_de">"https://reopen.europa.eu/de"</string>
+    <!-- XTXT: Detail green certificate menu item: delete -->
+    <string name="green_certificate_details_menu_item_delete">"Kaldır"</string>
+    <!-- XTXT: Detail green certificate diaglog title -->
+    <string name="green_certificate_details_dialog_remove_test_title">"Test sertifikasını kaldırmak istiyor musunuz?"</string>
+    <!-- XTXT: Detail green certificate diaglog message -->
+    <string name="green_certificate_details_dialog_remove_test_message">"Test sertifikasını kaldırırsanız artık bunu uygulamada kanıt olarak kullanamazsınız."</string>
+    <!-- XTXT: Detail green certificate diaglog positive -->
+    <string name="green_certificate_details_dialog_remove_test_button_positive">"Kaldır"</string>
+    <!-- XTXT: Detail green certificate diaglog negative -->
+    <string name="green_certificate_details_dialog_remove_test_button_negative">"Ä°ptal Et"</string>
+
     <!-- XTXT: Green certificate main screen title -->
     <string name="certification_screen_title">"Sertifikalar"</string>
     <!-- XTXT: Green certificate menu item -->
@@ -47,4 +60,43 @@
     <string name="info_banner_title_2">"COVID Test Sertifikası"</string>
     <!-- XTXT: Green certificate info card body  -->
     <string name="info_banner_body">"Ana ekranda bir testi kaydedin ve dijital test sertifikası almayı kabul edin. Sertifika düzenlenir düzenlenmez burada görüntülenir."</string>
+
+    <!-- XTXT: Test certificate time -->
+    <string name="test_certificate_time">"Testin gerçekleştirildiği tarih: %1$s, %2$s"</string>
+    <!-- XTXT: Test error label -->
+    <string name="test_certificate_error_label">"Sertifika alınırken hata oluştu"</string>
+    <!-- XBUT: Test error retry button -->
+    <string name="test_certificate_error_retry_button">"Tekrar Dene"</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_try_again">"Bağlantı kurulamadı. Lütfen tekrar deneyin."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_dcc_not_supported_by_lab">"Bu test noktasında test sertifikalarının düzenlenmesi desteklenmediğinden bir test sertifikası talep edemezsiniz. Lütfen sertifikayı kaldırın veya Uygulama Bilgileri -&gt; Teknik Yardım Hattı üzerinden teknik yardım hattı ile iletişime geçin."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_no_network">"İnternet bağlantınız kesildi. Lütfen bağlantıyı kontrol edin ve tekrar deneyin."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_e2e_error_call_hotline">"Bir hata oluştu. Lütfen daha sonra tekrar deneyin veya Uygulama Bilgileri -&gt; Teknik Yardım Hattı üzerinden teknik yardım hattı ile iletişime geçin."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_try_again_dcc_not_available_yet">"Sertifikanız henüz çıkmadı. Lütfen tekrar deneyin. Hata devam ederse lütfen Uygulama Bilgileri -&gt; Teknik Yardım Hattı üzerinden teknik yardım hattı ile iletişime geçin."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_client_error_call_hotline">"Bir hata oluştu. Lütfen daha sonra tekrar deneyin veya Uygulama Bilgileri -&gt; Teknik Yardım Hattı üzerinden teknik yardım hattı ile iletişime geçin."</string>
+    <!-- XTXT: Error text -->
+    <string name="error_tc_dcc_expired">"Bu sertifika artık güncel değil. Sertifikayı Corona-Warn-App\'ten kaldırabilirsiniz."</string>
+    <!-- XBUT: Test error delete button -->
+    <string name="test_certificate_error_delete_button">"Test Sertifikasını Kaldır"</string>
+    <!-- XTXT: Test error refresh dialog title -->
+    <string name="test_certificate_refresh_dialog_title">"Yine de talebinizle ilgili problemler var."</string>
+    <!-- XBUT: Test error refresh dialog confirm button -->
+    <string name="test_certificate_refresh_dialog_confirm_button">"Tamam"</string>
+    <!-- XTXT: Test error delete dialog title -->
+    <string name="test_certificate_delete_dialog_title">"Sertifikayı kaldırmak istiyor musunuz?"</string>
+    <!-- XTXT: Test error delete dialog body -->
+    <string name="test_certificate_delete_dialog_body">"Sertifikayı kaldırırsanız tekrar talep edemezsiniz."</string>
+    <!-- XBUT: Test error delete dialog confirm button -->
+    <string name="test_certificate_delete_dialog_confirm_button">"Kaldır"</string>
+    <!-- XBUT: Test error delete dialog cancel button -->
+    <string name="test_certificate_delete_dialog_cancel_button">"Ä°ptal Et"</string>
+    <!-- XTXT: Test error card body refreshing -->
+    <string name="test_certificate_error_label_refreshing">"Sertifikanız oluşturuluyor..."</string>
+    <!-- XTXT: Test error card body refreshing -->
+    <string name="test_certificate_error_refreshing_status">"Sertifikanız talep ediliyor. Bu işlem birkaç dakika sürebilir..."</string>
 </resources>
\ No newline at end of file
diff --git a/Corona-Warn-App/src/main/res/values-tr/vaccination_strings.xml b/Corona-Warn-App/src/main/res/values-tr/vaccination_strings.xml
index b0657b9bd66120e133e6c702353adb9a6e66e791..111e60df3030ac0922886621b24f2229c52ceb8f 100644
--- a/Corona-Warn-App/src/main/res/values-tr/vaccination_strings.xml
+++ b/Corona-Warn-App/src/main/res/values-tr/vaccination_strings.xml
@@ -70,7 +70,9 @@
     <!-- XBUT: button for Vaccination Certificate Registration Home Card -->
     <string name="vaccination_card_register">"Ekle"</string>
     <!-- XHED: Homescreen vaccination status card title -->
-    <string name="vaccination_card_status_title">"Dijital Aşı Kanıtı"</string>
+    <string name="vaccination_card_status_title_line_1">"Dijital"</string>
+    <!-- XHED: Homescreen vaccination status card title -->
+    <string name="vaccination_card_status_title_line_2">"Aşı Kanıtı"</string>
     <!-- XHED: Homescreen vaccination status card vaccination name -->
     <string name="vaccination_card_status_vaccination_name">"SARS-CoV-2 Aşısı"</string>
     <!-- XTXT: Homescreen card incomplete vaccination status label -->
@@ -84,6 +86,8 @@
         <item quantity="few">"%1$d gün içinde tam aşı koruması"</item>
         <item quantity="many">"%1$d gün içinde tam aşı koruması"</item>
     </plurals>
+    <!-- XTXT: Homescreen card complete vaccination status label -->
+    <string name="vaccination_card_status_vaccination_complete">"Son geçerlilik tarihi: %s"</string>
 
     <!-- XTXT: Vaccination QR code scan error message-->
     <string name="error_vc_invalid">"Bu QR kodu geçerli bir aşı sertifikası değildir.\n\nAşı sertifikanızı nasıl alacağınız hakkında daha fazla bilgi için lütfen SSS sayfamıza bakın."</string>