Fix formatting eu qr info (#514)

* fix formatting eu qr

* fix recovery text

holder/src/main/res/values-en/strings.xml

@@ -210,8 +210,8 @@
     <string name="qr_explanation_title_domestic">About my Dutch QR code</string>
     <string name="qr_explanation_description_domestic"><![CDATA[Your Dutch QR code contains minimal data. The QR code doesn\'t say whether or not you have a test certificate or vaccination. It does say whether or not the QR code is valid. The QR code also contains several of your details. This is for verification purposes, to make sure this QR code belongs to you. The details consist of the first letter of your first name, the first letter of your last name, your birth month, and your day of birth. For security reasons, some details may disappear.<br/><br/>Your details: <b>%1$s</b><br/><br/>Always use the Dutch QR code within the Netherlands. The international QR code isn\'t valid in the Netherlands.]]></string>
     <string name="qr_explanation_title_eu">About my international QR code</string>
-    <string name="qr_explanation_description_eu_vaccination"><![CDATA[Travelling outside of the Netherlands? Then more data is required. That\'s why the international QR code contains the following details:<br/><br/> Name: <b>%1$s</b><br/>Date of birth*: <b>%2$s</b><br/><br/>Disease targeted: <b>%3$s</b><br/> Vaccine: <b>%4$s</b><br/> Vaccine medicinal product: <b>%5$s</b><br/> Vaccine manufacturer: <b>%6$s</b><br/>Number in series of doses: <b>%7$s</b><br/> Date of vaccination*: <b>%8$s</b><br/> Member state of vaccination: <b>%9$s</b><br/>Certificate issuer: <b>%10$s</b><br/><br/>Unique certificate identifier: <b>%11$s</b><br/><br/> *Date displayed as dd-mm-yyyy.</p>]]></string>
-    <string name="qr_explanation_description_eu_test"><![CDATA[<p>Travelling outside the Netherlands? Then more data is required. That\'s why the international QR code contains the following details:<br/><br/> Name: <b>%1$s</b><br/>Date of birth: <b>%2$s</b><br/><br/>Pathogen: <b>%3$s</b><br/> Test: <b>%4$s</b><br/> Test type: <b>%5$s</b><br/> Test date: <b>%6$s</b><br/> Test result: <b>%7$s</b><br/> Test location: <b>%8$s</b><br/>Manufacturer: <b>%9$s</b><br/> Tested in: <b>%10$s</b><br/>Unique certificate identifier: <b>%11$s</b><br/><br/> Always use the international QR code in other countries. The Dutch QR code is not valid outside the Netherlands.]]></string>
+    <string name="qr_explanation_description_eu_vaccination"><![CDATA[Travelling outside of the Netherlands? Then more data is required. That\'s why the international QR code contains the following details:<br/><br/>Name: <br/><b>%1$s</b><br/><br/>Date of birth*: <br/><b>%2$s</b><br/><br/>Disease targeted: <br/><b>%3$s</b><br/><br/>Vaccine: <br/><b>%4$s</b><br/><br/>Vaccine medicinal product: <br/><b>%5$s</b><br/><br/>Vaccine manufacturer: <br/><b>%6$s</b><br/><br/>Number in series of doses: <br/><b>%7$s</b><br/><br/>Date of vaccination*: <br/><b>%8$s</b><br/><br/>Member state of vaccination: <br/><b>%9$s</b><br/><br/>Certificate issuer: <br/><b>%10$s</b><br/><br/>Unique certificate identifier: <br/><b>%11$s</b><br/><br/>*Date displayed as dd-mm-yyyy]]></string>
+    <string name="qr_explanation_description_eu_test"><![CDATA[<p>Travelling outside the Netherlands? Then more data is required. That\'s why the international QR code contains the following details:<br/><br/> Name: <br/><b>%1$s</b><br/><br/>Date of birth*: <br/><b>%2$s</b><br/><br/>Pathogen: <br/><b>%3$s</b><br/><br/>Test: <br/><b>%4$s</b><br/><br/>Test type: <br/><b>%5$s</b><br/><br/>Test date*: <br/><b>%6$s</b><br/><br/>Test result: <br/><b>%7$s</b><br/><br/>Test location: <br/><b>%8$s</b><br/><br/>Manufacturer: <br/><b>%9$s</b><br/><br/>Tested in: <br/><b>%10$s</b><br/><br/>Unique certificate identifier: <br/><b>%11$s</b><br/><br/>Always use the international QR code in other countries. The Dutch QR code is not valid outside the Netherlands.<br/><br/>*Date displayed as dd-mm-yyyy]]></string>
     <string name="qr_explanation_icon_label">About your QR code</string>
     <string name="qr_card_expired">Your QR code has expired.</string>
     <string name="qr_card_vaccination_title_domestic">Vaccination certificate:</string>
@@ -298,7 +298,7 @@
     <string name="rule_engine_no_positive_test_origin_description"><![CDATA[At this moment, we can\'t make a certificate from your positive test result. This can have various causes. Find more information on <a href="https://www.coronacheck.nl/en/guidepost"> the Guidepost.</a>]]></string>
     <string name="positive_test_no_longer_valid_title">Positive test result is not valid</string>
     <string name="positive_test_no_longer_valid_description"><![CDATA[Have you been tested more than 180 days ago? Then your test result is no longer valid. In this case, you cannot create a recovery certificate.]]></string>
-    <string name="qr_explanation_description_eu_recovery"><![CDATA[Travelling outside of the Netherlands? Then more data is required. That\'s why the international QR code contains the following details:<br/><br/> Name: <b>%1$s</b><br/>Date of birth: <b>%2$s</b><br/><br/>Disease recovered from: <b>%3$s</b><br/> Test date: <b>%4$s</b><br/> Member state of test: <b>%5$s</b><br/> Certificate issuer: <b>%6$s</b><br/>Valid from: <b>%7$s</b><br/> Valid to: <b>%8$s</b><br/> Unique certificate identifier: <b>%9$s</b><br/>Date displayed as dd-mm-yyyy.</p>]]></string>
+    <string name="qr_explanation_description_eu_recovery"><![CDATA[Travelling outside of the Netherlands? Then more data is required. That\'s why the international QR code contains the following details:<br/><br/>Name:<br/><b>%1$s</b><br/><br/>Date of birth*:<br/><b>%2$s</b><br/><br/>Disease recovered from:<br/><b>%3$s</b><br/><br/>Test date*:<br/><b>%4$s</b><br/><br/>Member state of test:<br/><b>%5$s</b><br/><br/>Certificate issuer:<br/><b>%6$s</b><br/><br/>Valid from*:<br/><b>%7$s</b><br/><br/>Valid to*:<br/><b>%8$s</b><br/><br/>Unique certificate identifier:<br/><b>%9$s</b><br/><br/>*Date displayed as dd-mm-yyyy.]]></string>
     <string name="my_overview_green_card_not_valid_title_recovery">About your recovery certificate</string>
     <string name="my_overview_green_card_not_valid_domestic_but_is_in_eu_bottom_sheet_description_recovery"><![CDATA[Your recovery certificate isn\'t valid in the Netherlands, because the type of test is not accepted.<br/><br/>You’ve only got an international QR-code.]]></string>
     <string name="my_overview_green_card_not_valid_eu_but_is_in_domestic_bottom_sheet_description_recovery"><![CDATA[Your recovery certificate isn\'t valid internationally. You\'ve only got a Dutch certificate. <br/><br/>The reason is that the type of test is not accepted. An international recovery certificate can only be made with a PCR-test.]]></string>

holder/src/main/res/values/strings.xml

@@ -210,8 +210,8 @@
     <string name="qr_explanation_title_domestic">Over mijn Nederlandse QR-code</string>
     <string name="qr_explanation_description_domestic"><![CDATA[In jouw Nederlandse QR-code staan minimale gegevens. In de QR-code staat niet of je een testbewijs of vaccinatie hebt. Maar wel of de QR-code geldig is. Ook staan er enkele gegevens van jou in de QR-code. Dit is ter controle, om zeker te zijn dat de QR-code bij jou hoort. De gegevens bestaan uit de eerste letter van je voornaam, de eerste letter van je achternaam, je geboortedag en geboortemaand. Om privacyredenen kunnen er gegevens wegvallen.<br/><br/>Jouw gegevens: <b>%1$s</b><br/><br/>Gebruik in Nederland altijd de Nederlandse QR-code. De internationale QR-code is niet geldig in Nederland.]]></string>
     <string name="qr_explanation_title_eu">Over mijn internationale QR-code</string>
-    <string name="qr_explanation_description_eu_vaccination"><![CDATA[Reis je buiten Nederland? Dan zijn er meer gegevens nodig. Daarom staan in de internationale QR-code de volgende gegevens:<br/><br/> Naam / Name:<b>%1$s</b><br/> Geboortedatum / Date of birth: <b>%2$s</b><br/><br/> Ziekteverwekker / Disease targeted: <b>%3$s</b><br/> Vaccin / Vaccine: <b>%4$s</b><br/> Type vaccin / Vaccine medicinal product: <b>%5$s</b><br/> Producent / Vaccine manufacturer: <b>%6$s</b><br/> Doses / Number in series of doses: <b>%7$s</b><br/> Vaccinatiedatum / Date of vaccination*: <b>%8$s</b><br/> Gevaccineerd in / Member state of vaccination: <b>%9$s</b><br/>Afgever certificaat / Certificate issuer: <b>%10$s</b><br/><br/> Uniek certificaatnummer / Unique certificate identifier: <b>%11$s</b><br/><br/> *Datum weergegeven in dd-mm-yyyy / Date noted in dd-mm-yyyy.]]></string>
-    <string name="qr_explanation_description_eu_test"><![CDATA[Reis je buiten Nederland? Dan zijn er meer gegevens nodig. Daarom staan in de internationale QR-code de volgende gegevens:<br/><br/> Naam / Name: <b>%1$s</b><br/> Geboortedatum / Date of birth*: <b>%2$s</b><br/><br/> Ziekteverwekker / Disease targeted: <b>%3$s</b><br/> Type test / Type of test: <b>%4$s</b><br/> Test naam / Test name: <b>%5$s</b><br/> Testdatum / Test date*: <b>%6$s</b><br/> Testuitslag / Test result: <b>%7$s</b><br/> Testlocatie / Testing centre: <b>%8$s</b><br/> Producent / Test manufacturer: <b>%9$s</b><br/> Getest in / Member state of test: <b>%10$s</b><br/>Uniek certificaatnummer / Unique certificate identifier: <b>%11$s</b><br/><br/> *Datum weergegeven in dd-mm-yyyy / Date noted in dd-mm-yyyy.]]></string>
+    <string name="qr_explanation_description_eu_vaccination"><![CDATA[Reis je buiten Nederland? Dan zijn er meer gegevens nodig. Daarom staan in de internationale QR-code de volgende gegevens:<br/><br/>Naam / Name:<br/><b>%1$s</b><br/><br/>Geboortedatum / Date of birth*:<br/><b>%2$s</b><br/><br/>Ziekteverwekker / Disease targeted:<br/><b>%3$s</b><br/><br/>Vaccin / Vaccine:<br/><b>%4$s</b><br/><br/>Type vaccin / Vaccine medicinal product:<br/><b>%5$s</b><br/><br/>Producent / Vaccine manufacturer:<br/><b>%6$s</b><br/><br/>Doses / Number in series of doses:<br/><b>%7$s</b><br/><br/>Vaccinatiedatum / Date of vaccination*:<br/><b>%8$s</b><br/><br/>Gevaccineerd in / Member state of vaccination:<br/><b>%9$s</b><br/><br/>Afgever certificaat / Certificate issuer:<br/><b>%10$s</b><br/><br/>Uniek certificaatnummer / Unique certificate identifier:<br/><b>%11$s</b><br/><br/>*Datum weergegeven in dd-mm-yyyy / Date noted in dd-mm-yyyy.]]></string>
+    <string name="qr_explanation_description_eu_test"><![CDATA[Reis je buiten Nederland? Dan zijn er meer gegevens nodig. Daarom staan in de internationale QR-code de volgende gegevens:<br/><br/>Naam / Name:<br/><b>%1$s</b><br/><br/>Geboortedatum / Date of birth*:<br/><b>%2$s</b><br/><br/>Ziekteverwekker / Disease targeted:<br/><b>%3$s</b><br/><br/>Type test / Type of test:<br/><b>%4$s</b><br/><br/>Test naam / Test name:<br/><b>%5$s</b><br/><br/>Testdatum / Test date*:<br/><b>%6$s</b><br/> <br/>Testuitslag / Test result:<br/><b>%7$s</b><br/> <br/>Testlocatie / Testing centre:<br/><b>%8$s</b><br/> <br/>Producent / Test manufacturer:<br/><b>%9$s</b><br/> <br/>Getest in / Member state of test:<br/><b>%10$s</b><br/><br/>Uniek certificaatnummer / Unique certificate identifier:<br/><b>%11$s</b><br/><br/>*Datum weergegeven in dd-mm-yyyy / Date noted in dd-mm-yyyy.]]></string>
     <string name="qr_explanation_icon_label">Uitleg over QR-code</string>
     <string name="qr_card_expired">De QR-code is verlopen.</string>
     <string name="qr_card_vaccination_title_domestic">Vaccinatiebewijs:</string>
@@ -298,7 +298,7 @@
     <string name="rule_engine_no_positive_test_origin_description"><![CDATA[Op dit moment kunnen we geen bewijs maken van jouw positieve testuitslag. Dit kan verschillende oorzaken hebben. Lees meer op <a href="https://www.coronacheck.nl/wegwijzer">de Wegwijzer.</a>]]></string>
     <string name="positive_test_no_longer_valid_title">Positieve testuitslag niet meer geldig</string>
     <string name="positive_test_no_longer_valid_description"><![CDATA[Is het langer dan 180 dagen geleden dat je getest bent? Dan is je testuitslag niet meer geldig. Je kunt dan geen herstelbewijs maken.]]></string>
-    <string name="qr_explanation_description_eu_recovery"><![CDATA[Reis je buiten Nederland? Dan zijn er meer gegevens nodig. Daarom staan in de internationale QR-code de volgende gegevens:<br/><br/> Naam / Name: <b>%1$s</b><br/> Geboortedatum / Date of birth: <b>%2$s</b><br/><br/> Ziekte waarvan hersteld / Disease recovered from: <b>%3$s</b><br/> Testdatum / Test date: <b>%4$s</b><br/> Getest in / Member state of test: <b>%5$s</b><br/> Afgever certificaat / Certificate issuer: <b>%6$s</b><br/> Geldig vanaf / Valid from: <b>%7$s</b><br/> Valid to: <b>%8$s</b><br/> Uniek certificaatnummer / Unique certificate identifier: <b>%9$s</b><br/><br/>*Datum weergegeven in dd-mm-yyyy / Date noted in dd-mm-yyyy.]]></string>
+    <string name="qr_explanation_description_eu_recovery"><![CDATA[Reis je buiten Nederland? Dan zijn er meer gegevens nodig. Daarom staan in de internationale QR-code de volgende gegevens:<br/><br/>Naam / Name:<br/> <b>%1$s</b><br/><br/>Geboortedatum / Date of birth*:<br/><b>%2$s</b><br/><br/>Ziekte waarvan hersteld / Disease recovered from:<br/><b>%3$s</b><br/><br/>Testdatum / Test date*:<br/><b>%4$s</b><br/><br/>Getest in / Member state of test:<br/><b>%5$s</b><br/><br/>Afgever certificaat / Certificate issuer:<br/><b>%6$s</b><br/><br/>Geldig vanaf / Valid from*:<br/><b>%7$s</b><br/><br/>Geldig tot / Valid to*:<br/><b>%8$s</b><br/><br/>Uniek certificaatnummer / Unique certificate identifier:<br/><b>%9$s</b><br/><br/>*Datum weergegeven in dd-mm-yyyy / Date noted in dd-mm-yyyy.]]></string>
     <string name="my_overview_green_card_not_valid_title_recovery">Over je herstelbewijs</string>
     <string name="my_overview_green_card_not_valid_domestic_but_is_in_eu_bottom_sheet_description_recovery"><![CDATA[Jouw herstelbewijs is niet geldig in Nederland. Je hebt wel een internationaal bewijs.<br/><br/>Dit komt doordat het type test niet voldoet in Nederland.]]></string>
     <string name="my_overview_green_card_not_valid_eu_but_is_in_domestic_bottom_sheet_description_recovery"><![CDATA[Jouw herstelbewijs is niet internationaal geldig. Je hebt wel een Nederlands bewijs.<br/><br/>Dit komt doordat het type test niet voldoet. Alleen van een PCR-test kan een internationaal bewijs gemaakt worden.]]></string>