Skip to content
This repository has been archived by the owner on Jun 20, 2023. It is now read-only.

Extend notes for certificate verification by third parties (EXPOSUREAPP-13387) #5325

Merged
merged 3 commits into from
Jul 11, 2022
Merged

Extend notes for certificate verification by third parties (EXPOSUREAPP-13387) #5325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94a5021
add bulletpoint
schauersbergern Jul 6, 2022
c72a380
Merge branch 'release/2.25.x' into feature/13387-extend_notes
SamuraiKek Jul 8, 2022
82ab92d
Merge branch 'release/2.25.x' into feature/13387-extend_notes
SamuraiKek Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 31 additions & 0 deletions Corona-Warn-App/src/main/res/layout/fragment_cov_pass_info.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,37 @@

</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/bullet_point_four_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/spacing_normal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/bullet_point_three_container">

<include
android:id="@+id/bulletpoint_four"
layout="@layout/include_bullet_point"
android:layout_width="@dimen/bullet_point_size"
android:layout_height="@dimen/bullet_point_size"
app:layout_constraintBaseline_toBaselineOf="@id/bullet_point_four_body" />

<TextView
android:id="@+id/bullet_point_four_body"
style="@style/subtitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/spacing_normal"
android:focusable="true"
android:text="@string/cov_pass_info_section_four"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/bulletpoint_four"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.core.widget.NestedScrollView>

Expand Down
2 changes: 2 additions & 0 deletions Corona-Warn-App/src/main/res/values-bg/covid_certificate_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@
<string name="cov_pass_info_section_two">"Но имайте предвид, че визуалната проверка на сертификатите не е достатъчна за третите лица. В Германия те трябва да използват приложението CovPassCheck."</string>
<!-- XHED: Cov Pass Info Fragment title -->
<string name="cov_pass_info_section_three">"Имайте предвид също така, че трети лица в други държави може да използват различни приложения за проверка на сертификатите."</string>
<!-- XHED: Cov Pass Info Fragment section four text -->
<string name="cov_pass_info_section_four"></string>

<!-- #####################################################
CONFIRMED STATUS CARD
Expand Down
8 changes: 5 additions & 3 deletions Corona-Warn-App/src/main/res/values-de/covid_certificate_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,12 +331,14 @@
<!-- XTXT: Cov Pass Info Fragment link label -->
<string name="cov_pass_info_faq_link_label">"FAQ zur Zertifikatsprüfung durch Dritte"</string>

<!-- XHED: Cov Pass Info Fragment title -->
<!-- XHED: Cov Pass Info Fragment section one text -->
<string name="cov_pass_info_section_one">"Sie selbst können Ihre Zertifikate in der Corona-Warn-App vor einer Reise auf Gültigkeit prüfen und benötigen dazu nicht die CovPassCheck-App."</string>
<!-- XHED: Cov Pass Info Fragment title -->
<!-- XHED: Cov Pass Info Fragment section two text -->
<string name="cov_pass_info_section_two">"Für Dritte reicht eine Sichtprüfung der Zertifikate nicht aus. Sie müssen in Deutschland die CovPassCheck-App nutzen."</string>
<!-- XHED: Cov Pass Info Fragment title -->
<!-- XHED: Cov Pass Info Fragment section three text -->
<string name="cov_pass_info_section_three">"Bitte beachten Sie, dass in anderen Ländern gegebenenfalls andere Apps zur Zertifikatsprüfung durch Dritte verwendet werden."</string>
<!-- XHED: Cov Pass Info Fragment section four text -->
<string name="cov_pass_info_section_four">"Bitte halten Sie bei einer Zertifikatsprüfung ein Ausweisdokument mit Lichtbild bereit."</string>

<!-- #####################################################
CONFIRMED STATUS CARD
Expand Down
2 changes: 2 additions & 0 deletions Corona-Warn-App/src/main/res/values-pl/covid_certificate_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@
<string name="cov_pass_info_section_two">"Dla osób trzecich nie wystarczy jednak wizualna kontrola certyfikatów. Muszą one korzystać z aplikacji CovPassCheck w Niemczech."</string>
<!-- XHED: Cov Pass Info Fragment title -->
<string name="cov_pass_info_section_three">"Należy pamiętać, że osoby trzecie w innych krajach mogą używać innych aplikacji do weryfikacji certyfikatów."</string>
<!-- XHED: Cov Pass Info Fragment section four text -->
<string name="cov_pass_info_section_four"></string>

<!-- #####################################################
CONFIRMED STATUS CARD
Expand Down
2 changes: 2 additions & 0 deletions Corona-Warn-App/src/main/res/values-ro/covid_certificate_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@
<string name="cov_pass_info_section_two">"Totuși, o verificare vizuală a certificatelor nu este suficientă pentru terți. Aceștia trebuie să utilizeze aplicația CovPassCheck în Germania."</string>
<!-- XHED: Cov Pass Info Fragment title -->
<string name="cov_pass_info_section_three">"Rețineți că terții din alte țări pot utiliza alte aplicații pentru a verifica certificatele."</string>
<!-- XHED: Cov Pass Info Fragment section four text -->
<string name="cov_pass_info_section_four"></string>

<!-- #####################################################
CONFIRMED STATUS CARD
Expand Down
2 changes: 2 additions & 0 deletions Corona-Warn-App/src/main/res/values-tr/covid_certificate_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@
<string name="cov_pass_info_section_two">"Ancak üçüncü tarafların sertifikaları görsel olarak doğrulaması yeterli değildir. Üçüncü tarafların Almanya\'da CovPassCheck uygulamasını kullanması gerekir."</string>
<!-- XHED: Cov Pass Info Fragment title -->
<string name="cov_pass_info_section_three">"Diğer ülkelerdeki üçüncü tarafların sertifika doğrulaması için farklı uygulamaları kullanabileceğini lütfen unutmayın."</string>
<!-- XHED: Cov Pass Info Fragment section four text -->
<string name="cov_pass_info_section_four"></string>

<!-- #####################################################
CONFIRMED STATUS CARD
Expand Down
2 changes: 2 additions & 0 deletions Corona-Warn-App/src/main/res/values-uk/covid_certificate_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@
<string name="cov_pass_info_section_two">"Однак візуальної перевірки сертифікатів для третіх осіб недостатньо. Вони повинні використовувати застосунок CovPassCheck в Німеччині."</string>
<!-- XHED: Cov Pass Info Fragment title -->
<string name="cov_pass_info_section_three">"Зверніть увагу, що треті сторони в інших країнах можуть використовувати різні застосунки для перевірки сертифікатів."</string>
<!-- XHED: Cov Pass Info Fragment section four text -->
<string name="cov_pass_info_section_four"></string>

<!-- #####################################################
CONFIRMED STATUS CARD
Expand Down
2 changes: 2 additions & 0 deletions Corona-Warn-App/src/main/res/values/covid_certificate_strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,8 @@
<string name="cov_pass_info_section_two">"A visual check of the certificates is not sufficient for third parties, however. They must use the CovPassCheck app in Germany."</string>
<!-- XHED: Cov Pass Info Fragment title -->
<string name="cov_pass_info_section_three">"Please note that third parties in other countries may use different apps to verify certificates."</string>
<!-- XHED: Cov Pass Info Fragment section four text -->
<string name="cov_pass_info_section_four"></string>

<!-- #####################################################
CONFIRMED STATUS CARD
Expand Down