From 22a8445d32b20032b72f49d97c7f7c190b1dd009 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Wed, 4 Nov 2020 09:58:50 +0100
Subject: [PATCH 01/11] add trigger exposure check button to debug fragment,
 allows to retrigger the exposure computation in all non-productive apps

---
 .../admin/bag/dp3t/debug/DebugFragment.java   |  4 ++
 .../admin/bag/dp3t/debug/DebugFragment.java   |  4 ++
 .../admin/bag/dp3t/debug/DebugFragment.java   | 55 +++++++++++++++++--
 app/src/main/res/layout/fragment_debug.xml    | 32 +++++++++++
 .../admin/bag/dp3t/debug/DebugFragment.java   |  4 ++
 5 files changed, 93 insertions(+), 6 deletions(-)

diff --git a/app/src/abnahme/java/ch/admin/bag/dp3t/debug/DebugFragment.java b/app/src/abnahme/java/ch/admin/bag/dp3t/debug/DebugFragment.java
index 7ce7f4f0..3eae6855 100644
--- a/app/src/abnahme/java/ch/admin/bag/dp3t/debug/DebugFragment.java
+++ b/app/src/abnahme/java/ch/admin/bag/dp3t/debug/DebugFragment.java
@@ -19,6 +19,7 @@
 import androidx.fragment.app.FragmentManager;
 
 import org.dpppt.android.sdk.DP3T;
+import org.dpppt.android.sdk.internal.nearby.ExposureWindowMatchingWorker;
 
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.networking.CertificatePinning;
@@ -58,6 +59,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 			CertificatePinning.setEnabled(isChecked, v.getContext());
 			DP3T.setCertificatePinner(CertificatePinning.getCertificatePinner());
 		});
+
+		view.findViewById(R.id.debug_trigger_exposure_check)
+				.setOnClickListener(v -> ExposureWindowMatchingWorker.startMatchingWorker(v.getContext()));
 	}
 
 }
diff --git a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
index 0987deeb..b859f7cb 100644
--- a/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
+++ b/app/src/dev/java/ch/admin/bag/dp3t/debug/DebugFragment.java
@@ -28,6 +28,7 @@
 import java.util.Arrays;
 
 import org.dpppt.android.sdk.DP3T;
+import org.dpppt.android.sdk.internal.nearby.ExposureWindowMatchingWorker;
 import org.dpppt.android.sdk.internal.storage.ExposureDayStorage;
 import org.dpppt.android.sdk.models.DayDate;
 import org.dpppt.android.sdk.models.ExposureDay;
@@ -98,6 +99,9 @@ private void setupSdkViews(View view) {
 			CertificatePinning.setEnabled(isChecked, v.getContext());
 			DP3T.setCertificatePinner(CertificatePinning.getCertificatePinner());
 		});
+
+		view.findViewById(R.id.debug_trigger_exposure_check)
+				.setOnClickListener(v -> ExposureWindowMatchingWorker.startMatchingWorker(v.getContext()));
 	}
 
 	private void setupStateOptions(View view) {
diff --git a/app/src/log/java/ch/admin/bag/dp3t/debug/DebugFragment.java b/app/src/log/java/ch/admin/bag/dp3t/debug/DebugFragment.java
index e6a4fd78..a535bc24 100644
--- a/app/src/log/java/ch/admin/bag/dp3t/debug/DebugFragment.java
+++ b/app/src/log/java/ch/admin/bag/dp3t/debug/DebugFragment.java
@@ -9,16 +9,59 @@
  */
 package ch.admin.bag.dp3t.debug;
 
+import android.os.Bundle;
+import android.view.View;
+import android.widget.CheckBox;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.widget.Toolbar;
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
+import org.dpppt.android.sdk.DP3T;
+import org.dpppt.android.sdk.internal.nearby.ExposureWindowMatchingWorker;
+
+import ch.admin.bag.dp3t.R;
+import ch.admin.bag.dp3t.networking.CertificatePinning;
+
 public class DebugFragment extends Fragment {
 
-	/**
-	 * DOES NOT (AND MUST NOT) EXIST ON PROD.
-	 */
-	public static final boolean EXISTS = false;
+	public static final boolean EXISTS = true;
+
+	public static void startDebugFragment(FragmentManager parentFragmentManager) {
+		parentFragmentManager.beginTransaction()
+				.setCustomAnimations(R.anim.slide_enter, R.anim.slide_exit, R.anim.slide_pop_enter, R.anim.slide_pop_exit)
+				.replace(R.id.main_fragment_container, DebugFragment.newInstance())
+				.addToBackStack(DebugFragment.class.getCanonicalName())
+				.commit();
+	}
+
+	public static DebugFragment newInstance() {
+		return new DebugFragment();
+	}
+
+	public DebugFragment() {
+		super(R.layout.fragment_debug);
+	}
+
+	@Override
+	public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+		Toolbar toolbar = view.findViewById(R.id.contacts_toolbar);
+		toolbar.setNavigationOnClickListener(v -> getParentFragmentManager().popBackStack());
+
+		view.findViewById(R.id.debug_card_sdkstate).setVisibility(View.GONE);
+
+		view.findViewById(R.id.debug_card_overridestate).setVisibility(View.GONE);
+
+		CheckBox certPinningCheckbox = view.findViewById(R.id.debug_certificate_pinning);
+		certPinningCheckbox.setChecked(CertificatePinning.isEnabled());
+		certPinningCheckbox.setOnCheckedChangeListener((v, isChecked) -> {
+			CertificatePinning.setEnabled(isChecked, v.getContext());
+			DP3T.setCertificatePinner(CertificatePinning.getCertificatePinner());
+		});
 
-	public static void startDebugFragment(FragmentManager parentFragmentManager) { }
+		view.findViewById(R.id.debug_trigger_exposure_check)
+				.setOnClickListener(v -> ExposureWindowMatchingWorker.startMatchingWorker(v.getContext()));
+	}
 
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_debug.xml b/app/src/main/res/layout/fragment_debug.xml
index 56ac8f8b..92852f78 100644
--- a/app/src/main/res/layout/fragment_debug.xml
+++ b/app/src/main/res/layout/fragment_debug.xml
@@ -217,6 +217,38 @@
 
 			</androidx.cardview.widget.CardView>
 
+			<androidx.cardview.widget.CardView
+				style="@style/NextStep.Card"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:layout_margin="@dimen/spacing_medium_large">
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:layout_marginLeft="@dimen/spacing_large"
+					android:layout_marginTop="@dimen/spacing_medium_large"
+					android:layout_marginRight="@dimen/spacing_large"
+					android:layout_marginBottom="@dimen/spacing_large"
+					android:orientation="vertical">
+
+					<TextView
+						style="@style/NextStep.Text.Title"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:text="Exposure Check" />
+
+					<Button
+						android:id="@+id/debug_trigger_exposure_check"
+						style="@style/NextStep.Button"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:text="Trigger ExposureWindow Check" />
+
+				</LinearLayout>
+
+			</androidx.cardview.widget.CardView>
+
 		</LinearLayout>
 
 	</ScrollView>
diff --git a/app/src/tescht/java/ch/admin/bag/dp3t/debug/DebugFragment.java b/app/src/tescht/java/ch/admin/bag/dp3t/debug/DebugFragment.java
index 5a3d5dd5..5e82b28a 100644
--- a/app/src/tescht/java/ch/admin/bag/dp3t/debug/DebugFragment.java
+++ b/app/src/tescht/java/ch/admin/bag/dp3t/debug/DebugFragment.java
@@ -22,6 +22,7 @@
 import androidx.lifecycle.ViewModelProvider;
 
 import org.dpppt.android.sdk.DP3T;
+import org.dpppt.android.sdk.internal.nearby.ExposureWindowMatchingWorker;
 
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.networking.CertificatePinning;
@@ -82,6 +83,9 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 			CertificatePinning.setEnabled(isChecked, v.getContext());
 			DP3T.setCertificatePinner(CertificatePinning.getCertificatePinner());
 		});
+
+		view.findViewById(R.id.debug_trigger_exposure_check)
+				.setOnClickListener(v -> ExposureWindowMatchingWorker.startMatchingWorker(v.getContext()));
 	}
 
 }

From 6b1d353903df62dc6a6123e852441e2a950cdccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Tue, 17 Nov 2020 13:03:17 +0100
Subject: [PATCH 02/11] added new text for swisscovid leitfaden

---
 .../bag/dp3t/reports/ReportsFragment.java     |  21 +---
 .../dp3t/util/NotificationStateHelper.java    |   4 +-
 app/src/main/res/drawable/ic_infoline.xml     |  20 ++++
 .../res/layout/card_what_to_do_call_us.xml    | 103 +++++++++++------
 .../layout/card_what_to_do_save_others.xml    | 109 +++++++++++-------
 app/src/main/res/layout/layout_status.xml     |   4 +-
 app/src/main/res/values-bs/strings.xml        |  30 +++++
 app/src/main/res/values-de/strings.xml        |  34 +++++-
 app/src/main/res/values-es/strings.xml        |  30 +++++
 app/src/main/res/values-fr/strings.xml        |  30 +++++
 app/src/main/res/values-hr/strings.xml        |  30 +++++
 app/src/main/res/values-it/strings.xml        |  30 +++++
 app/src/main/res/values-pt/strings.xml        |  30 +++++
 app/src/main/res/values-rm/strings.xml        |  30 +++++
 app/src/main/res/values-sq/strings.xml        |  30 +++++
 app/src/main/res/values-sr/strings.xml        |  30 +++++
 app/src/main/res/values-ti/strings.xml        |  30 +++++
 app/src/main/res/values-tr/strings.xml        |  30 +++++
 app/src/main/res/values/strings.xml           |  30 +++++
 19 files changed, 553 insertions(+), 102 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_infoline.xml

diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
index b4527453..1e2a60b1 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
@@ -58,9 +58,6 @@ public static ReportsFragment newInstance() {
 	private View hotlineView;
 	private View infectedView;
 
-	private TextView callHotlineLastText1;
-	private TextView callHotlineLastText2;
-
 	private TextView xDaysLeftTextview;
 
 
@@ -90,8 +87,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		hotlineView = view.findViewById(R.id.reports_hotline);
 		infectedView = view.findViewById(R.id.reports_infected);
 
-		callHotlineLastText1 = hotlineView.findViewById(R.id.card_encounters_last_call);
-		callHotlineLastText2 = saveOthersView.findViewById(R.id.card_encounters_last_call);
 		xDaysLeftTextview = saveOthersView.findViewById(R.id.x_days_left_textview);
 
 		Button callHotlineButton1 = hotlineView.findViewById(R.id.card_encounters_button);
@@ -178,8 +173,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
 	private void deleteNotifications(TracingStatusInterface tracingStatusInterface) {
 		AlertDialog.Builder builder = new AlertDialog.Builder(getActivity(), R.style.NextStep_AlertDialogStyle);
-		builder.setMessage(R.string.delete_reports_dialog)
-				.setPositiveButton(R.string.android_button_ok, (dialog, id) -> {
+		builder.setMessage(R.string.delete_notification_dialog)
+				.setPositiveButton(R.string.delete_reports_button, (dialog, id) -> {
 					tracingStatusInterface.resetExposureDays(getContext());
 					getParentFragmentManager().popBackStack();
 				})
@@ -214,18 +209,6 @@ public void onResume() {
 			saveOthersView.setVisibility(View.VISIBLE);
 		}
 
-		long lastHotlineCallTimestamp = secureStorage.lastHotlineCallTimestamp();
-		if (lastHotlineCallTimestamp != 0) {
-			((TextView) hotlineView.findViewById(R.id.card_encounters_title)).setText(R.string.meldungen_detail_call_again);
-
-			String date = DateUtils.getFormattedDateTime(lastHotlineCallTimestamp);
-			date = getString(R.string.meldungen_detail_call_last_call).replace("{DATE}", date);
-			callHotlineLastText1.setText(date);
-			callHotlineLastText2.setText(date);
-		} else {
-			callHotlineLastText1.setText("");
-			callHotlineLastText2.setText("");
-		}
 	}
 
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationStateHelper.java b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationStateHelper.java
index e4c6bc85..268b59fe 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/util/NotificationStateHelper.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/util/NotificationStateHelper.java
@@ -75,8 +75,8 @@ public static void updateStatusView(View statusView, NotificationState state, lo
 			triangle.setVisibility(View.VISIBLE);
 			triangle.setImageResource(R.drawable.triangle_status_exposed);
 			infoContainer.setVisibility(View.VISIBLE);
-			infoText.setText(R.string.exposed_info_contact_hotline);
-			infoTel.setText(R.string.exposed_info_contact_hotline_name);
+			infoText.setText(R.string.exposed_info_answer_questions_in_leitfaden);
+			infoTel.setText(R.string.exposed_info_swisscovid_leitfaden);
 			infoSince.setVisibility(View.VISIBLE);
 			if (daySinceExposed == 0) {
 				String string = context.getString(R.string.date_today);
diff --git a/app/src/main/res/drawable/ic_infoline.xml b/app/src/main/res/drawable/ic_infoline.xml
new file mode 100644
index 00000000..9b0e7d3f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_infoline.xml
@@ -0,0 +1,20 @@
+<!--
+  ~ Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch>
+  ~
+  ~ This Source Code Form is subject to the terms of the Mozilla Public
+  ~ License, v. 2.0. If a copy of the MPL was not distributed with this
+  ~ file, You can obtain one at https://mozilla.org/MPL/2.0/.
+  ~
+  ~ SPDX-License-Identifier: MPL-2.0
+  -->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M20,15.5c-1.25,0 -2.45,-0.2 -3.57,-0.57 -0.35,-0.11 -0.74,-0.03 -1.02,0.24l-2.2,2.2c-2.83,-1.44 -5.15,-3.75 -6.59,-6.58l2.2,-2.21c0.28,-0.27 0.36,-0.66 0.25,-1.01C8.7,6.45 8.5,5.25 8.5,4c0,-0.55 -0.45,-1 -1,-1L4,3C3.45,3 3,3.45 3,4c0,9.39 7.61,17 17,17 0.55,0 1,-0.45 1,-1v-3.5c0,-0.55 -0.45,-1 -1,-1zM12,3v10l3,-3h6L21,3L12,3z"
+      android:fillColor="#4A4969"
+      android:fillType="evenOdd"/>
+</vector>
diff --git a/app/src/main/res/layout/card_what_to_do_call_us.xml b/app/src/main/res/layout/card_what_to_do_call_us.xml
index 65c17cf4..306a6e13 100644
--- a/app/src/main/res/layout/card_what_to_do_call_us.xml
+++ b/app/src/main/res/layout/card_what_to_do_call_us.xml
@@ -50,7 +50,7 @@
 					android:layout_height="wrap_content"
 					android:layout_marginTop="@dimen/spacing_tiny_small"
 					android:layout_marginBottom="@dimen/spacing_tiny_small"
-					android:text="@string/meldungen_detail_call"
+					android:text="@string/meldungen_detail_leitfaden_title"
 					app:layout_constraintTop_toBottomOf="@id/card_encounters_subtitle" />
 
 				<ImageView
@@ -79,18 +79,12 @@
 					app:layout_constraintRight_toLeftOf="@id/card_encounters_image"
 					app:layout_constraintTop_toTopOf="@id/card_encounters_image">
 
-					<TextView
-						style="@style/NextStep.Text.Bold"
-						android:layout_width="match_parent"
-						android:layout_height="wrap_content"
-						android:text="@string/infoline_tel_number" />
-
 					<TextView
 						android:id="@+id/card_encounters_text"
 						style="@style/NextStep.Text"
 						android:layout_width="match_parent"
 						android:layout_height="wrap_content"
-						android:text="@string/exposed_info_contact_hotline_name" />
+						android:text="@string/meldungen_detail_leitfaden_text" />
 
 				</LinearLayout>
 
@@ -107,7 +101,7 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_marginTop="@dimen/spacing_small"
-					android:text="@string/meldungen_detail_call_button"
+					android:text="@string/meldungen_detail_open_leitfaden_button"
 					android:textAllCaps="true"
 					app:layout_constraintTop_toBottomOf="@id/card_encounters_barrier1" />
 
@@ -226,6 +220,70 @@
 
 			</LinearLayout>
 
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal"
+				android:paddingLeft="@dimen/spacing_medium"
+				android:paddingTop="@dimen/spacing_larger"
+				android:paddingRight="@dimen/spacing_medium"
+				android:paddingBottom="@dimen/spacing_larger">
+
+				<ImageView
+					android:layout_width="@dimen/icon_size"
+					android:layout_height="@dimen/icon_size"
+					android:layout_marginLeft="@dimen/spacing_very_small"
+					android:layout_marginRight="@dimen/spacing_small"
+					android:src="@drawable/ic_infoline" />
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="vertical">
+
+					<TextView
+						style="@style/NextStep.Text.Bold"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginBottom="@dimen/spacing_small"
+						android:text="@string/meldungen_tel_information_title" />
+
+					<TextView
+						style="@style/NextStep.Text"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:text="@string/meldungen_tel_information_text" />
+
+					<LinearLayout
+						android:id="@+id/item_call_hotline_layout"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginTop="@dimen/spacing_very_small"
+						android:background="@drawable/ripple_button"
+						android:orientation="horizontal"
+						android:paddingTop="@dimen/spacing_small"
+						android:paddingBottom="@dimen/spacing_small">
+
+						<ImageView
+							android:layout_width="@dimen/icon_size"
+							android:layout_height="@dimen/icon_size"
+							android:src="@drawable/ic_call"
+							android:tint="@color/blue_main" />
+
+						<TextView
+							android:id="@+id/item_call_hotline_text"
+							style="@style/NextStep.Text.Bold.Blue"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_marginLeft="@dimen/spacing_small"
+							android:text="@string/infoline_tel_number" />
+
+					</LinearLayout>
+
+				</LinearLayout>
+
+			</LinearLayout>
+
 			<View
 				android:layout_width="match_parent"
 				android:layout_height="1dp"
@@ -258,33 +316,6 @@
 		android:paddingTop="@dimen/spacing_very_large"
 		android:paddingBottom="@dimen/spacing_medium_large">
 
-		<TextView
-			style="@style/NextStep.Text.Bold"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/spacing_small"
-			android:text="@string/meldungen_meldungen_faq1_title" />
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal">
-
-			<ImageView
-				android:layout_width="@dimen/icon_size"
-				android:layout_height="@dimen/icon_size"
-				android:layout_marginRight="@dimen/spacing_medium_large"
-				android:src="@drawable/ic_call"
-				android:tint="@color/blue_main" />
-
-			<TextView
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/meldungen_meldungen_faq1_text" />
-
-		</LinearLayout>
-
 		<Button
 			android:id="@+id/card_encounters_faq_button"
 			style="@style/NextStep.Button.Outlined"
diff --git a/app/src/main/res/layout/card_what_to_do_save_others.xml b/app/src/main/res/layout/card_what_to_do_save_others.xml
index e07928f8..7563f23d 100644
--- a/app/src/main/res/layout/card_what_to_do_save_others.xml
+++ b/app/src/main/res/layout/card_what_to_do_save_others.xml
@@ -75,7 +75,7 @@
 					android:layout_height="wrap_content"
 					android:layout_marginTop="@dimen/spacing_tiny_small"
 					android:gravity="center_vertical"
-					android:text="@string/meldungen_detail_guard_text"
+					android:text="@string/meldungen_detail_leitfaden_again_text"
 					app:layout_constraintBottom_toTopOf="@id/card_encounters_barrier1"
 					app:layout_constraintLeft_toLeftOf="parent"
 					app:layout_constraintRight_toRightOf="@id/card_encounters_space1"
@@ -94,26 +94,15 @@
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_marginTop="@dimen/spacing_small"
-					android:text="@string/meldungen_detail_call_again_button"
+					android:text="@string/meldungen_detail_open_leitfaden_again_button"
 					app:layout_constraintTop_toBottomOf="@id/card_encounters_barrier1" />
 
-				<TextView
-					android:id="@+id/card_encounters_last_call"
-					style="@style/NextStep.Text"
-					android:layout_width="match_parent"
-					android:layout_height="wrap_content"
-					android:layout_marginTop="@dimen/spacing_small"
-					android:text="@string/meldungen_detail_call_last_call"
-					android:textColor="@color/grey_dark"
-					android:textSize="@dimen/text_size_small"
-					app:layout_constraintTop_toBottomOf="@id/card_encounters_button" />
-
 				<LinearLayout
 					android:layout_width="match_parent"
 					android:layout_height="wrap_content"
 					android:layout_marginTop="@dimen/spacing_large"
 					android:orientation="vertical"
-					app:layout_constraintTop_toBottomOf="@id/card_encounters_last_call">
+					app:layout_constraintTop_toBottomOf="@id/card_encounters_button">
 
 					<TextView
 						style="@style/NextStep.Text.Bold"
@@ -226,6 +215,71 @@
 
 			</LinearLayout>
 
+
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:orientation="horizontal"
+				android:paddingLeft="@dimen/spacing_medium"
+				android:paddingTop="@dimen/spacing_larger"
+				android:paddingRight="@dimen/spacing_medium"
+				android:paddingBottom="@dimen/spacing_larger">
+
+				<ImageView
+					android:layout_width="@dimen/icon_size"
+					android:layout_height="@dimen/icon_size"
+					android:layout_marginLeft="@dimen/spacing_very_small"
+					android:layout_marginRight="@dimen/spacing_small"
+					android:src="@drawable/ic_infoline" />
+
+				<LinearLayout
+					android:layout_width="match_parent"
+					android:layout_height="wrap_content"
+					android:orientation="vertical">
+
+					<TextView
+						style="@style/NextStep.Text.Bold"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:layout_marginBottom="@dimen/spacing_small"
+						android:text="@string/meldungen_tel_information_title" />
+
+					<TextView
+						style="@style/NextStep.Text"
+						android:layout_width="match_parent"
+						android:layout_height="wrap_content"
+						android:text="@string/meldungen_tel_information_text" />
+
+					<LinearLayout
+						android:id="@+id/item_call_hotline_layout"
+						android:layout_width="wrap_content"
+						android:layout_height="wrap_content"
+						android:layout_marginTop="@dimen/spacing_very_small"
+						android:background="@drawable/ripple_button"
+						android:orientation="horizontal"
+						android:paddingTop="@dimen/spacing_small"
+						android:paddingBottom="@dimen/spacing_small">
+
+						<ImageView
+							android:layout_width="@dimen/icon_size"
+							android:layout_height="@dimen/icon_size"
+							android:src="@drawable/ic_call"
+							android:tint="@color/blue_main" />
+
+						<TextView
+							android:id="@+id/item_call_hotline_text"
+							style="@style/NextStep.Text.Bold.Blue"
+							android:layout_width="wrap_content"
+							android:layout_height="wrap_content"
+							android:layout_marginLeft="@dimen/spacing_small"
+							android:text="@string/infoline_tel_number" />
+
+					</LinearLayout>
+
+				</LinearLayout>
+
+			</LinearLayout>
+
 			<View
 				android:layout_width="match_parent"
 				android:layout_height="1dp"
@@ -257,33 +311,6 @@
 		android:paddingTop="@dimen/spacing_very_large"
 		android:paddingBottom="@dimen/spacing_medium_large">
 
-		<TextView
-			style="@style/NextStep.Text.Bold"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_marginBottom="@dimen/spacing_small"
-			android:text="@string/meldungen_meldungen_faq1_title" />
-
-		<LinearLayout
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:orientation="horizontal">
-
-			<ImageView
-				android:layout_width="@dimen/icon_size"
-				android:layout_height="@dimen/icon_size"
-				android:layout_marginRight="@dimen/spacing_medium_large"
-				android:src="@drawable/ic_call"
-				android:tint="@color/blue_main" />
-
-			<TextView
-				style="@style/NextStep.Text"
-				android:layout_width="match_parent"
-				android:layout_height="wrap_content"
-				android:text="@string/meldungen_meldungen_faq1_text" />
-
-		</LinearLayout>
-
 		<Button
 			android:id="@+id/card_encounters_faq_button"
 			style="@style/NextStep.Button.Outlined"
diff --git a/app/src/main/res/layout/layout_status.xml b/app/src/main/res/layout/layout_status.xml
index 244f4a9d..7365dbd9 100644
--- a/app/src/main/res/layout/layout_status.xml
+++ b/app/src/main/res/layout/layout_status.xml
@@ -135,7 +135,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:gravity="start"
-			android:text="@string/exposed_info_contact_hotline" />
+			android:text="@string/exposed_info_answer_questions_in_leitfaden" />
 
 		<TextView
 			android:id="@+id/status_additional_info_tel"
@@ -143,7 +143,7 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:gravity="start"
-			android:text="@string/exposed_info_contact_hotline_name" />
+			android:text="@string/exposed_info_swisscovid_leitfaden" />
 
 		<TextView
 			android:id="@+id/status_additional_info_since"
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index c1dcca18..cae35b6c 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1050,4 +1050,34 @@ Schwarzenburgstrasse 157
 
     <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
     <string name="meldung_detail_exposed_show_less_button">"Prikaži manje"</string>
+
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title"></string>
+
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text"></string>
+
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button"></string>
+
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title"></string>
+
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text"></string>
+
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text"></string>
+
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden"></string>
+
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index f2bd471e..92fb270e 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -840,7 +840,7 @@ Infektionsketten."</string>
 
     <!-- Meldung Detail Weiss Box unten -->
     <!-- Fuzzy -->
-    <string name="meldungen_detail_explanation_text4">"Rufen Sie eine Ärztin bzw. einen Arzt oder eine Gesundheitseinrichtung an."</string>
+    <string name="meldungen_detail_explanation_text4">"Bei ersten Symptomen rufen Sie eine Ärztin bzw. einen Arzt oder eine Gesundheitseinrichtung an."</string>
 
     <!-- Text beim Bluetooth Control -->
     <string name="tracing_setting_text_android">"COVID-19-Benachrichtigungen"</string>
@@ -905,7 +905,7 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_free_test_title">"Kostenloser Test möglich"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <string name="meldungen_detail_free_test_text">"Die Infoline SwissCovid berät Sie über die Möglichkeit eines kostenlosen Corona Tests."</string>
+    <string name="meldungen_detail_free_test_text">"Der SwissCovid Leitfaden informiert Sie über die Möglichkeit eines kostenlosen Coronavirus-Tests."</string>
 
     <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
     <string name="activate_tracing_button">"Tracing aktivieren"</string>
@@ -1089,4 +1089,34 @@ Wählen Sie das entsprechende Land, um auch diese Begegnungen zu informieren."</
 
     <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
     <string name="meldung_detail_exposed_show_less_button">"Weniger anzeigen"</string>
+
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title">"SwissCovid Leitfaden"</string>
+
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text">"Beantworten Sie die Fragen im SwissCvoid Leitfaden um zu erfahren, wie Sie richtig reagieren."</string>
+
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button">"Jetzt ausfüllen"</string>
+
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title">"Telefonische Auskunft"</string>
+
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text">"Bei weiteren Fragen gibt Ihnen die Infoline SwissCovid gerne auch telefonisch Auskunft."</string>
+
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text">"Sie können den SwissCovid Leitfaden hier jederzeit erneut öffnen."</string>
+
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button">"Zum Leitfaden"</string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden">"Beantworten Sie die Fragen im"</string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden">"SwissCovid Leitfaden"</string>
+
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog">"Die Meldung über eine mögliche Ansteckung dient als Nachweis, den Sie für einen kostenlosen Coronavirus-Test benötigen. Wenn Sie diese Meldung löschen, verlieren Sie diesen Nachweis und den Link für den SwissCovid Leitfaden."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 47a28686..1e569920 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1043,4 +1043,34 @@ Schwarzenburgstrasse 157
 
     <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
     <string name="meldung_detail_exposed_show_less_button">"Mostrar menos"</string>
+
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title"></string>
+
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text"></string>
+
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button"></string>
+
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title"></string>
+
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text"></string>
+
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text"></string>
+
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden"></string>
+
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1ef3feca..fe92853d 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1052,4 +1052,34 @@ d'ouvrir un site internet."</string>
 
     <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
     <string name="meldung_detail_exposed_show_less_button">"Affichage réduit"</string>
+
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title"></string>
+
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text"></string>
+
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button"></string>
+
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title"></string>
+
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text"></string>
+
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text"></string>
+
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden"></string>
+
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index f1b8c4d1..8e0818dc 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1046,4 +1046,34 @@ Schwarzenburgstrasse 157
 
     <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
     <string name="meldung_detail_exposed_show_less_button">"Prikaži manje"</string>
+
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title"></string>
+
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text"></string>
+
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button"></string>
+
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title"></string>
+
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text"></string>
+
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text"></string>
+
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden"></string>
+
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 68bb24e9..2a16c2b7 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1056,4 +1056,34 @@ Schwarzenburgstrasse 157
 
     <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
     <string name="meldung_detail_exposed_show_less_button">"Mostra meno segnalazioni"</string>
+
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title"></string>
+
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text"></string>
+
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button"></string>
+
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title"></string>
+
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text"></string>
+
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text"></string>
+
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden"></string>
+
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index b92b0ccb..48415d1d 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1051,4 +1051,34 @@ Schwarzenburgstrasse 157
 
     <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
     <string name="meldung_detail_exposed_show_less_button">"Mostrar menos"</string>
+
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title"></string>
+
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text"></string>
+
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button"></string>
+
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title"></string>
+
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text"></string>
+
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text"></string>
+
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden"></string>
+
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index a82241c7..500b39d7 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1046,4 +1046,34 @@ Schwarzenburgstrasse 157
 
     <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
     <string name="meldung_detail_exposed_show_less_button">"Mussar damain"</string>
+
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title"></string>
+
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text"></string>
+
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button"></string>
+
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title"></string>
+
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text"></string>
+
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text"></string>
+
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden"></string>
+
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index a1fabd6c..02a3dffe 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1051,4 +1051,34 @@ Schwarzenburgstrasse 157
 
     <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
     <string name="meldung_detail_exposed_show_less_button">"Shfaq më pak"</string>
+
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title"></string>
+
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text"></string>
+
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button"></string>
+
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title"></string>
+
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text"></string>
+
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text"></string>
+
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden"></string>
+
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index d8701a6d..0c69e0b6 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1046,4 +1046,34 @@ Schwarzenburgstrasse 157
 
     <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
     <string name="meldung_detail_exposed_show_less_button">"Prikaži manje"</string>
+
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title"></string>
+
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text"></string>
+
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button"></string>
+
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title"></string>
+
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text"></string>
+
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text"></string>
+
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden"></string>
+
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 19f76e6c..4cbe0ed3 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1019,4 +1019,34 @@ Schwarzenburgstrasse 157
 
     <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
     <string name="meldung_detail_exposed_show_less_button">"ዝወሓደ ምርኣይ"</string>
+
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title"></string>
+
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text"></string>
+
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button"></string>
+
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title"></string>
+
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text"></string>
+
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text"></string>
+
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden"></string>
+
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 85bc6b35..58247037 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1027,4 +1027,34 @@ Schwarzenburgstrasse 157
 
     <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
     <string name="meldung_detail_exposed_show_less_button">"Daha azını göster"</string>
+
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title"></string>
+
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text"></string>
+
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button"></string>
+
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title"></string>
+
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text"></string>
+
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text"></string>
+
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden"></string>
+
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c2bd0101..5f87f67d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1052,4 +1052,34 @@ Schwarzenburgstrasse 157
 
     <!-- Button Titel im Meldung Detail Header, wenn alle Meldungen angezeigt werden. -->
     <string name="meldung_detail_exposed_show_less_button">"Show fewer"</string>
+
+    <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_title"></string>
+
+    <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
+    <string name="meldungen_detail_leitfaden_text"></string>
+
+    <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
+    <string name="meldungen_detail_open_leitfaden_button"></string>
+
+    <!-- Title für Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_title"></string>
+
+    <!-- Infotext zu SwissCovid Infoline -->
+    <string name="meldungen_tel_information_text"></string>
+
+    <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
+    <string name="meldungen_detail_leitfaden_again_text"></string>
+
+    <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
+    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+
+    <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
+    <string name="exposed_info_swisscovid_leitfaden"></string>
+
+    <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
+    <string name="delete_notification_dialog"></string>
 </resources>
\ No newline at end of file

From cfb87b3b7c05faf6ae41475c07d18090030a35c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Thu, 19 Nov 2020 10:58:39 +0100
Subject: [PATCH 03/11] add new swisscovid leitfaden url handling

---
 .../java/ch/admin/bag/dp3t/MainActivity.java  |  2 +-
 .../ch/admin/bag/dp3t/MainApplication.java    |  2 +-
 .../bag/dp3t/reports/ReportsFragment.java     | 44 +++++++++++--------
 .../admin/bag/dp3t/storage/SecureStorage.java | 21 ++++-----
 app/src/main/res/values-bs/strings.xml        |  3 ++
 app/src/main/res/values-de/strings.xml        |  3 ++
 app/src/main/res/values-es/strings.xml        |  3 ++
 app/src/main/res/values-fr/strings.xml        |  3 ++
 app/src/main/res/values-hr/strings.xml        |  3 ++
 app/src/main/res/values-it/strings.xml        |  3 ++
 app/src/main/res/values-pt/strings.xml        |  3 ++
 app/src/main/res/values-rm/strings.xml        |  3 ++
 app/src/main/res/values-sq/strings.xml        |  3 ++
 app/src/main/res/values-sr/strings.xml        |  3 ++
 app/src/main/res/values-ti/strings.xml        |  3 ++
 app/src/main/res/values-tr/strings.xml        |  3 ++
 app/src/main/res/values/strings.xml           |  3 ++
 17 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
index cf10df11..76da07c6 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
@@ -113,7 +113,7 @@ private void checkIntentForActions() {
 		String intentAction = intent.getAction();
 		boolean launchedFromHistory = (intent.getFlags() & Intent.FLAG_ACTIVITY_LAUNCHED_FROM_HISTORY) != 0;
 		if (ACTION_INFORMED_GOTO_REPORTS.equals(intentAction) && !launchedFromHistory) {
-			secureStorage.setHotlineCallPending(false);
+			secureStorage.setLeitfadenOpenPending(false);
 			secureStorage.setReportsHeaderAnimationPending(false);
 			gotoReportsFragment();
 			intent.setAction(null);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainApplication.java b/app/src/main/java/ch/admin/bag/dp3t/MainApplication.java
index ff4f5fb2..52c20097 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainApplication.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainApplication.java
@@ -156,7 +156,7 @@ private static void createNewContactNotification(Context context, int contactId)
 				(NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
 		notificationManager.notify(NotificationUtil.NOTIFICATION_ID_CONTACT, notification);
 
-		secureStorage.setHotlineCallPending(true);
+		secureStorage.setLeitfadenOpenPending(true);
 		secureStorage.setReportsHeaderAnimationPending(true);
 		secureStorage.setLastShownContactId(contactId);
 	}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
index 1e2a60b1..f9d0b2f3 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
@@ -33,7 +33,6 @@
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.home.model.TracingStatusInterface;
 import ch.admin.bag.dp3t.storage.SecureStorage;
-import ch.admin.bag.dp3t.util.DateUtils;
 import ch.admin.bag.dp3t.util.NotificationUtil;
 import ch.admin.bag.dp3t.util.PhoneUtil;
 import ch.admin.bag.dp3t.util.UrlUtil;
@@ -55,13 +54,13 @@ public static ReportsFragment newInstance() {
 
 	private View healthyView;
 	private View saveOthersView;
-	private View hotlineView;
+	private View leitfadenView;
 	private View infectedView;
 
 	private TextView xDaysLeftTextview;
 
 
-	private boolean hotlineJustCalled = false;
+	private boolean leitfadenJustOpened = false;
 
 	public ReportsFragment() { super(R.layout.fragment_reports); }
 
@@ -84,20 +83,25 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
 		healthyView = view.findViewById(R.id.reports_healthy);
 		saveOthersView = view.findViewById(R.id.reports_save_others);
-		hotlineView = view.findViewById(R.id.reports_hotline);
+		leitfadenView = view.findViewById(R.id.reports_hotline);
 		infectedView = view.findViewById(R.id.reports_infected);
 
 		xDaysLeftTextview = saveOthersView.findViewById(R.id.x_days_left_textview);
 
-		Button callHotlineButton1 = hotlineView.findViewById(R.id.card_encounters_button);
-		Button callHotlineButton2 = saveOthersView.findViewById(R.id.card_encounters_button);
+		Button openSwisscovidLeitfadenButton1 = leitfadenView.findViewById(R.id.card_encounters_button);
+		Button openSwisscovidLeitfadenButton2 = saveOthersView.findViewById(R.id.card_encounters_button);
 
-		callHotlineButton1.setOnClickListener(view1 -> callHotline());
-		callHotlineButton2.setOnClickListener(view1 -> callHotline());
+		openSwisscovidLeitfadenButton1.setOnClickListener(view1 -> openSwissCovidLeitfaden());
+		openSwisscovidLeitfadenButton2.setOnClickListener(view1 -> openSwissCovidLeitfaden());
+
+		View callHotlineButton1 = leitfadenView.findViewById(R.id.item_call_hotline_layout);
+		View callHotlineButton2 = saveOthersView.findViewById(R.id.item_call_hotline_layout);
+		callHotlineButton1.setOnClickListener(v -> callHotline());
+		callHotlineButton2.setOnClickListener(v -> callHotline());
 
 		Button faqButton1 = healthyView.findViewById(R.id.card_encounters_faq_button);
 		Button faqButton2 = saveOthersView.findViewById(R.id.card_encounters_faq_button);
-		Button faqButton3 = hotlineView.findViewById(R.id.card_encounters_faq_button);
+		Button faqButton3 = leitfadenView.findViewById(R.id.card_encounters_faq_button);
 		Button faqButton4 = infectedView.findViewById(R.id.card_encounters_faq_button);
 
 		faqButton1.setOnClickListener(v -> showFaq());
@@ -112,7 +116,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 		tracingViewModel.getAppStatusLiveData().observe(getViewLifecycleOwner(), tracingStatusInterface -> {
 			healthyView.setVisibility(View.GONE);
 			saveOthersView.setVisibility(View.GONE);
-			hotlineView.setVisibility(View.GONE);
+			leitfadenView.setVisibility(View.GONE);
 			infectedView.setVisibility(View.GONE);
 
 			ReportsHeaderFragment.Type headerType;
@@ -142,7 +146,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 				numExposureDays = tracingStatusInterface.getExposureDays().size();
 				boolean isHotlineCallPending = secureStorage.isHotlineCallPending();
 				if (isHotlineCallPending) {
-					hotlineView.setVisibility(View.VISIBLE);
+					leitfadenView.setVisibility(View.VISIBLE);
 				} else {
 					saveOthersView.setVisibility(View.VISIBLE);
 				}
@@ -154,7 +158,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 				} else {
 					xDaysLeftTextview.setText(getString(R.string.date_in_days).replace("{COUNT}", String.valueOf(daysLeft)));
 				}
-				hotlineView.findViewById(R.id.delete_reports).setOnClickListener(v -> deleteNotifications(tracingStatusInterface));
+				leitfadenView.findViewById(R.id.delete_reports)
+						.setOnClickListener(v -> deleteNotifications(tracingStatusInterface));
 				saveOthersView.findViewById(R.id.delete_reports)
 						.setOnClickListener(v -> deleteNotifications(tracingStatusInterface));
 			} else {
@@ -193,9 +198,13 @@ private void showFaq() {
 		UrlUtil.openUrl(getContext(), getString(R.string.faq_button_url));
 	}
 
+	private void openSwissCovidLeitfaden() {
+		leitfadenJustOpened = true;
+		secureStorage.leitfadenOpened();
+		UrlUtil.openUrl(getContext(), getString(R.string.swisscovid_leitfaden_url));
+	}
+
 	private void callHotline() {
-		hotlineJustCalled = true;
-		secureStorage.justCalledHotline();
 		PhoneUtil.callHelpline(getContext());
 	}
 
@@ -203,12 +212,11 @@ private void callHotline() {
 	public void onResume() {
 		super.onResume();
 
-		if (hotlineJustCalled) {
-			hotlineJustCalled = false;
-			hotlineView.setVisibility(View.GONE);
+		if (leitfadenJustOpened) {
+			leitfadenJustOpened = false;
+			leitfadenView.setVisibility(View.GONE);
 			saveOthersView.setVisibility(View.VISIBLE);
 		}
-
 	}
 
 
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
index 3d2848a6..de564d72 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
@@ -36,8 +36,10 @@ public class SecureStorage {
 	private static final String KEY_INFORM_TOKEN_REQ = "inform_token_req";
 	private static final String KEY_ONBOARDING_COMPLETED = "onboarding_completed";
 	private static final String KEY_LAST_SHOWN_CONTACT_ID = "last_shown_contact_id";
-	private static final String KEY_HOTLINE_CALL_PENDING = "hotline_call_pending";
-	private static final String KEY_HOTLINE_LAST_CALL_TIMESTAMP = "hotline_ever_called_timestamp";
+
+	//KEY_LEITFADEN_OPEN_PENDING key value is kept to old value to avoid migration issues
+	private static final String KEY_LEITFADEN_OPEN_PENDING = "hotline_call_pending";
+
 	private static final String KEY_PENDING_REPORTS_HEADER_ANIMATION = "pending_reports_header_animation";
 	private static final String KEY_CONFIG_FORCE_UPDATE = "config_do_force_update";
 	private static final String KEY_CONFIG_HAS_INFOBOX = "has_ghettobox";
@@ -144,20 +146,15 @@ public void setLastShownContactId(int contactId) {
 	}
 
 	public boolean isHotlineCallPending() {
-		return prefs.getBoolean(KEY_HOTLINE_CALL_PENDING, false);
-	}
-
-	public void setHotlineCallPending(boolean pending) {
-		prefs.edit().putBoolean(KEY_HOTLINE_CALL_PENDING, pending).apply();
+		return prefs.getBoolean(KEY_LEITFADEN_OPEN_PENDING, false);
 	}
 
-	public long lastHotlineCallTimestamp() {
-		return prefs.getLong(KEY_HOTLINE_LAST_CALL_TIMESTAMP, 0);
+	public void setLeitfadenOpenPending(boolean pending) {
+		prefs.edit().putBoolean(KEY_LEITFADEN_OPEN_PENDING, pending).apply();
 	}
 
-	public void justCalledHotline() {
-		prefs.edit().putBoolean(KEY_HOTLINE_CALL_PENDING, false)
-				.putLong(KEY_HOTLINE_LAST_CALL_TIMESTAMP, System.currentTimeMillis())
+	public void leitfadenOpened() {
+		prefs.edit().putBoolean(KEY_LEITFADEN_OPEN_PENDING, false)
 				.apply();
 	}
 
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index cae35b6c..b94c3fde 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1080,4 +1080,7 @@ Schwarzenburgstrasse 157
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog"></string>
+
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 92fb270e..8d27bd6a 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1119,4 +1119,7 @@ Wählen Sie das entsprechende Land, um auch diese Begegnungen zu informieren."</
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog">"Die Meldung über eine mögliche Ansteckung dient als Nachweis, den Sie für einen kostenlosen Coronavirus-Test benötigen. Wenn Sie diese Meldung löschen, verlieren Sie diesen Nachweis und den Link für den SwissCovid Leitfaden."</string>
+
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 1e569920..bb799cf4 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1073,4 +1073,7 @@ Schwarzenburgstrasse 157
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog"></string>
+
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index fe92853d..9038bf37 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1082,4 +1082,7 @@ d'ouvrir un site internet."</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog"></string>
+
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 8e0818dc..476461b6 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1076,4 +1076,7 @@ Schwarzenburgstrasse 157
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog"></string>
+
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 2a16c2b7..6f5767ba 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1086,4 +1086,7 @@ Schwarzenburgstrasse 157
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog"></string>
+
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 48415d1d..453d70e2 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1081,4 +1081,7 @@ Schwarzenburgstrasse 157
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog"></string>
+
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 500b39d7..dd8e3186 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1076,4 +1076,7 @@ Schwarzenburgstrasse 157
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog"></string>
+
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 02a3dffe..291e7821 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1081,4 +1081,7 @@ Schwarzenburgstrasse 157
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog"></string>
+
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 0c69e0b6..5a6d10d2 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1076,4 +1076,7 @@ Schwarzenburgstrasse 157
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog"></string>
+
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 4cbe0ed3..047035ae 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1049,4 +1049,7 @@ Schwarzenburgstrasse 157
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog"></string>
+
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 58247037..68153b47 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1057,4 +1057,7 @@ Schwarzenburgstrasse 157
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog"></string>
+
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f87f67d..760c6a5c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1082,4 +1082,7 @@ Schwarzenburgstrasse 157
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog"></string>
+
+    <!-- URL to the SwissCovid Leitfaden -->
+    <string name="swisscovid_leitfaden_url"></string>
 </resources>
\ No newline at end of file

From 4ffd0e353fcd517b55e97ef483a8148e7962ce67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Thu, 19 Nov 2020 11:04:34 +0100
Subject: [PATCH 04/11] increase version number

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 70bdd131..1c44f774 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,8 +40,8 @@ android {
 		applicationId "ch.admin.bag.dp3t"
 		minSdkVersion 23
 		targetSdkVersion 30
-		versionCode 12000
-		versionName "1.2.0"
+		versionCode 12010
+		versionName "1.2.1"
 		resConfigs "en", "fr", "de", "it", "pt", "es", "sq", "bs", "hr", "sr", "rm", "tr", "ti"
 
 		buildConfigField "long", "BUILD_TIME", readPropertyWithDefault('buildTimestamp', System.currentTimeMillis()) + 'L'

From cc57c5c91d359d0b1807df36daab1d11fa6c95fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Mon, 23 Nov 2020 13:52:57 +0100
Subject: [PATCH 05/11] add external link icon

---
 app/src/main/res/layout/card_what_to_do_call_us.xml     | 1 +
 app/src/main/res/layout/card_what_to_do_save_others.xml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/app/src/main/res/layout/card_what_to_do_call_us.xml b/app/src/main/res/layout/card_what_to_do_call_us.xml
index 306a6e13..48c8ef04 100644
--- a/app/src/main/res/layout/card_what_to_do_call_us.xml
+++ b/app/src/main/res/layout/card_what_to_do_call_us.xml
@@ -102,6 +102,7 @@
 					android:layout_height="wrap_content"
 					android:layout_marginTop="@dimen/spacing_small"
 					android:text="@string/meldungen_detail_open_leitfaden_button"
+					android:drawableRight="@drawable/ic_launch"
 					android:textAllCaps="true"
 					app:layout_constraintTop_toBottomOf="@id/card_encounters_barrier1" />
 
diff --git a/app/src/main/res/layout/card_what_to_do_save_others.xml b/app/src/main/res/layout/card_what_to_do_save_others.xml
index 7563f23d..c5824b27 100644
--- a/app/src/main/res/layout/card_what_to_do_save_others.xml
+++ b/app/src/main/res/layout/card_what_to_do_save_others.xml
@@ -95,6 +95,7 @@
 					android:layout_height="wrap_content"
 					android:layout_marginTop="@dimen/spacing_small"
 					android:text="@string/meldungen_detail_open_leitfaden_again_button"
+					android:drawableRight="@drawable/ic_launch_blue"
 					app:layout_constraintTop_toBottomOf="@id/card_encounters_barrier1" />
 
 				<LinearLayout

From b1c8b32f57537d11f0f0b1590791f7b70a2de7ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Mon, 23 Nov 2020 13:56:11 +0100
Subject: [PATCH 06/11] add translations

---
 app/src/main/res/values-bs/strings.xml | 24 ++++++++++++------------
 app/src/main/res/values-de/strings.xml |  2 +-
 app/src/main/res/values-es/strings.xml | 24 ++++++++++++------------
 app/src/main/res/values-fr/strings.xml | 24 ++++++++++++------------
 app/src/main/res/values-hr/strings.xml | 24 ++++++++++++------------
 app/src/main/res/values-it/strings.xml | 24 ++++++++++++------------
 app/src/main/res/values-pt/strings.xml | 24 ++++++++++++------------
 app/src/main/res/values-rm/strings.xml | 24 ++++++++++++------------
 app/src/main/res/values-sq/strings.xml | 24 ++++++++++++------------
 app/src/main/res/values-sr/strings.xml | 24 ++++++++++++------------
 app/src/main/res/values-ti/strings.xml | 24 ++++++++++++------------
 app/src/main/res/values-tr/strings.xml | 24 ++++++++++++------------
 app/src/main/res/values/strings.xml    | 24 ++++++++++++------------
 13 files changed, 145 insertions(+), 145 deletions(-)

diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index b94c3fde..5175a287 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -818,7 +818,7 @@ prekida lanac
     <string name="inform_detail_faq3_title">"Da li ostajem anoniman?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
-    <string name="meldungen_detail_explanation_text4">"Pozovite lekara ili zdravstvenu ustanovu."</string>
+    <string name="meldungen_detail_explanation_text4">"Kod prvih simptoma obratite se lekaru ili nekoj zdravstvenoj ustanovi."</string>
 
     <!-- Text beim Bluetooth Control -->
     <string name="tracing_setting_text_android">"Obavijesti o izloženosti bolesti COVID-19"</string>
@@ -883,7 +883,7 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_free_test_title">"Moguće je besplatno testiranje"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <string name="meldungen_detail_free_test_text">"Preko info-linije aplikacije SwissCovid možete da dobijete savete o mogućnosti besplatnog testiranja na virus korona."</string>
+    <string name="meldungen_detail_free_test_text">"SwissCovid smernice informišu Vas o mogućnosti besplatnog testiranja na virus korona."</string>
 
     <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
     <string name="activate_tracing_button">"Aktiviraj praćenje"</string>
@@ -1052,34 +1052,34 @@ Schwarzenburgstrasse 157
     <string name="meldung_detail_exposed_show_less_button">"Prikaži manje"</string>
 
     <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_title"></string>
+    <string name="meldungen_detail_leitfaden_title">"SwissCovid smernice"</string>
 
     <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text"></string>
+    <string name="meldungen_detail_leitfaden_text">"Odgovorite na pitanja u SwissCovid smernicama kako biste saznali kako adekvatno da reagujete."</string>
 
     <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-    <string name="meldungen_detail_open_leitfaden_button"></string>
+    <string name="meldungen_detail_open_leitfaden_button">"Popuniti"</string>
 
     <!-- Title für Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_title"></string>
+    <string name="meldungen_tel_information_title">"Telefonske informacije"</string>
 
     <!-- Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_text"></string>
+    <string name="meldungen_tel_information_text">"Ukoliko imate dodatna pitanja, informacije možete dobiti i telefonskim putem preko info linije aplikacije SwissCovid."</string>
 
     <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-    <string name="meldungen_detail_leitfaden_again_text"></string>
+    <string name="meldungen_detail_leitfaden_again_text">"Ovde možete u svako vreme ponovo da otvorite SwissCovid smernice."</string>
 
     <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+    <string name="meldungen_detail_open_leitfaden_again_button">"Idi na SwissCovid smernice"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"Odgovorite na pitanja u"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden"></string>
+    <string name="exposed_info_swisscovid_leitfaden">"SwissCovid smernicama"</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-    <string name="delete_notification_dialog"></string>
+    <string name="delete_notification_dialog">"Poruka o mogućoj infekciji služi kao dokaz za besplatno testiranje na virus korona. Ako obrišete tu poruku, izgubićete dokaz i link na SwissCovid smernice."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url"></string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 8d27bd6a..0ac7e67b 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1094,7 +1094,7 @@ Wählen Sie das entsprechende Land, um auch diese Begegnungen zu informieren."</
     <string name="meldungen_detail_leitfaden_title">"SwissCovid Leitfaden"</string>
 
     <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text">"Beantworten Sie die Fragen im SwissCvoid Leitfaden um zu erfahren, wie Sie richtig reagieren."</string>
+    <string name="meldungen_detail_leitfaden_text">"Beantworten Sie die Fragen im SwissCovid Leitfaden um zu erfahren, wie Sie richtig reagieren."</string>
 
     <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
     <string name="meldungen_detail_open_leitfaden_button">"Jetzt ausfüllen"</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index bb799cf4..43e63861 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -811,7 +811,7 @@ cadenas de contagio."</string>
     <string name="inform_detail_faq3_title">"¿Permanezco en el anonimato?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
-    <string name="meldungen_detail_explanation_text4">"Llame a un médico o a un centro sanitario."</string>
+    <string name="meldungen_detail_explanation_text4">"En cuanto aparezcan los primeros síntomas, llame a su médico o a un centro de salud."</string>
 
     <!-- Text beim Bluetooth Control -->
     <string name="tracing_setting_text_android">"Notificaciones de exposición a la COVID-19"</string>
@@ -876,7 +876,7 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_free_test_title">"Posibilidad de hacer un test gratuito"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <string name="meldungen_detail_free_test_text">"La Infoline SwissCovid le asesora sobre la posibilidad de hacerse gratuitamente el test del coronavirus."</string>
+    <string name="meldungen_detail_free_test_text">"La guía SwissCovid le informa sobre la posibilidad de hacer un test de coronavirus gratuito."</string>
 
     <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
     <string name="activate_tracing_button">"Activar el rastreo"</string>
@@ -1045,34 +1045,34 @@ Schwarzenburgstrasse 157
     <string name="meldung_detail_exposed_show_less_button">"Mostrar menos"</string>
 
     <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_title"></string>
+    <string name="meldungen_detail_leitfaden_title">"Guía SwissCovid"</string>
 
     <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text"></string>
+    <string name="meldungen_detail_leitfaden_text">"Responda a las preguntas de la guía SwissCovid para determinar cómo actuar correctamente."</string>
 
     <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-    <string name="meldungen_detail_open_leitfaden_button"></string>
+    <string name="meldungen_detail_open_leitfaden_button">"Responder ahora"</string>
 
     <!-- Title für Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_title"></string>
+    <string name="meldungen_tel_information_title">"Línea telefónica de Información "</string>
 
     <!-- Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_text"></string>
+    <string name="meldungen_tel_information_text">"La Infoline SwissCovid está a su disposición para responder a todas sus dudas."</string>
 
     <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-    <string name="meldungen_detail_leitfaden_again_text"></string>
+    <string name="meldungen_detail_leitfaden_again_text">"Aquí puede usted volver a consultar la guía SwissCovid en cualquier momento."</string>
 
     <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+    <string name="meldungen_detail_open_leitfaden_again_button">"Ir a la guía"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"Responda a las preguntas en la"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden"></string>
+    <string name="exposed_info_swisscovid_leitfaden">"guía SwissCovid"</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-    <string name="delete_notification_dialog"></string>
+    <string name="delete_notification_dialog">"La notificación de un posible contagio le sirve de justificante para hacer el test gratuitamente. Si borra la notificación perderá usted el justificante, así como el enlace para la guía SwissCovid."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url"></string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 9038bf37..674ec626 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -819,7 +819,7 @@ de transmission."</string>
     <string name="inform_detail_faq3_title">"Est-ce que je reste anonyme ?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
-    <string name="meldungen_detail_explanation_text4">"Appelez un médecin ou une institution de santé."</string>
+    <string name="meldungen_detail_explanation_text4">"Dès les premiers symptômes, téléphonez à un médecin ou à une institution de santé."</string>
 
     <!-- Text beim Bluetooth Control -->
     <string name="tracing_setting_text_android">"Notifications d'exposition au COVID 19"</string>
@@ -884,7 +884,7 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_free_test_title">"Test gratuit"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <string name="meldungen_detail_free_test_text">"La ligne d’information SwissCovid vous renseigne sur la possibilité de réaliser un test gratuit du coronavirus. "</string>
+    <string name="meldungen_detail_free_test_text">"Le guide SwissCovid vous informe sur la possibilité de vous faire tester gratuitement au coronavirus. "</string>
 
     <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
     <string name="activate_tracing_button">"Activer le traçage"</string>
@@ -1054,34 +1054,34 @@ d'ouvrir un site internet."</string>
     <string name="meldung_detail_exposed_show_less_button">"Affichage réduit"</string>
 
     <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_title"></string>
+    <string name="meldungen_detail_leitfaden_title">"Guide SwissCovid"</string>
 
     <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text"></string>
+    <string name="meldungen_detail_leitfaden_text">"Répondez aux questions posées dans le guide SwissCovid pour savoir comment réagir."</string>
 
     <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-    <string name="meldungen_detail_open_leitfaden_button"></string>
+    <string name="meldungen_detail_open_leitfaden_button">"Remplir maintenant"</string>
 
     <!-- Title für Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_title"></string>
+    <string name="meldungen_tel_information_title">"Renseignements par téléphone"</string>
 
     <!-- Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_text"></string>
+    <string name="meldungen_tel_information_text">"Pour plus de renseignements, vous pouvez aussi appeler l'infoline SwissCovid."</string>
 
     <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-    <string name="meldungen_detail_leitfaden_again_text"></string>
+    <string name="meldungen_detail_leitfaden_again_text">"Vous pouvez rouvrir le guide SwissCovid à tout moment grâce à ce bouton."</string>
 
     <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+    <string name="meldungen_detail_open_leitfaden_again_button">"Ouvrir le guide"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"Answer the questions"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden"></string>
+    <string name="exposed_info_swisscovid_leitfaden">"guide SwissCovid"</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-    <string name="delete_notification_dialog"></string>
+    <string name="delete_notification_dialog">"La notification d'une possible infection constitue une preuve dont vous avez besoin pour bénéficier d'un test gratuit au coronavirus. Si vous l'effacez, vous perdez cette preuve ainsi que le lien vers le guide SwissCovid."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url"></string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 476461b6..928ad83f 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -814,7 +814,7 @@ prekida lanac
     <string name="inform_detail_faq3_title">"Da li ostajem anoniman?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
-    <string name="meldungen_detail_explanation_text4">"Pozovite lekara ili zdravstvenu ustanovu."</string>
+    <string name="meldungen_detail_explanation_text4">"Kod prvih simptoma obratite se lekaru ili nekoj zdravstvenoj ustanovi."</string>
 
     <!-- Text beim Bluetooth Control -->
     <string name="tracing_setting_text_android">"Obavijesti o izloženosti bolesti COVID-19"</string>
@@ -879,7 +879,7 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_free_test_title">"Moguće je besplatno testiranje"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <string name="meldungen_detail_free_test_text">"Preko info-linije aplikacije SwissCovid možete da dobijete savete o mogućnosti besplatnog testiranja na virus korona."</string>
+    <string name="meldungen_detail_free_test_text">"SwissCovid smernice informišu Vas o mogućnosti besplatnog testiranja na virus korona."</string>
 
     <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
     <string name="activate_tracing_button">"Aktiviraj praćenje"</string>
@@ -1048,34 +1048,34 @@ Schwarzenburgstrasse 157
     <string name="meldung_detail_exposed_show_less_button">"Prikaži manje"</string>
 
     <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_title"></string>
+    <string name="meldungen_detail_leitfaden_title">"SwissCovid smernice"</string>
 
     <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text"></string>
+    <string name="meldungen_detail_leitfaden_text">"Odgovorite na pitanja u SwissCovid smernicama kako biste saznali kako adekvatno da reagujete."</string>
 
     <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-    <string name="meldungen_detail_open_leitfaden_button"></string>
+    <string name="meldungen_detail_open_leitfaden_button">"Popuniti"</string>
 
     <!-- Title für Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_title"></string>
+    <string name="meldungen_tel_information_title">"Telefonske informacije"</string>
 
     <!-- Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_text"></string>
+    <string name="meldungen_tel_information_text">"Ukoliko imate dodatna pitanja, informacije možete dobiti i telefonskim putem preko info linije aplikacije SwissCovid."</string>
 
     <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-    <string name="meldungen_detail_leitfaden_again_text"></string>
+    <string name="meldungen_detail_leitfaden_again_text">"Ovde možete u svako vreme ponovo da otvorite SwissCovid smernice."</string>
 
     <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+    <string name="meldungen_detail_open_leitfaden_again_button">"Idi na SwissCovid smernice"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"Odgovorite na pitanja u"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden"></string>
+    <string name="exposed_info_swisscovid_leitfaden">"SwissCovid smernicama"</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-    <string name="delete_notification_dialog"></string>
+    <string name="delete_notification_dialog">"Poruka o mogućoj infekciji služi kao dokaz za besplatno testiranje na virus korona. Ako obrišete tu poruku, izgubićete dokaz i link na SwissCovid smernice."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url"></string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 6f5767ba..ceaf1b77 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -823,7 +823,7 @@ catene di infezione"</string>
     <string name="inform_detail_faq3_title">"Resto anonimo?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
-    <string name="meldungen_detail_explanation_text4">"Telefona a un medico o a un'istituzione sanitaria."</string>
+    <string name="meldungen_detail_explanation_text4">"Ai primi sintomi telefona a un medico o a una struttura sanitaria"</string>
 
     <!-- Text beim Bluetooth Control -->
     <string name="tracing_setting_text_android">"Notifiche di esposizione al COVID-19"</string>
@@ -888,7 +888,7 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_free_test_title">"Possibilità di sottoporsi gratuitamente al test"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <string name="meldungen_detail_free_test_text">"L'Infoline SwissCovid ti consiglia sulla possibilità di effettuare gratuitamente un test."</string>
+    <string name="meldungen_detail_free_test_text">"La guida SwissCovid ti informa sulla possibilità di fare gratis il test del coronavirus."</string>
 
     <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
     <string name="activate_tracing_button">"Attivare il tracciamento"</string>
@@ -1058,34 +1058,34 @@ Schwarzenburgstrasse 157
     <string name="meldung_detail_exposed_show_less_button">"Mostra meno segnalazioni"</string>
 
     <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_title"></string>
+    <string name="meldungen_detail_leitfaden_title">"Guida SwissCovid"</string>
 
     <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text"></string>
+    <string name="meldungen_detail_leitfaden_text">"Rispondi alle domande nella guida SwissCovid per sapere come reagire correttamente."</string>
 
     <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-    <string name="meldungen_detail_open_leitfaden_button"></string>
+    <string name="meldungen_detail_open_leitfaden_button">"Compila ora"</string>
 
     <!-- Title für Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_title"></string>
+    <string name="meldungen_tel_information_title">"Informazioni telefoniche"</string>
 
     <!-- Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_text"></string>
+    <string name="meldungen_tel_information_text">"Se hai altre domande, puoi rivolgerti alla Infoline SwissCovid per avere informazioni telefoniche."</string>
 
     <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-    <string name="meldungen_detail_leitfaden_again_text"></string>
+    <string name="meldungen_detail_leitfaden_again_text">"Puoi riaprire qui la guida SwissCovid in qualsiasi momento."</string>
 
     <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+    <string name="meldungen_detail_open_leitfaden_again_button">"Alla guida"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"Rispondi alle domande nella"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden"></string>
+    <string name="exposed_info_swisscovid_leitfaden">"guida SwissCovid"</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-    <string name="delete_notification_dialog"></string>
+    <string name="delete_notification_dialog">"La segnalazione di un possibile contagio è il giustificativo che ti serve per fare il test del coronavirus gratuitamente. Se elimini questa segnalazione perdi il giustificativo e il link alla guida SwissCovid."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url"></string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 453d70e2..d27bf6d5 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -819,7 +819,7 @@ cadeias de transmissão."</string>
     <string name="inform_detail_faq3_title">"Permaneço anónimo?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
-    <string name="meldungen_detail_explanation_text4">"Telefone a um médico ou a um estabelecimento de saúde."</string>
+    <string name="meldungen_detail_explanation_text4">"Aos primeiros sintomas, contacte o seu médico ou uma unidade de saúde."</string>
 
     <!-- Text beim Bluetooth Control -->
     <string name="tracing_setting_text_android">"Notificações de exposição à COVID-19"</string>
@@ -884,7 +884,7 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_free_test_title">"Possibilidade de teste gratuito"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <string name="meldungen_detail_free_test_text">"A linha informativa SwissCovid aconselha-o sobre um possível teste gratuito ao coronavírus."</string>
+    <string name="meldungen_detail_free_test_text">"O guia da SwissCovid informa-o sobre a possibilidade de um teste gratuito ao coronavírus."</string>
 
     <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
     <string name="activate_tracing_button">"Ativar o rastreamento"</string>
@@ -1053,34 +1053,34 @@ Schwarzenburgstrasse 157
     <string name="meldung_detail_exposed_show_less_button">"Mostrar menos"</string>
 
     <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_title"></string>
+    <string name="meldungen_detail_leitfaden_title">"Guia da SwissCovid"</string>
 
     <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text"></string>
+    <string name="meldungen_detail_leitfaden_text">"Responda às perguntas no guia da SwissCovid e saiba como proceder corretamente."</string>
 
     <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-    <string name="meldungen_detail_open_leitfaden_button"></string>
+    <string name="meldungen_detail_open_leitfaden_button">"Preencher agora"</string>
 
     <!-- Title für Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_title"></string>
+    <string name="meldungen_tel_information_title">"Informações por telefone"</string>
 
     <!-- Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_text"></string>
+    <string name="meldungen_tel_information_text">"Se tiver perguntas, poderá também obter informações através da linha informativa da SwissCovid."</string>
 
     <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-    <string name="meldungen_detail_leitfaden_again_text"></string>
+    <string name="meldungen_detail_leitfaden_again_text">"Abra aqui o guia da SwissCovid sempre que quiser."</string>
 
     <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+    <string name="meldungen_detail_open_leitfaden_again_button">"Abrir o guia da SwissCovid"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"Responda às perguntas no"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden"></string>
+    <string name="exposed_info_swisscovid_leitfaden">"guia da SwissCovid"</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-    <string name="delete_notification_dialog"></string>
+    <string name="delete_notification_dialog">"A notificação sobre um possível contágio constitui um comprovativo de que necessitará para fazer um teste gratuito ao coronavírus. Se a apagar, perde o comprovativo e a ligação ao guia da SwissCovid."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url"></string>
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index dd8e3186..85323f5f 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -813,7 +813,7 @@ chadainas d'infecziun.
     <string name="inform_detail_faq3_title">"Rest jau anonima/anonim?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
-    <string name="meldungen_detail_explanation_text4">"Contactai ina media resp. in medi u ina instituziun da sanadad."</string>
+    <string name="meldungen_detail_explanation_text4">"En cas d'emprims sintoms contactai ina media resp. in medi u ina instituziun da sanadad."</string>
 
     <!-- Text beim Bluetooth Control -->
     <string name="tracing_setting_text_android">"Communicaziuns COVID-19"</string>
@@ -879,7 +879,7 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_free_test_title">"Pussaivel da far in test gratuit"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <string name="meldungen_detail_free_test_text">"L'infoline SwissCovid As cusseglia davart la pussaivladad d'As laschar testar gratuitamain sin il coronavirus."</string>
+    <string name="meldungen_detail_free_test_text">"Il mussavia SwissCovid As infurmescha davart la pussaivladad da far in test dal coronavirus gratuit."</string>
 
     <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
     <string name="activate_tracing_button">"Activar tracing"</string>
@@ -1048,34 +1048,34 @@ Schwarzenburgstrasse 157
     <string name="meldung_detail_exposed_show_less_button">"Mussar damain"</string>
 
     <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_title"></string>
+    <string name="meldungen_detail_leitfaden_title">"Mussavia SwissCovid"</string>
 
     <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text"></string>
+    <string name="meldungen_detail_leitfaden_text">"Respundi las dumondas en il mussavia SwissCovid per vegnir a savair co reagir endretg. "</string>
 
     <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-    <string name="meldungen_detail_open_leitfaden_button"></string>
+    <string name="meldungen_detail_open_leitfaden_button">"Emplenir ussa"</string>
 
     <!-- Title für Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_title"></string>
+    <string name="meldungen_tel_information_title">"Infurmaziuns per telefon"</string>
 
     <!-- Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_text"></string>
+    <string name="meldungen_tel_information_text">"En cas d'ulteriuras dumondas As dat l'infoline SwissCovid gugent er infurmaziuns per telefon."</string>
 
     <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-    <string name="meldungen_detail_leitfaden_again_text"></string>
+    <string name="meldungen_detail_leitfaden_again_text">"Qua pudais Vus da tut temp avrir danovamain il mussavia SwissCovid"</string>
 
     <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+    <string name="meldungen_detail_open_leitfaden_again_button">"Al mussavia"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"Respundai las dumondas en il "</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden"></string>
+    <string name="exposed_info_swisscovid_leitfaden">"Mussavia SwissCovid"</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-    <string name="delete_notification_dialog"></string>
+    <string name="delete_notification_dialog">"L'avis davart in'eventuala infecziun serva sco cumprova che Vus druvais per in test dal coronavirus gratuit. Sche Vus stizzais quest avis, perdais Vus la cumprova ed il link per il mussavia SwissCovid."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url"></string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 291e7821..9666fa0a 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -819,7 +819,7 @@ e infeksionit."</string>
     <string name="inform_detail_faq3_title">"A mbetem unë anonim?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
-    <string name="meldungen_detail_explanation_text4">"Telefononi një mjeke apo një mjek ose një institucion shëndetësor."</string>
+    <string name="meldungen_detail_explanation_text4">"Në rastin e simptomave të para, telefononi një mjeke, një mjek ose një institucion shëndetësor."</string>
 
     <!-- Text beim Bluetooth Control -->
     <string name="tracing_setting_text_android">"Njoftime rreth ekspozimit ndaj COVID-19"</string>
@@ -884,7 +884,7 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_free_test_title">"Testi pa kosto është i mundur"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <string name="meldungen_detail_free_test_text">"Infoline SwissCovid ju këshillon për mundësinë e një testi falas për koronavirusin."</string>
+    <string name="meldungen_detail_free_test_text">"Udhëzuesi \"SwissCovid\" ju informon për mundësinë e një testi falas të koronavirusit."</string>
 
     <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
     <string name="activate_tracing_button">"Aktivizo gjurmimin"</string>
@@ -1053,34 +1053,34 @@ Schwarzenburgstrasse 157
     <string name="meldung_detail_exposed_show_less_button">"Shfaq më pak"</string>
 
     <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_title"></string>
+    <string name="meldungen_detail_leitfaden_title">"Udhëzuesi \"SwissCovid\""</string>
 
     <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text"></string>
+    <string name="meldungen_detail_leitfaden_text">"Përgjigjuni pyetjeve në udhëzuesin \"SwissCovid\" për të mësuar se si të reagoni siç duhet."</string>
 
     <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-    <string name="meldungen_detail_open_leitfaden_button"></string>
+    <string name="meldungen_detail_open_leitfaden_button">"Plotëso tani"</string>
 
     <!-- Title für Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_title"></string>
+    <string name="meldungen_tel_information_title">"Informacion telefonik"</string>
 
     <!-- Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_text"></string>
+    <string name="meldungen_tel_information_text">"Në rastin e pyetjeve të tjera, linja e informacionit \"SwissCovid\" ju jep informacion edhe me anë të telefonit."</string>
 
     <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-    <string name="meldungen_detail_leitfaden_again_text"></string>
+    <string name="meldungen_detail_leitfaden_again_text">"Këtu ju mund ta hapni sërish udhëzuesin \"SwissCovid\" në çdo kohë."</string>
 
     <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+    <string name="meldungen_detail_open_leitfaden_again_button">"Shko tek udhëzuesi"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"Answer the questions"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden"></string>
+    <string name="exposed_info_swisscovid_leitfaden">"SwissCovid Guide"</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-    <string name="delete_notification_dialog"></string>
+    <string name="delete_notification_dialog">"Njoftimi për një infektim të mundshëm shërben si vërtetim që ju keni nevojë për një test falas të koronavirusit. Nëse ju e fshini këtë njoftim, atëherë e humbisni këtë vërtetim dhe lidhjen për udhëzuesin \"SwissCovid\"."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url"></string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 5a6d10d2..6b576cc1 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -814,7 +814,7 @@ prekida lanac
     <string name="inform_detail_faq3_title">"Da li ostajem anoniman?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
-    <string name="meldungen_detail_explanation_text4">"Pozovite lekara ili zdravstvenu ustanovu."</string>
+    <string name="meldungen_detail_explanation_text4">"Kod prvih simptoma obratite se lekaru ili nekoj zdravstvenoj ustanovi."</string>
 
     <!-- Text beim Bluetooth Control -->
     <string name="tracing_setting_text_android">"Obavijesti o izloženosti bolesti COVID-19"</string>
@@ -879,7 +879,7 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_free_test_title">"Moguće je besplatno testiranje"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <string name="meldungen_detail_free_test_text">"Preko info-linije aplikacije SwissCovid možete da dobijete savete o mogućnosti besplatnog testiranja na virus korona."</string>
+    <string name="meldungen_detail_free_test_text">"SwissCovid smernice informišu Vas o mogućnosti besplatnog testiranja na virus korona."</string>
 
     <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
     <string name="activate_tracing_button">"Aktiviraj praćenje"</string>
@@ -1048,34 +1048,34 @@ Schwarzenburgstrasse 157
     <string name="meldung_detail_exposed_show_less_button">"Prikaži manje"</string>
 
     <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_title"></string>
+    <string name="meldungen_detail_leitfaden_title">"SwissCovid smernice"</string>
 
     <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text"></string>
+    <string name="meldungen_detail_leitfaden_text">"Odgovorite na pitanja u SwissCovid smernicama kako biste saznali kako adekvatno da reagujete."</string>
 
     <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-    <string name="meldungen_detail_open_leitfaden_button"></string>
+    <string name="meldungen_detail_open_leitfaden_button">"Popuniti"</string>
 
     <!-- Title für Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_title"></string>
+    <string name="meldungen_tel_information_title">"Telefonske informacije"</string>
 
     <!-- Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_text"></string>
+    <string name="meldungen_tel_information_text">"Ukoliko imate dodatna pitanja, informacije možete dobiti i telefonskim putem preko info linije aplikacije SwissCovid."</string>
 
     <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-    <string name="meldungen_detail_leitfaden_again_text"></string>
+    <string name="meldungen_detail_leitfaden_again_text">"Ovde možete u svako vreme ponovo da otvorite SwissCovid smernice."</string>
 
     <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+    <string name="meldungen_detail_open_leitfaden_again_button">"Idi na SwissCovid smernice"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"Odgovorite na pitanja u"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden"></string>
+    <string name="exposed_info_swisscovid_leitfaden">"SwissCovid smernicama"</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-    <string name="delete_notification_dialog"></string>
+    <string name="delete_notification_dialog">"Poruka o mogućoj infekciji služi kao dokaz za besplatno testiranje na virus korona. Ako obrišete tu poruku, izgubićete dokaz i link na SwissCovid smernice."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url"></string>
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 047035ae..97729892 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -787,7 +787,7 @@
     <string name="inform_detail_faq3_title">"ስቱር ድዩ፧"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
-    <string name="meldungen_detail_explanation_text4">"ንሓኪም ወይ ንትካል ሕክምና ደውሉ።"</string>
+    <string name="meldungen_detail_explanation_text4">"ኣብ ቀዳሞት ምልክታት ንሓንቲ ወይ ሓደ ሓኪም ወይ ንሓደ ትካል ጥዕና ደውሉ ኢኹም።"</string>
 
     <!-- Text beim Bluetooth Control -->
     <string name="tracing_setting_text_android">" መልእኽትታት ኮቪድ-19 "</string>
@@ -852,7 +852,7 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_free_test_title">"ነጻ መርመራ ይከኣል'ዩ"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <string name="meldungen_detail_free_test_text">"Infoline SwissCovid ብዛዕባ ኣማራጺ ነጻ መርመራ ኮሮና ይመኽረኩም።"</string>
+    <string name="meldungen_detail_free_test_text">"መምርሒ SwissCovid ብዛዕባ ኣማራጺ ነጻ ዝኾነ መርመራ ኮሮናቫይረስ ይሕብረኩም።"</string>
 
     <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
     <string name="activate_tracing_button">"ንትራይሲንግ(Tracing) ምውላዕ"</string>
@@ -1021,34 +1021,34 @@ Schwarzenburgstrasse 157
     <string name="meldung_detail_exposed_show_less_button">"ዝወሓደ ምርኣይ"</string>
 
     <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_title"></string>
+    <string name="meldungen_detail_leitfaden_title">"መምርሒ SwissCovid"</string>
 
     <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text"></string>
+    <string name="meldungen_detail_leitfaden_text">"ነቶም ኣብ መምርሒ SwissCovid ዘለው ሕቶታት መልሱ ኢኹም፣ ቅኑዕ መልሲ ከመይ ጌርኩም ከምትህቡ መታን ክትፈልጡ።"</string>
 
     <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-    <string name="meldungen_detail_open_leitfaden_button"></string>
+    <string name="meldungen_detail_open_leitfaden_button">"ሕጂ ምምላእ"</string>
 
     <!-- Title für Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_title"></string>
+    <string name="meldungen_tel_information_title">"ሓበሬታ ብተሌፎን"</string>
 
     <!-- Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_text"></string>
+    <string name="meldungen_tel_information_text">"ኣብ ቀጸልቲ ሕቶታት ኢንፎላይን SwissCovid ዋላ ብተሌፎን ሓበሬታ ይህበኩም።"</string>
 
     <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-    <string name="meldungen_detail_leitfaden_again_text"></string>
+    <string name="meldungen_detail_leitfaden_again_text">"ንመምርሒ SwissCovid ኣብዚ ኩሉ ግዜ ብሓድሽ ክትከፍትዎ ትኽእሉ።"</string>
 
     <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+    <string name="meldungen_detail_open_leitfaden_again_button">"ናብቲ መምርሒ"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"ሕቶታት መልሱ ኢኹም ኣብ"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden"></string>
+    <string name="exposed_info_swisscovid_leitfaden">"መምርሒ SwissCovid"</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-    <string name="delete_notification_dialog"></string>
+    <string name="delete_notification_dialog">"መልእኽቲ ብዛዕባ ክፍጸም ዝከኣል ልበዳ ከም መረጋገጺ እዩ ዝኸውን፣ ንሱ ሽዑ ንነጻ ዝኾነ መርመራ ኮሮናቫይረስ ከድልየኩም እዩ። እዚ መልእኽቲ እንድሕር ትድምስስዎ ኮይንኩም፣ እዚ መረጋገጺ ምስቲ ሊንክ/ሓበሬታ መርበብ ንመምርሒ SwissCovid ከተጥፍእዎ ኢኹም።"</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url"></string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 68153b47..78a81f0d 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -795,7 +795,7 @@ Bu şekilde diğer SwissCovid uygulaması kullanıcıları yalnızca bir bulaşm
     <string name="inform_detail_faq3_title">"Bilgilerim anonim mi?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
-    <string name="meldungen_detail_explanation_text4">"Lütfen bir doktor ya da sağlık kuruluşu ile iletişime geçin."</string>
+    <string name="meldungen_detail_explanation_text4">"Hastalığa ait ilk belirtilerin görülmesi halinde bir doktoru veya bir sağlık kuruluşunu arayın."</string>
 
     <!-- Text beim Bluetooth Control -->
     <string name="tracing_setting_text_android">"KOVİD-19 Bildirimleri"</string>
@@ -860,7 +860,7 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_free_test_title">"Ücretsiz test olma"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <string name="meldungen_detail_free_test_text">"SwissCovid Danışma Hattı size ücretsiz korona testleri konusunda bilgi vermektedir."</string>
+    <string name="meldungen_detail_free_test_text">"SwissCovid Kılavuzu, ücretsiz Corona virüs testi imkanları hakkında sizi bilgilendirecektir."</string>
 
     <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
     <string name="activate_tracing_button">"Takibi etkinleştir"</string>
@@ -1029,34 +1029,34 @@ Schwarzenburgstrasse 157
     <string name="meldung_detail_exposed_show_less_button">"Daha azını göster"</string>
 
     <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_title"></string>
+    <string name="meldungen_detail_leitfaden_title">"SwissCovid Kılavuzu"</string>
 
     <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text"></string>
+    <string name="meldungen_detail_leitfaden_text">"Nasıl doğru şekilde hareket edeceğinizi öğrenmek için SwissCovid Kılavuzu'ndaki soruları yanıtlayın."</string>
 
     <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-    <string name="meldungen_detail_open_leitfaden_button"></string>
+    <string name="meldungen_detail_open_leitfaden_button">"Şimdi doldurun"</string>
 
     <!-- Title für Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_title"></string>
+    <string name="meldungen_tel_information_title">"Telefon İle Danışma"</string>
 
     <!-- Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_text"></string>
+    <string name="meldungen_tel_information_text">"Başka sorularınızın olması halinde, SwissCovid Bilgi hattı (Infoline) size telefon yoluyla da bilgi vermekten memnuniyet duyacaktır."</string>
 
     <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-    <string name="meldungen_detail_leitfaden_again_text"></string>
+    <string name="meldungen_detail_leitfaden_again_text">"SwissCovid Kılavuzu'nu dilediğiniz zaman buradan yeniden açabilirsiniz."</string>
 
     <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+    <string name="meldungen_detail_open_leitfaden_again_button">"Kılavuz için"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"Soruları yanıtlayın"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden"></string>
+    <string name="exposed_info_swisscovid_leitfaden">"SwissCovid Kılavuzu"</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-    <string name="delete_notification_dialog"></string>
+    <string name="delete_notification_dialog">"Muhtemel bir enfeksiyon bildirimi, ücretsiz Corona virüs testi yaptırmanız gerektiğinin kanıtı niteliğindedir. Bu bildirimi silerseniz, bu kanıtı ve SwissCovid Kılavuz bağlantısını kaybetmiş olursunuz."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url"></string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 760c6a5c..bee8353a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -818,7 +818,7 @@ chains of infection."</string>
     <string name="inform_detail_faq3_title">"Does anyone find out who I am?"</string>
 
     <!-- Meldung Detail Weiss Box unten -->
-    <string name="meldungen_detail_explanation_text4">"Call your doctor or your healthcare facility to schedule an appointment."</string>
+    <string name="meldungen_detail_explanation_text4">"When the first symptoms appear, phone a doctor or health centre."</string>
 
     <!-- Text beim Bluetooth Control -->
     <string name="tracing_setting_text_android">"COVID-19 Exposure Notifications"</string>
@@ -883,7 +883,7 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_free_test_title">"Test available free of charge"</string>
 
     <!-- Meldungen Detail Kostenloser Test Box Text -->
-    <string name="meldungen_detail_free_test_text">"The SwissCovid infoline will advise you on the option of taking a test free of charge"</string>
+    <string name="meldungen_detail_free_test_text">"The SwissCovid Guide has information about the possibility of a free coronavirus test."</string>
 
     <!-- Button title on the Home Screen when the Tracing is deactivated to directly activate it. -->
     <string name="activate_tracing_button">"Activate proximity tracing"</string>
@@ -1054,34 +1054,34 @@ Schwarzenburgstrasse 157
     <string name="meldung_detail_exposed_show_less_button">"Show fewer"</string>
 
     <!-- Titel vom SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_title"></string>
+    <string name="meldungen_detail_leitfaden_title">"SwissCovid Guide"</string>
 
     <!-- Text zum SwissCovid Leitfaden bei Kontaktmeldung -->
-    <string name="meldungen_detail_leitfaden_text"></string>
+    <string name="meldungen_detail_leitfaden_text">"Answer the questions in the SwissCovid Guide to find out how to respond."</string>
 
     <!-- Button Text zum Öffnen vom SwissCovid Leitfaden -->
-    <string name="meldungen_detail_open_leitfaden_button"></string>
+    <string name="meldungen_detail_open_leitfaden_button">"Complete now"</string>
 
     <!-- Title für Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_title"></string>
+    <string name="meldungen_tel_information_title">"Information by phone"</string>
 
     <!-- Infotext zu SwissCovid Infoline -->
-    <string name="meldungen_tel_information_text"></string>
+    <string name="meldungen_tel_information_text">"If you have further questions, feel free to call the SwissCovid Infoline for information by phone."</string>
 
     <!-- Hinweis Text nach dem Ausfüllen vom SwissCovid Leitfaden, dass man erneut ausfüllen kann -->
-    <string name="meldungen_detail_leitfaden_again_text"></string>
+    <string name="meldungen_detail_leitfaden_again_text">"You can open the SwissCovid Guide again any time here."</string>
 
     <!-- Button Text um SwissCovid Leitfaden erneut zu öffnen -->
-    <string name="meldungen_detail_open_leitfaden_again_button"></string>
+    <string name="meldungen_detail_open_leitfaden_again_button">"To the guide"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden"></string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"Answer the questions"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden"></string>
+    <string name="exposed_info_swisscovid_leitfaden">"SwissCovid Guide"</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
-    <string name="delete_notification_dialog"></string>
+    <string name="delete_notification_dialog">"The notification of possible infection serves as the proof you need for a free coronavirus test. If you delete this notification you lose this proof and the link to the SwissCovid Guide."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url"></string>

From a5f205bbb02b14230452a0565b375eaf6da0850c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Mon, 23 Nov 2020 15:45:26 +0100
Subject: [PATCH 07/11] refactoring hotline naming to leitfaden naming

---
 app/src/main/java/ch/admin/bag/dp3t/MainActivity.java       | 4 ++--
 .../java/ch/admin/bag/dp3t/reports/ReportsFragment.java     | 6 +++---
 .../main/java/ch/admin/bag/dp3t/storage/SecureStorage.java  | 2 +-
 ...what_to_do_call_us.xml => card_what_to_do_leitfaden.xml} | 0
 app/src/main/res/layout/fragment_reports.xml                | 4 ++--
 5 files changed, 8 insertions(+), 8 deletions(-)
 rename app/src/main/res/layout/{card_what_to_do_call_us.xml => card_what_to_do_leitfaden.xml} (100%)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
index 76da07c6..409f1149 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/MainActivity.java
@@ -94,9 +94,9 @@ public void checkRedirectionIntents() {
 		checkIntentForActions();
 
 		if (!consumedExposedIntent) {
-			boolean isHotlineCallPending = secureStorage.isHotlineCallPending();
+			boolean isOpenLeitfadenPending = secureStorage.isOpenLeitfadenPending();
 			boolean isExposed = tracingViewModel.getTracingStatusInterface().wasContactReportedAsExposed();
-			if (isHotlineCallPending && isExposed) {
+			if (isOpenLeitfadenPending && isExposed) {
 				gotoReportsFragment();
 			}
 		}
diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
index f9d0b2f3..f188eb4d 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
@@ -83,7 +83,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 
 		healthyView = view.findViewById(R.id.reports_healthy);
 		saveOthersView = view.findViewById(R.id.reports_save_others);
-		leitfadenView = view.findViewById(R.id.reports_hotline);
+		leitfadenView = view.findViewById(R.id.reports_leitfaden);
 		infectedView = view.findViewById(R.id.reports_infected);
 
 		xDaysLeftTextview = saveOthersView.findViewById(R.id.x_days_left_textview);
@@ -144,8 +144,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
 			} else if (tracingStatusInterface.wasContactReportedAsExposed()) {
 				headerType = ReportsHeaderFragment.Type.POSSIBLE_INFECTION;
 				numExposureDays = tracingStatusInterface.getExposureDays().size();
-				boolean isHotlineCallPending = secureStorage.isHotlineCallPending();
-				if (isHotlineCallPending) {
+				boolean isOpenLeitfadenPending = secureStorage.isOpenLeitfadenPending();
+				if (isOpenLeitfadenPending) {
 					leitfadenView.setVisibility(View.VISIBLE);
 				} else {
 					saveOthersView.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
index de564d72..e8319147 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/storage/SecureStorage.java
@@ -145,7 +145,7 @@ public void setLastShownContactId(int contactId) {
 		prefs.edit().putInt(KEY_LAST_SHOWN_CONTACT_ID, contactId).apply();
 	}
 
-	public boolean isHotlineCallPending() {
+	public boolean isOpenLeitfadenPending() {
 		return prefs.getBoolean(KEY_LEITFADEN_OPEN_PENDING, false);
 	}
 
diff --git a/app/src/main/res/layout/card_what_to_do_call_us.xml b/app/src/main/res/layout/card_what_to_do_leitfaden.xml
similarity index 100%
rename from app/src/main/res/layout/card_what_to_do_call_us.xml
rename to app/src/main/res/layout/card_what_to_do_leitfaden.xml
diff --git a/app/src/main/res/layout/fragment_reports.xml b/app/src/main/res/layout/fragment_reports.xml
index 6117b167..0839b3ad 100644
--- a/app/src/main/res/layout/fragment_reports.xml
+++ b/app/src/main/res/layout/fragment_reports.xml
@@ -58,8 +58,8 @@
 				tools:visibility="visible" />
 
 			<include
-				android:id="@+id/reports_hotline"
-				layout="@layout/card_what_to_do_call_us"
+				android:id="@+id/reports_leitfaden"
+				layout="@layout/card_what_to_do_leitfaden"
 				android:layout_width="match_parent"
 				android:layout_height="wrap_content"
 				android:layout_marginBottom="@dimen/spacing_medium_large"

From 05205331ecbbd16bb552ebce53634587a2d04650 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Mon, 23 Nov 2020 16:09:02 +0100
Subject: [PATCH 08/11] fix albanian translations

---
 app/src/main/res/values-sq/strings.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 9666fa0a..6779bea5 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1074,10 +1074,10 @@ Schwarzenburgstrasse 157
     <string name="meldungen_detail_open_leitfaden_again_button">"Shko tek udhëzuesi"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden">"Answer the questions"</string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"Përgjigjuni pyetjeve në"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_swisscovid_leitfaden">"SwissCovid Guide"</string>
+    <string name="exposed_info_swisscovid_leitfaden">"Udhëzuesi \"SwissCovid\""</string>
 
     <!-- Dialog Text beim Löschen einer Meldung über einen möglichen Kontakt -->
     <string name="delete_notification_dialog">"Njoftimi për një infektim të mundshëm shërben si vërtetim që ju keni nevojë për një test falas të koronavirusit. Nëse ju e fshini këtë njoftim, atëherë e humbisni këtë vërtetim dhe lidhjen për udhëzuesin \"SwissCovid\"."</string>

From a5ab89ee1c9f96188d5db1da8c4242ef2d864d07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Wed, 2 Dec 2020 11:12:51 +0100
Subject: [PATCH 09/11] pass contact dates automatically to SwissCovid
 Leitfaden

---
 .../ch/admin/bag/dp3t/reports/ReportsFragment.java | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
index f188eb4d..3937a65a 100644
--- a/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
+++ b/app/src/main/java/ch/admin/bag/dp3t/reports/ReportsFragment.java
@@ -30,6 +30,10 @@
 import androidx.transition.Transition;
 import androidx.transition.TransitionManager;
 
+import java.util.List;
+
+import org.dpppt.android.sdk.models.ExposureDay;
+
 import ch.admin.bag.dp3t.R;
 import ch.admin.bag.dp3t.home.model.TracingStatusInterface;
 import ch.admin.bag.dp3t.storage.SecureStorage;
@@ -201,7 +205,15 @@ private void showFaq() {
 	private void openSwissCovidLeitfaden() {
 		leitfadenJustOpened = true;
 		secureStorage.leitfadenOpened();
-		UrlUtil.openUrl(getContext(), getString(R.string.swisscovid_leitfaden_url));
+		List<ExposureDay> exposureDays = tracingViewModel.getAppStatusLiveData().getValue().getExposureDays();
+		StringBuilder contactDates = new StringBuilder();
+		String delimiter = "";
+		for (ExposureDay exposureDay : exposureDays) {
+			contactDates.append(delimiter);
+			contactDates.append(exposureDay.getExposedDate().formatAsString());
+			delimiter = ",";
+		}
+		UrlUtil.openUrl(getContext(), getString(R.string.swisscovid_leitfaden_url).replace("{CONTACT_DATES}", contactDates));
 	}
 
 	private void callHotline() {

From 8113d08f170fd05f40c61d0fbc9d52519b41f6b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Thu, 3 Dec 2020 11:02:10 +0100
Subject: [PATCH 10/11] added urls for all languages

---
 app/src/main/res/values-bs/strings.xml | 2 +-
 app/src/main/res/values-de/strings.xml | 2 +-
 app/src/main/res/values-es/strings.xml | 2 +-
 app/src/main/res/values-fr/strings.xml | 2 +-
 app/src/main/res/values-hr/strings.xml | 2 +-
 app/src/main/res/values-it/strings.xml | 2 +-
 app/src/main/res/values-pt/strings.xml | 2 +-
 app/src/main/res/values-rm/strings.xml | 2 +-
 app/src/main/res/values-sq/strings.xml | 2 +-
 app/src/main/res/values-sr/strings.xml | 2 +-
 app/src/main/res/values-ti/strings.xml | 2 +-
 app/src/main/res/values-tr/strings.xml | 2 +-
 app/src/main/res/values/strings.xml    | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 5175a287..cc72d92f 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1082,5 +1082,5 @@ Schwarzenburgstrasse 157
     <string name="delete_notification_dialog">"Poruka o mogućoj infekciji služi kao dokaz za besplatno testiranje na virus korona. Ako obrišete tu poruku, izgubićete dokaz i link na SwissCovid smernice."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url"></string>
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 0ac7e67b..eefba34d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1121,5 +1121,5 @@ Wählen Sie das entsprechende Land, um auch diese Begegnungen zu informieren."</
     <string name="delete_notification_dialog">"Die Meldung über eine mögliche Ansteckung dient als Nachweis, den Sie für einen kostenlosen Coronavirus-Test benötigen. Wenn Sie diese Meldung löschen, verlieren Sie diesen Nachweis und den Link für den SwissCovid Leitfaden."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url"></string>
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.bag-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 43e63861..2e811c01 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1075,5 +1075,5 @@ Schwarzenburgstrasse 157
     <string name="delete_notification_dialog">"La notificación de un posible contagio le sirve de justificante para hacer el test gratuitamente. Si borra la notificación perderá usted el justificante, así como el enlace para la guía SwissCovid."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url"></string>
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 674ec626..1765d11a 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1084,5 +1084,5 @@ d'ouvrir un site internet."</string>
     <string name="delete_notification_dialog">"La notification d'une possible infection constitue une preuve dont vous avez besoin pour bénéficier d'un test gratuit au coronavirus. Si vous l'effacez, vous perdez cette preuve ainsi que le lien vers le guide SwissCovid."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url"></string>
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.ofsp-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 928ad83f..a56ed51b 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1078,5 +1078,5 @@ Schwarzenburgstrasse 157
     <string name="delete_notification_dialog">"Poruka o mogućoj infekciji služi kao dokaz za besplatno testiranje na virus korona. Ako obrišete tu poruku, izgubićete dokaz i link na SwissCovid smernice."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url"></string>
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index ceaf1b77..1ef4bf33 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1088,5 +1088,5 @@ Schwarzenburgstrasse 157
     <string name="delete_notification_dialog">"La segnalazione di un possibile contagio è il giustificativo che ti serve per fare il test del coronavirus gratuitamente. Se elimini questa segnalazione perdi il giustificativo e il link alla guida SwissCovid."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url"></string>
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.ufsp-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index d27bf6d5..e7a79833 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1083,5 +1083,5 @@ Schwarzenburgstrasse 157
     <string name="delete_notification_dialog">"A notificação sobre um possível contágio constitui um comprovativo de que necessitará para fazer um teste gratuito ao coronavírus. Se a apagar, perde o comprovativo e a ligação ao guia da SwissCovid."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url"></string>
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 85323f5f..49243338 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1078,5 +1078,5 @@ Schwarzenburgstrasse 157
     <string name="delete_notification_dialog">"L'avis davart in'eventuala infecziun serva sco cumprova che Vus druvais per in test dal coronavirus gratuit. Sche Vus stizzais quest avis, perdais Vus la cumprova ed il link per il mussavia SwissCovid."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url"></string>
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.bag-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 6779bea5..7cf2979c 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1083,5 +1083,5 @@ Schwarzenburgstrasse 157
     <string name="delete_notification_dialog">"Njoftimi për një infektim të mundshëm shërben si vërtetim që ju keni nevojë për një test falas të koronavirusit. Nëse ju e fshini këtë njoftim, atëherë e humbisni këtë vërtetim dhe lidhjen për udhëzuesin \"SwissCovid\"."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url"></string>
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 6b576cc1..50940afb 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1078,5 +1078,5 @@ Schwarzenburgstrasse 157
     <string name="delete_notification_dialog">"Poruka o mogućoj infekciji služi kao dokaz za besplatno testiranje na virus korona. Ako obrišete tu poruku, izgubićete dokaz i link na SwissCovid smernice."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url"></string>
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 97729892..55da3304 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1051,5 +1051,5 @@ Schwarzenburgstrasse 157
     <string name="delete_notification_dialog">"መልእኽቲ ብዛዕባ ክፍጸም ዝከኣል ልበዳ ከም መረጋገጺ እዩ ዝኸውን፣ ንሱ ሽዑ ንነጻ ዝኾነ መርመራ ኮሮናቫይረስ ከድልየኩም እዩ። እዚ መልእኽቲ እንድሕር ትድምስስዎ ኮይንኩም፣ እዚ መረጋገጺ ምስቲ ሊንክ/ሓበሬታ መርበብ ንመምርሒ SwissCovid ከተጥፍእዎ ኢኹም።"</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url"></string>
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 78a81f0d..6caad099 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1059,5 +1059,5 @@ Schwarzenburgstrasse 157
     <string name="delete_notification_dialog">"Muhtemel bir enfeksiyon bildirimi, ücretsiz Corona virüs testi yaptırmanız gerektiğinin kanıtı niteliğindedir. Bu bildirimi silerseniz, bu kanıtı ve SwissCovid Kılavuz bağlantısını kaybetmiş olursunuz."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url"></string>
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bee8353a..fd10b9ad 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1084,5 +1084,5 @@ Schwarzenburgstrasse 157
     <string name="delete_notification_dialog">"The notification of possible infection serves as the proof you need for a free coronavirus test. If you delete this notification you lose this proof and the link to the SwissCovid Guide."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
-    <string name="swisscovid_leitfaden_url"></string>
+    <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
 </resources>
\ No newline at end of file

From 4952a01d8112f94772729e98c1804a0c51baefa3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20R=C3=B6sch?= <roesch@ubique.ch>
Date: Fri, 4 Dec 2020 11:26:18 +0100
Subject: [PATCH 11/11] updated translations

---
 app/src/main/res/values-bs/strings.xml | 27 ++++++++++++++++++++++++
 app/src/main/res/values-de/strings.xml | 27 ++++++++++++++++++++++++
 app/src/main/res/values-es/strings.xml | 27 ++++++++++++++++++++++++
 app/src/main/res/values-fr/strings.xml | 29 +++++++++++++++++++++++++-
 app/src/main/res/values-hr/strings.xml | 27 ++++++++++++++++++++++++
 app/src/main/res/values-it/strings.xml | 27 ++++++++++++++++++++++++
 app/src/main/res/values-pt/strings.xml | 27 ++++++++++++++++++++++++
 app/src/main/res/values-rm/strings.xml | 27 ++++++++++++++++++++++++
 app/src/main/res/values-sq/strings.xml | 27 ++++++++++++++++++++++++
 app/src/main/res/values-sr/strings.xml | 27 ++++++++++++++++++++++++
 app/src/main/res/values-ti/strings.xml | 27 ++++++++++++++++++++++++
 app/src/main/res/values-tr/strings.xml | 27 ++++++++++++++++++++++++
 app/src/main/res/values/strings.xml    | 27 ++++++++++++++++++++++++
 13 files changed, 352 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index cc72d92f..8596fefe 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -1083,4 +1083,31 @@ Schwarzenburgstrasse 157
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours"></string>
+
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours"></string>
+
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours"></string>
+
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder"></string>
+
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button"></string>
+
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button"></string>
+
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title"></string>
+
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle"></string>
+
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index eefba34d..88327ef3 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -1122,4 +1122,31 @@ Wählen Sie das entsprechende Land, um auch diese Begegnungen zu informieren."</
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url">"https://swisscovid.bag-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours">"4 Stunden"</string>
+
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours">"8 Stunden"</string>
+
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours">"12 Stunden"</string>
+
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder">"Keine Erinnerung"</string>
+
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button">"OK"</string>
+
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button">"Abbrechen"</string>
+
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title">"Erinnerung setzen"</string>
+
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle">"SwissCovid kann Sie daran erinnern, das Tracing wieder zu aktivieren."</string>
+
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning">"Das Tracing wird deaktiviert."</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 2e811c01..6fe6aac5 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -1076,4 +1076,31 @@ Schwarzenburgstrasse 157
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours"></string>
+
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours"></string>
+
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours"></string>
+
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder"></string>
+
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button"></string>
+
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button"></string>
+
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title"></string>
+
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle"></string>
+
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 1765d11a..be8999bf 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1075,7 +1075,7 @@ d'ouvrir un site internet."</string>
     <string name="meldungen_detail_open_leitfaden_again_button">"Ouvrir le guide"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
-    <string name="exposed_info_answer_questions_in_leitfaden">"Answer the questions"</string>
+    <string name="exposed_info_answer_questions_in_leitfaden">"Répondez aux questions posées dans le"</string>
 
     <!-- Homescreen Text mit Hinweis zu SwissCovid Leitfaden bei einer Meldung -->
     <string name="exposed_info_swisscovid_leitfaden">"guide SwissCovid"</string>
@@ -1085,4 +1085,31 @@ d'ouvrir un site internet."</string>
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url">"https://swisscovid.ofsp-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours"></string>
+
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours"></string>
+
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours"></string>
+
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder"></string>
+
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button"></string>
+
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button"></string>
+
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title"></string>
+
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle"></string>
+
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index a56ed51b..5108a7fe 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -1079,4 +1079,31 @@ Schwarzenburgstrasse 157
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours"></string>
+
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours"></string>
+
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours"></string>
+
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder"></string>
+
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button"></string>
+
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button"></string>
+
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title"></string>
+
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle"></string>
+
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 1ef4bf33..770c1012 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -1089,4 +1089,31 @@ Schwarzenburgstrasse 157
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url">"https://swisscovid.ufsp-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours"></string>
+
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours"></string>
+
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours"></string>
+
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder"></string>
+
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button"></string>
+
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button"></string>
+
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title"></string>
+
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle"></string>
+
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index e7a79833..4b95a7da 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1084,4 +1084,31 @@ Schwarzenburgstrasse 157
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours"></string>
+
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours"></string>
+
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours"></string>
+
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder"></string>
+
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button"></string>
+
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button"></string>
+
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title"></string>
+
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle"></string>
+
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-rm/strings.xml b/app/src/main/res/values-rm/strings.xml
index 49243338..6f5daa20 100644
--- a/app/src/main/res/values-rm/strings.xml
+++ b/app/src/main/res/values-rm/strings.xml
@@ -1079,4 +1079,31 @@ Schwarzenburgstrasse 157
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url">"https://swisscovid.bag-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours"></string>
+
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours"></string>
+
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours"></string>
+
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder"></string>
+
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button"></string>
+
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button"></string>
+
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title"></string>
+
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle"></string>
+
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 7cf2979c..b49fcad3 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -1084,4 +1084,31 @@ Schwarzenburgstrasse 157
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours"></string>
+
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours"></string>
+
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours"></string>
+
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder"></string>
+
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button"></string>
+
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button"></string>
+
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title"></string>
+
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle"></string>
+
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 50940afb..5f3d0554 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -1079,4 +1079,31 @@ Schwarzenburgstrasse 157
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours"></string>
+
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours"></string>
+
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours"></string>
+
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder"></string>
+
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button"></string>
+
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button"></string>
+
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title"></string>
+
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle"></string>
+
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-ti/strings.xml b/app/src/main/res/values-ti/strings.xml
index 55da3304..792f86ec 100644
--- a/app/src/main/res/values-ti/strings.xml
+++ b/app/src/main/res/values-ti/strings.xml
@@ -1052,4 +1052,31 @@ Schwarzenburgstrasse 157
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours"></string>
+
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours"></string>
+
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours"></string>
+
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder"></string>
+
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button"></string>
+
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button"></string>
+
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title"></string>
+
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle"></string>
+
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 6caad099..112153f4 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -1060,4 +1060,31 @@ Schwarzenburgstrasse 157
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours"></string>
+
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours"></string>
+
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours"></string>
+
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder"></string>
+
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button"></string>
+
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button"></string>
+
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title"></string>
+
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle"></string>
+
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning"></string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fd10b9ad..ca34b1ed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1085,4 +1085,31 @@ Schwarzenburgstrasse 157
 
     <!-- URL to the SwissCovid Leitfaden -->
     <string name="swisscovid_leitfaden_url">"https://swisscovid.foph-coronavirus.ch/screening?contactDates={CONTACT_DATES}"</string>
+
+    <!-- Tracing Erinnerung 4 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_four_hours"></string>
+
+    <!-- Tracing Erinnerung 8 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_eight_hours"></string>
+
+    <!-- Tracing Erinnerung 12 Stunden Radio Button -->
+    <string name="tracing_reminder_radio_twelve_hours"></string>
+
+    <!-- Tracing Erinnerung keine Erinngerung Radio Button -->
+    <string name="tracing_reminder_radio_no_reminder"></string>
+
+    <!-- Tracing Erinnerung bestätigen Button -->
+    <string name="tracing_reminder_confirm_button"></string>
+
+    <!-- Tracing Erinnerung abbrechen Button -->
+    <string name="tracing_reminder_cancel_button"></string>
+
+    <!-- Tracing Erinnerung Titel -->
+    <string name="tracing_reminder_title"></string>
+
+    <!-- Tracing Erinnerung Untertitel -->
+    <string name="tracing_reminder_subtitle"></string>
+
+    <!-- Tracing Erinnerung Warnung -->
+    <string name="tracing_reminder_warning"></string>
 </resources>
\ No newline at end of file