diff --git a/app/src/main/res/values-af/strings.xml b/app/src/main/res/values-af/strings.xml
index 9e47a6e8a4..36c5932dab 100644
--- a/app/src/main/res/values-af/strings.xml
+++ b/app/src/main/res/values-af/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ Om die sekuriteit van jou end-tot-end-enkripsie met %1$s te verifieer, vergelyk die nommers hierbo met hulle toestel. Jy kan ook die kode op hulle foon skandeer. <a href=\"https://signal.org/redirect/safety-numbers\">Vind meer uit.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Tik om te skandeer</string>
     <string name="verify_display_fragment__successful_match">Suksesvolle passing</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Kon nie veiligheidsnommer verifieer nie</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Merk as geverifieer</string>
     <string name="verify_display_fragment__clear_verification">Maak verifiëring skoon</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index e0e3db11d2..55eee81611 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -2414,6 +2414,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -3030,7 +3032,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[للتحقق من أمان تعميتك من الطرف للطرف مع %1$s، يُرجى مقارنة الأعداد الظاهرة على كل من جهازيكما أعلاه. يُمكنك التقاط صورة للرمز الذي في هاتف الشخص الآخر. <a href=\"https://signal.org/redirect/safety-numbers\">التعرف على المزيد</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">المس للمسح</string>
     <string name="verify_display_fragment__successful_match">تم التوافُق بنجاح</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">لقد فشل التحقق من رقم الأمان</string>
@@ -3038,7 +3041,7 @@
     <string name="verify_display_fragment__mark_as_verified">علِّم كمُتحقَّق منه</string>
     <string name="verify_display_fragment__clear_verification">محو التحقق</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-az/strings.xml b/app/src/main/res/values-az/strings.xml
index dcaf3b57de..b1b39446dc 100644
--- a/app/src/main/res/values-az/strings.xml
+++ b/app/src/main/res/values-az/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%1$s ilə olan bir ucdan digərinə qədər şifrələmənin güvənliyini təsdiqləmək üçün yuxarıdakı nömrələri onun cihazındakı nömrələrlə müqayisə edin. Həmçinin onun telefonundakı kodu skan edə bilərsiniz. <a href=\"https://signal.org/redirect/safety-numbers\">Daha ətraflı.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Skan etmək üçün toxunun</string>
     <string name="verify_display_fragment__successful_match">Uğurlu</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Güvənlik nömrəsi təsdiqlənmədi</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Təsdiqləndi olaraq işarələ</string>
     <string name="verify_display_fragment__clear_verification">Təsdiqləməni təmizlə</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index e753641a72..c691d816c0 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[За да проверите сигурността на вашето криптиране от край до край с %1$s, сравнете числата по-горе с тяхното устройство. Можете също така да сканирате кода на другия телефон. <a href=\"https://signal.org/redirect/safety-numbers\">Научете повече.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Натиснете за сканиране</string>
     <string name="verify_display_fragment__successful_match">Успешно съвпадение</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Неуспешна проверка на номера за безопасност</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Маркирайте, както е потвърдено</string>
     <string name="verify_display_fragment__clear_verification">Изчистване на проверка</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index 1f02620ced..97713b27a1 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%1$s এর সাথে আপনার সর্বশেষ সীমা এনক্রিপশনের নিরাপত্তা যাচাই করতে, তাদের ডিভাইসের সাথে উপরের নম্বরগুলি তুলনা করুন। আপনি তাদের ফোনে কোড স্ক্যান করতে পারেন। <a href=\"https://signal.org/redirect/safety-numbers\">আরও জানুন।</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">স্ক্যান করতে আলতো চাপুন</string>
     <string name="verify_display_fragment__successful_match">সফল ম্যাচ</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">নিরাপত্তা নম্বর যাচাই করতে ব্যর্থ হয়েছে</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">যাচাইকৃত হিসাবে চিহ্নিত করুন</string>
     <string name="verify_display_fragment__clear_verification">যাচাইকরণ সম্পূর্ণ করুন</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-bs/strings.xml b/app/src/main/res/values-bs/strings.xml
index 567002f549..79fa48798e 100644
--- a/app/src/main/res/values-bs/strings.xml
+++ b/app/src/main/res/values-bs/strings.xml
@@ -2280,6 +2280,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2870,7 +2872,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ Ako želite provjeriti sigurnost šifriranja s kraja na kraj između Vas i %1$s, uporedite gore navedene brojeve s onim na uređaju sagovornika. Također možete skenirati broj s njegovog ili njenog telefona. <a href=\"https://signal.org/redirect/safety-numbers\">Saznajte više.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Pritisnite da skenirate</string>
     <string name="verify_display_fragment__successful_match">Podudara se</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Provjera sigurnosnog broja nije uspjela</string>
@@ -2878,7 +2881,7 @@
     <string name="verify_display_fragment__mark_as_verified">Označi kao provjereno</string>
     <string name="verify_display_fragment__clear_verification">Ukloni iz provjerenih</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index c6eb54f5c2..0ebe4f510c 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Per verificar la seguretat de l\'encriptació d\'extrem a extrem amb %1$s, compareu els números anteriors amb el seu dispositiu. També podeu escanejar el codi del telèfon. <a href=\"https://signal.org/redirect/safety-numbers\">Més informació.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Feu un toc per escanejar</string>
     <string name="verify_display_fragment__successful_match">Coincidència correcta</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Ha fallat verificar el número de seguretat.</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Marca com a verificat</string>
     <string name="verify_display_fragment__clear_verification">Neteja la verificació</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 8293e26772..5379971a44 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -2280,6 +2280,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2870,7 +2872,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Chcete-li ověřit bezpečnost koncového šifrování s %1$s, porovnejte výše uvedená čísla se zařízením tohoto kontaktu. Porovnání můžete také provést naskenováním kódu z jeho telefonu. <a href=\"https://signal.org/redirect/safety-numbers\">Dozvědět se více.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Klepnutím skenovat</string>
     <string name="verify_display_fragment__successful_match">Shoduje se</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Nepodařilo se ověřit bezpečnostní číslo</string>
@@ -2878,7 +2881,7 @@
     <string name="verify_display_fragment__mark_as_verified">Označit jako ověřené</string>
     <string name="verify_display_fragment__clear_verification">Vymazat ověření</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 8712b3a5e5..3019b49f19 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Hvis du vil bekræfte sikkerheden af din end-to-end-kryptering med %1$s, kan du sammenligne tallene ovenfor med deres enhed. Du kan også scanne koden på deres telefon. <a href=\"https://signal.org/redirect/safety-numbers\">Få mere at vide.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Tryk for at scanne</string>
     <string name="verify_display_fragment__successful_match">Vellykket match</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Kunne ikke verificere sikkerhedsnummer</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Markér som verificeret</string>
     <string name="verify_display_fragment__clear_verification">Fjern verifikation</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 7ea347394f..c7816ef043 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ Vergleiche die oben dargestellten Zahlen mit denen auf dem Gerät deines Kontakts, um die Sicherheit deiner Ende-zu-Ende-Verschlüsselung mit %1$s zu verifizieren. Alternativ kannst du auch den auf dem Telefon deines Kontakts dargestellten Code einscannen. <a href=\"https://signal.org/redirect/safety-numbers\">Mehr erfahren.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Zum Scannen antippen</string>
     <string name="verify_display_fragment__successful_match">Vergleich erfolgreich</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Sicherheitsnummer konnte nicht verifiziert werden</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Als verifiziert markieren</string>
     <string name="verify_display_fragment__clear_verification">Verifikation entfernen</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index 4a0e7e1ad3..84e3b48cd3 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ Για να επιβεβαιώσεις την ασφάλεια της κρυπτογράφησης από άκρο σε άκρο με τον/την %1$s, σύγκρινε τον παραπάνω αριθμό με αυτόν στη συσκευή του/της. Μπορείς επίσης να σκανάρεις τον κωδικό στο τηλέφωνό του/της. <a href=\"https://signal.org/redirect/safety-numbers\">Μάθε περισσότερα.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Πάτα για σκανάρισμα</string>
     <string name="verify_display_fragment__successful_match">Επιτυχής σύγκριση</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Αποτυχία επιβεβαίωσης αριθμού ασφαλείας</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Σημείωση ως επιβεβαιωμένο</string>
     <string name="verify_display_fragment__clear_verification">Αφαίρεση επιβεβαίωσης</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 3acd032c29..0fd5bb32e2 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Para verificar la seguridad del cifrado con %1$s, compara las cifras arriba con las del dispositivo de esa persona. También puedes escanear el código en su celular/móvil. <a href=\"https://signal.org/redirect/safety-numbers\">Más detalles.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Toca para escanear</string>
     <string name="verify_display_fragment__successful_match">Las cifras coinciden</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Fallo al verificar las cifras de seguridad</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Marcar persona como verificada</string>
     <string name="verify_display_fragment__clear_verification">Retirar marca de verificación</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index e25f49ab12..2fb0ceb15b 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Selleks, et kontrollida oma lõpp-punkti krüpteeringut kasutajaga %1$s, võrdle ülalolevaid numbreid tema seadme omadega. Võid ka skannida tema telefonis oleva koodi või paluda tal skannida sinu oma. <a href=\"https://signal.org/redirect/safety-numbers\">Lisateave.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Koputa skäneerimiseks</string>
     <string name="verify_display_fragment__successful_match">Edukas sobivus.</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Turvanumbri kinnitamine ei õnnestunud</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Märgi kinnitatuks</string>
     <string name="verify_display_fragment__clear_verification">Tühista kontrollimine</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml
index a747370bee..d645bb0037 100644
--- a/app/src/main/res/values-eu/strings.xml
+++ b/app/src/main/res/values-eu/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%1$s(r)ekin trukatzen dituzun mezuak muturretik muturrera enkriptatuta dauden egiaztatzeko, konparatu goiko zenbakiak haren gailuan agertzen direnekin. Haren telefonoko kodea eskanea dezakezu, baita ere. <a href=\"https://signal.org/redirect/safety-numbers\">Informazio gehiago</a>.]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Sakatu eskaneatzeko</string>
     <string name="verify_display_fragment__successful_match">Konbinazio arrakastatsua</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Ezin izan da egiaztatu segurtasun-zenbakia</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Markatu egiaztatu gisa</string>
     <string name="verify_display_fragment__clear_verification">Garbitu egiaztapena</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index c08d07566e..d6c212a264 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ برای وارسی امنیت رمزگذاری سرتاسر خود با %1$s، ارقام بالا را با ارقام روی دستگاه آن‌ها مقایسه کنید. همچنین می‌توانید کد روی تلفن آن‌ها را اسکن کنید. <a href=\"https://signal.org/redirect/safety-numbers\">بیشتر یاد بگیرید.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">برای اسکن کردن ضربه بزنید</string>
     <string name="verify_display_fragment__successful_match">انطباق موفق</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">وارسی شمارهٔ ایمنی ناموفق بود</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">علامت‌گذاری به عنوان وارسی شده</string>
     <string name="verify_display_fragment__clear_verification">پاک کردن وارسی</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index cf7aa573ba..a068eb0f66 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Varmentaaksesi viestinnän päästä päähän -salauksen käyttäjän %1$s kanssa, vertaa yllä näkyviä numeroita vastapuolen laitteen kanssa. Voit myös skannata koodin vastapuolen puhelimesta. <a href=\"https://signal.org/redirect/safety-numbers\">Lue lisää.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Skannaa napauttamalla</string>
     <string name="verify_display_fragment__successful_match">Vastaavuus varmistettu</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Turvanumeron varmentaminen epäonnistui</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Merkitse varmennetuksi</string>
     <string name="verify_display_fragment__clear_verification">Poista varmennus</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index f09352cb5f..6056ab8d5c 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Pour confirmer la sécurité de votre chiffrement de bout en bout avec %1$s, comparez les chiffres ci-dessous avec ceux de son appareil. Vous pouvez aussi lire le code sur son téléphone. <a href=\"https://signal.org/redirect/safety-numbers\">En apprendre davantage.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Touchez pour lire</string>
     <string name="verify_display_fragment__successful_match">Correspondance effective</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Échec de la confirmation du numéro de sécurité.</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Marquer comme confirmé</string>
     <string name="verify_display_fragment__clear_verification">Annuler la confirmation</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
index 2b7cdd1e43..952a477348 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -2347,6 +2347,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2950,7 +2952,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[D\'fhonn slándáil do chriptithe ó cheann ceann le %1$s a fhíorú, cuir na huimhreacha thuas i gcomparáid le gléas an duine sin. Is féidir leat an cód a scanadh ar an guthán aige/aici freisin. <a href=\"https://signal.org/redirect/safety-numbers\">Tuilleadh faisnéise.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Cnag le scanadh</string>
     <string name="verify_display_fragment__successful_match">D\'éirigh leis an meaitseáil</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Theip ar fhíorú na huimhreach sábháilteachta</string>
@@ -2958,7 +2961,7 @@
     <string name="verify_display_fragment__mark_as_verified">Marcáil Deimhnithe</string>
     <string name="verify_display_fragment__clear_verification">Glan an Deimhniú</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml
index 32c774e0f2..2ba0eb3118 100644
--- a/app/src/main/res/values-gl/strings.xml
+++ b/app/src/main/res/values-gl/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ Para verificar a seguridade da túa encriptación de extremo a extremo con %1$s, compara os números de arriba co seu dispositivo. Tamén podes escanear o código no seu teléfono. <a href=\"https://signal.org/redirect/safety-numbers\">Máis información.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Toca para escanear</string>
     <string name="verify_display_fragment__successful_match">Emparellamento realizado con éxito</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Erro na verificación do número de seguranza</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Marcar como verificado</string>
     <string name="verify_display_fragment__clear_verification">Borrar verificación</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
index 1af82e24e1..6ba5423726 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%1$s સાથે તમારા એન્ડ-ટુ-એન્ડ એન્ક્રિપ્શનની સુરક્ષાની ખાતરી કરવા માટે, ઉપર દર્શાવેલ નંબર તેમના ડિવાઇસ સાથે સરખાવો. તમે તેમના ફોન પર કોડ સ્કેન પણ કરી શકો છો. <a href=\"https://signal.org/redirect/safety-numbers\">વધુ જાણો.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">સ્કેન કરવા માટે ટેપ કરો</string>
     <string name="verify_display_fragment__successful_match">સફળતાપૂર્વક મેચ થયું</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">સલામતી નંબર ચકાસવામાં નિષ્ફળ</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">ચકાસાયેલ તરીકે માર્ક કરો</string>
     <string name="verify_display_fragment__clear_verification">ચકાસણી દૂર કરો</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index ca40e772ad..38becb5b78 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%1$s के साथ अपने एंड-टू-एंड एन्क्रिप्शन की सुरक्षा को जांचने के लिए, ऊपर दिए गए नंबरों की तुलना उनके डिवाइस से करें. आप उनके फ़ोन पर कोड को स्कैन भी कर सकते हैं. <a href=\"https://signal.org/redirect/safety-numbers\">ज़्यादा जानें.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">स्कैन करने के लिए टैप करें</string>
     <string name="verify_display_fragment__successful_match">सफ़ल मैच</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">सुरक्षा नंबर जांचने में असफ़ल</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">साटिपिट होने का मार्क कीजीये</string>
     <string name="verify_display_fragment__clear_verification">जांच क्लियर करें</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index 6322d8f519..06722c4a47 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -2280,6 +2280,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2870,7 +2872,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ Da biste provjerili sigurnost svoje sveobuhvatne enkripcije s %1$s, usporedite gornje brojeve s njihovim uređajem. Kôd možete skenirati i na njihovom telefonu. <a href=\"https://signal.org/redirect/safety-numbers\">Saznajte više.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Pritisni za skeniranje</string>
     <string name="verify_display_fragment__successful_match">Rezultati se podudaraju</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Provjera sigurnosnog broja nije uspjela</string>
@@ -2878,7 +2881,7 @@
     <string name="verify_display_fragment__mark_as_verified">Označi kao provjereno</string>
     <string name="verify_display_fragment__clear_verification">Poništi provjeru</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 62065a86d2..2f1098dad5 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Ha szeretnéd ellenőrizni a titkosítás sértetlenségét %1$s nevű partnereddel, hasonlítsd össze a fenti számot az ő készülékén megjelenő számmal. Alternatív megoldásként beszkennelheted a kódot telefonja kijelzőjéről <a href=\"https://signal.org/redirect/safety-numbers\">Tudj meg többet!</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Koppints a szkenneléshez</string>
     <string name="verify_display_fragment__successful_match">Sikeres egyezés</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Biztonsági azonosító ellenőrzése sikertelen</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Megjelölés ellenőrzöttként</string>
     <string name="verify_display_fragment__clear_verification">Ellenőrzött állapot törlése</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index bcfab0910c..25960be336 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Untuk memverifikasi keamanan enkripsi ujung-ke-ujung Anda dengan %1$s, bandingkan nomor di atas dengan yang ada di perangkat mereka. Anda juga dapat memindai kodenya di ponsel mereka. <a href=\"https://signal.org/redirect/safety-numbers\">Pelajari lebih lanjut.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Ketuk untuk memindai</string>
     <string name="verify_display_fragment__successful_match">Pencocokan berhasil</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Gagal memverifikasi nomor keamanan</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">Tandai terverifikasi</string>
     <string name="verify_display_fragment__clear_verification">Hapus verifikasi</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 8cc86dd806..6003df5355 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Per verificare la sicurezza della tua crittografia end-to-end con %1$s, confronta i numeri sopra con il loro dispositivo. Puoi anche scansionare il codice sul loro telefono. <a href=\"https://signal.org/redirect/safety-numbers\">Maggiori informazioni.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Tocca per la scansione</string>
     <string name="verify_display_fragment__successful_match">Verifica riuscita</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Verifica del numero di sicurezza non riuscita</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Segna come verificato</string>
     <string name="verify_display_fragment__clear_verification">Rimuovi verifica</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 00da83d112..9b9c4906ba 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -2280,6 +2280,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2870,7 +2872,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[כדי לוודא את האבטחה של ההצפנה מקצה־אל־קצה שלך עם %1$s, השווה את המספרים לעיל עם המכשיר של הצד השני. אתה יכול גם לסרוק את הקוד במכשיר של הצד שני. <a href=\"https://signal.org/redirect/safety-numbers\">למד עוד.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">הקש כדי לסרוק</string>
     <string name="verify_display_fragment__successful_match">התאמה מוצלחת</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">נכשל בווידוא מספר ביטחון</string>
@@ -2878,7 +2881,7 @@
     <string name="verify_display_fragment__mark_as_verified">סמן כמוֻדא</string>
     <string name="verify_display_fragment__clear_verification">נקה וידוא</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index ec74348155..284a11aaf5 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%1$s とのエンドツーエンドの暗号化を検証するには、上記の番号が相手の端末のものと一致するか確認してください。相手の端末上のコードをスキャンするか、あなたのコードをスキャンしてもらうことでも可能です。<a href=\"https://signal.org/redirect/safety-numbers\">詳細</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">タップしてスキャンする</string>
     <string name="verify_display_fragment__successful_match">一致しました</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">安全番号を検証できませんでした</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">検証済みにする</string>
     <string name="verify_display_fragment__clear_verification">未検証にする</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ka/strings.xml b/app/src/main/res/values-ka/strings.xml
index 66f32d4f72..5938a6fd73 100644
--- a/app/src/main/res/values-ka/strings.xml
+++ b/app/src/main/res/values-ka/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ რომ შეამოწმო დაშიფვრის უსაფრთხოება %1$s-სთან, შეადარე ზემოთ მოცემული ნომრები მის მოწყობილობასთან. ან შეგიძლია მის ტელეფონზე კოდი დაასკანირო. <a href=\"https://signal.org/redirect/safety-numbers\">გაიგე მეტი.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">დააჭირე დასასკანირებლად</string>
     <string name="verify_display_fragment__successful_match">წარმატებული დამთხვევა</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">უსაფრთხოების ნომრის ვერიფიცირება ვერ მოხერხდა</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Mark as verified</string>
     <string name="verify_display_fragment__clear_verification">ვერიფიკაციის გასუფთავება</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-kk/strings.xml b/app/src/main/res/values-kk/strings.xml
index 9ddd861e0d..c4f9bac17b 100644
--- a/app/src/main/res/values-kk/strings.xml
+++ b/app/src/main/res/values-kk/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%1$s арқылы өтпелі шифрлаудың қауіпсіздігін тексеру үшін, жоғарыдағы сандарды осы құрылғымен салыстырыңыз. Сонымен қатар оның телефонындағы кодты сканерлеуіңізге болады. <a href=\"https://signal.org/redirect/safety-numbers\">Толығырақ.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Сканерлеу үшін түртіңіз</string>
     <string name="verify_display_fragment__successful_match">Сәйкес келді</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Қауіпсіздік нөмірі тексерілмеді</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Mark as verified</string>
     <string name="verify_display_fragment__clear_verification">Верификацияны тазалау</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-km/strings.xml b/app/src/main/res/values-km/strings.xml
index bbd89dafe7..ed847e8054 100644
--- a/app/src/main/res/values-km/strings.xml
+++ b/app/src/main/res/values-km/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ដើម្បីផ្ទៀងផ្ទាត់សន្តិសុខនៃកូដនីយកម្មទាំងសងខាងរបស់អ្នកជាមួយ %1$s, ប្រៀបធៀបលេខខាងលើជាមួយឧបករណ៍របស់ពួកគេ។ អ្នកក៏អាចស្កេនលេខកូដនៅលើទូរស័ព្ទរបស់គេបានដែរ។ <a href=\"https://signal.org/redirect/safety-numbers\">សិក្សាបន្ថែម</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">ចុច ដើម្បីស្កែន</string>
     <string name="verify_display_fragment__successful_match">ផ្គូរផ្គងដោយជោគជ័យ</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">បរាជ័យក្នុងការផ្ទៀងផ្ទាត់លេខសុវត្ថិភាព</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">ដាក់ថាបានផ្ទៀងផ្ទាត់</string>
     <string name="verify_display_fragment__clear_verification">សំអាតការផ្ទៀងផ្ទាត់</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-kn/strings.xml b/app/src/main/res/values-kn/strings.xml
index c7348a75ee..8f64fa8921 100644
--- a/app/src/main/res/values-kn/strings.xml
+++ b/app/src/main/res/values-kn/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ನಿಮ್ಮ ಎಂಡ್-ಟು-ಎಂಡ್ ಎನ್‌ಕ್ರಿಪ್ಷನ್‌ನ ಸುರಕ್ಷತೆಯನ್ನು %1$s ನೊಂದಿಗೆ ದೃಢೀಕರಿಸಲು, ಮೇಲಿನ ಸಂಖ್ಯೆಗಳನ್ನು ತಮ್ಮ ಸಾಧನಗಳೊಂದಿಗೆ ಹೋಲಿಸಿ. ಅವರ ಫೋನ್‌ನಲ್ಲಿರುವ ಕೋಡ್ ಅನ್ನು ಕೂಡಾ ನೀವು ಸ್ಕ್ಯಾನ್ ಮಾಡಬಹುದು. <a href=\"https://signal.org/redirect/safety-numbers\">ಇನ್ನಷ್ಟು ತಿಳಿಯಿರಿ.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">ಸ್ಕ್ಯಾನ್ ಮಾಡಲು ಟ್ಯಾಪ್ ಮಾಡಿ</string>
     <string name="verify_display_fragment__successful_match">ಯಶಸ್ವಿ ಹೊಂದಾಣಿಕೆ</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">ಸುರಕ್ಷತಾ ಸಂಖ್ಯೆಯನ್ನು ದೃಢೀಕರಿಸುವಲ್ಲಿ ವಿಫಲವಾಗಿದೆ</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">ಪರಿಶೀಲಿಸಲಾಗಿದೆ ಎಂದು ಗುರುತಿಸಿ</string>
     <string name="verify_display_fragment__clear_verification">ದೃಢೀಕರಣವನ್ನು ತೆರವುಗೊಳಿಸಿ</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index eeafe09753..53a7f3408b 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ %1$s 님과의 종단간 암호화의 보안을 검증하기 위해, 상대의 기기와의 코드를 비교하세요. 또는 상대의 폰의 코드를 스캔 할 수 있습니다. <a href=\"https://signal.org/redirect/safety-numbers\">더 알아보기</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">탭하여 스캔</string>
     <string name="verify_display_fragment__successful_match">일치 확인</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">안전 번호 확인에 실패함</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">검증으로 표시</string>
     <string name="verify_display_fragment__clear_verification">인증 초기화하기</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ky/strings.xml b/app/src/main/res/values-ky/strings.xml
index 56deed7471..df4c84f2de 100644
--- a/app/src/main/res/values-ky/strings.xml
+++ b/app/src/main/res/values-ky/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%1$s менен болгон баштан аяк шифрлөөнүн коопсуздугун текшерүү үчүн жогорудагы сандарды маектешиңиздин түзмөгү менен салыштырыңыз. Кааласаңыз, анын телефонундагы кодду скандасаңыз болот. <a href=\"https://signal.org/redirect/safety-numbers\">Кененирээк маалымат</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Скандоо үчүн басыңыз</string>
     <string name="verify_display_fragment__successful_match">Дал келди</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Коопсуздук коду ырасталбай калды</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">Ырасталды деп белгилөө</string>
     <string name="verify_display_fragment__clear_verification">Ырастоону өчүрүү</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml
index d544ff8be4..ddf75c427e 100644
--- a/app/src/main/res/values-lt/strings.xml
+++ b/app/src/main/res/values-lt/strings.xml
@@ -2280,6 +2280,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2870,7 +2872,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Norėdami patvirtinti savo ištisinio šifravimo su %1$s saugumą, palyginkite aukščiau esančius skaičius su skaičiais šio adresato įrenginyje. Taip pat galite nuskenuoti kodą adresato telefone. <a href=\"https://signal.org/redirect/safety-numbers\">Sužinokite daugiau.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Bakstelėkite, norėdami nuskenuoti</string>
     <string name="verify_display_fragment__successful_match">Sėkminga atitiktis</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Nepavyko patvirtinti saugumo numerio</string>
@@ -2878,7 +2881,7 @@
     <string name="verify_display_fragment__mark_as_verified">Žymėti kaip patvirtintą</string>
     <string name="verify_display_fragment__clear_verification">Išvalyti patvirtinimą</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-lv/strings.xml b/app/src/main/res/values-lv/strings.xml
index 5ef7358356..677fd98178 100644
--- a/app/src/main/res/values-lv/strings.xml
+++ b/app/src/main/res/values-lv/strings.xml
@@ -2213,6 +2213,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2790,7 +2792,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Lai pārbaudītu šifrēšanas drošību sarunai ar %1$s, salīdziniet ciparus augstāk ar viņu ierīci. Jūs varat arī noskenēt kodu viņu telefonā. <a href=\"https://signal.org/redirect/safety-numbers\">Uzzināt vairāk.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Pieskarieties, lai skenētu</string>
     <string name="verify_display_fragment__successful_match">Veiksmīga sakritība</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Neizdevās pārbaudīt drošības numuru</string>
@@ -2798,7 +2801,7 @@
     <string name="verify_display_fragment__mark_as_verified">Atzīmēt kā apstiprinātu</string>
     <string name="verify_display_fragment__clear_verification">Dzēst verifikāciju</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-mk/strings.xml b/app/src/main/res/values-mk/strings.xml
index 5355f95c9f..f9c486d113 100644
--- a/app/src/main/res/values-mk/strings.xml
+++ b/app/src/main/res/values-mk/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[За да ја потврдите безбедноста на Вашето шифрирање од-крај-до-крај со %1$s, споредете ги горенаведените броеви прикажани на уредот на соговорникот. Можете исто така да го скенирате кодот прикажан на телефонот на соговорникот. <a href=\"https://signal.org/redirect/safety-numbers\">Дознајте повеќе.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Допри да скенираш</string>
     <string name="verify_display_fragment__successful_match">Успешно совпаѓање</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Неуспешна проверка на безбедносниот број</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Обележи како проверено</string>
     <string name="verify_display_fragment__clear_verification">Отстрани проверка</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml
index 4476e24c8b..4f31311556 100644
--- a/app/src/main/res/values-ml/strings.xml
+++ b/app/src/main/res/values-ml/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%1$s-മായുള്ള നിങ്ങളുടെ ആദ്യാവസാന എൻക്രിപ്ഷന്റെ സുരക്ഷ പരിശോധിക്കാൻ, മുകളിലെ നമ്പറുകൾ അവരുടെ ഉപകരണവുമായി താരതമ്യം ചെയ്യുക. നിങ്ങൾക്ക് അവരുടെ ഫോണിലെ കോഡ് സ്കാൻ ചെയ്യാനും കഴിയും.<a href=\"https://signal.org/redirect/safety-numbers\">കൂടുതല്‍ അറിയുക</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">സ്കാൻ ചെയ്യാൻ തൊടുക</string>
     <string name="verify_display_fragment__successful_match">വിജയകരമായ ചേര്‍ച്ച</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">സുരക്ഷാ നമ്പർ പരിശോധിക്കുന്നതിൽ പരാജയപ്പെട്ടു</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">പരിശോധിച്ചതായി അടയാളപ്പെടുത്തുക</string>
     <string name="verify_display_fragment__clear_verification">പരിശോധന പൂർത്തിയാക്കുക</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index 2d6db23e33..79a00d01b3 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[जर आपल्याला %1$s सोबत आपल्या एन्क्रिप्शनची सुरक्षा सत्यापित करायची असेल, तर त्यांचा डिव्हाईस वरील नंबरची तुलना करा. पर्यायीरीत्या, आपण त्यांच्या फोन वरील कोड स्कॅन करू शकता, किंवा त्यांना आपला कोड स्कॅन करण्यास विचारू शकता. <a href=\"https://signal.org/redirect/safety-numbers\">अधिक जाणा</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">स्कॅन करण्यासाठी टॅप करा</string>
     <string name="verify_display_fragment__successful_match">यशस्वी जोड</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">सुरक्षितता नंबरची पडताळणी करण्यात अयशस्वी</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">सत्यापित म्हणून चिन्हांकित करा</string>
     <string name="verify_display_fragment__clear_verification">सत्यापन साफ करा</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 296a302be8..6bec9bfc3d 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Untuk mengesahkan keselamatan enkripsi akhir ke akhir anda dengan %1$s, bandingkan nombor-nombor di atas dengan peranti mereka. Anda juga boleh mengimbas kod itu di telefon mereka. <a href=\"https://signal.org/redirect/safety-numbers\">Pelajari lebih lanjut.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Ketik untuk mengimbas</string>
     <string name="verify_display_fragment__successful_match">Padanan berjaya</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Gagal mengesahkan nombor keselamatan</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">Tanda sebagai disahkan</string>
     <string name="verify_display_fragment__clear_verification">Kosongkan pengesahan</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-my/strings.xml b/app/src/main/res/values-my/strings.xml
index d01730adb1..ff79f4b520 100644
--- a/app/src/main/res/values-my/strings.xml
+++ b/app/src/main/res/values-my/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%1$s ဖြင့် သင်၏ End-to-end ကုဒ်ပြောင်းဝှက်မှု လုံခြုံရေးကို အတည်ပြုရန် ၎င်းတို့၏ စက်ဖြင့် အထက်ပါ နံပါတ်များကို ယှဉ်ကြည့်ပါ။ ၎င်းတို့ ဖုန်းတွင်ရှိသော ကုဒ်ကိုလည်း သင် စကန်ဖတ်နိုင်ပါသည်။ <a href=\"https://signal.org/redirect/safety-numbers\">ပိုမိုလေ့လာရန်။</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">စကင်ဖတ်ရန်နှိပ်ပါ</string>
     <string name="verify_display_fragment__successful_match">ကိုက်ညီမှု အောင်မြင်ပါသည်</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">လုံခြုံရေးနံပါတ်ကို အတည်ပြုရန် မအောင်မြင်ခဲ့ပါ</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">Mark as verified</string>
     <string name="verify_display_fragment__clear_verification">အတည်ပြုမှု ရှင်းလင်းရန်</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index a4d20d2d8e..9ff7b9d9c9 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Hvis du vil bekrefte at du har sikker ende til ende-kryptering med %1$s, bør du sammenligne tallene ovenfor med tallene på vedkommendes enhet. Du kan også skanne koden på personens telefon. <a href=\"https://signal.org/redirect/safety-numbers\">Les mer.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Trykk for å skanne</string>
     <string name="verify_display_fragment__successful_match">Samsvar</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Kunne ikke bekrefte sikkerhetsnummeret</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Merk som bekreftet</string>
     <string name="verify_display_fragment__clear_verification">Fjern bekreftelse</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 178456b712..1234fdb9d6 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Als je wilt verifiëren dat je rechtstreeks met %1$s communiceert zonder dat je communicatie wordt onderschept, ga dan na dat het bovenstaande nummer overeen komt met het nummer op zijn / haar apparaat. Je kunt ook de QR-code op zijn / haar telefoon scannen. <a href=\"https://signal.org/redirect/safety-numbers\">Meer leren hierover.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Tik om te scannen</string>
     <string name="verify_display_fragment__successful_match">De nummers komen overeen</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Verifieren niet gelukt</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Als geverifieerd markeren</string>
     <string name="verify_display_fragment__clear_verification">Verificatie ongedaan maken</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
index c20e65cb24..eceba935df 100644
--- a/app/src/main/res/values-pa/strings.xml
+++ b/app/src/main/res/values-pa/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%1$s ਦੇ ਨਾਲ ਆਪਣੀ ਸਿਰੇ-ਤੋਂ-ਸਿਰੇ ਤੱਕ ਇਨਕ੍ਰਿਪਸ਼ਨ ਦੀ ਤਸਦੀਕ ਕਰਨ ਲਈ, ਉੱਪਰ ਦਿੱਤੇ ਨੰਬਰਾਂ ਦੀ ਤੁਲਨਾ ਉਹਨਾਂ ਦੇ ਡਿਵਾਈਸ ਵਿੱਚ ਦਿਖਾਏ ਨੰਬਰਾਂ ਦੇ ਨਾਲ ਕਰੋ। ਤੁਸੀਂ ਉਹਨਾਂ ਦੇ ਫ਼ੋਨ ਵਿੱਚ ਦਿਖਾਏ ਕੋਡ ਨੂੰ ਵੀ ਸਕੈਨ ਕਰ ਸਕਦੇ ਹੋ। <a href=\"https://signal.org/redirect/safety-numbers\">ਹੋਰ ਜਾਣੋ।</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">ਸਕੈਨ ਕਰਨ ਲਈ ਟੈਪ ਕਰੋ</string>
     <string name="verify_display_fragment__successful_match">ਸਫਲਤਾਪੂਰਵਕ ਮੇਲ ਖਾਂਦਾ ਹੈ</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">ਸੁਰੱਖਿਆ ਨੰਬਰ ਦੀ ਤਸਦੀਕ ਕਰਨਾ ਅਸਫਲ ਰਿਹਾ</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">ਪ੍ਰਮਾਣਿਤ ਵਜੋਂ ਚਿੰਨ੍ਹ ਲਾਓ</string>
     <string name="verify_display_fragment__clear_verification">ਤਸਦੀਕ ਨੂੰ ਮਿਟਾਓ</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 25c1c4d33f..255198f544 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -2280,6 +2280,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2870,7 +2872,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Jeśli chcesz zweryfikować bezpieczeństwo szyfrowania end-to-end z %1$s, porównaj powyższe numery na waszych urządzeniach. Możesz również zeskanować kod kontaktu na jego telefonie. <a href=\"https://signal.org/redirect/safety-numbers\">Dowiedz się więcej</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Dotknij, aby zeskanować</string>
     <string name="verify_display_fragment__successful_match">Dopasowanie udane</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Nie udało się zweryfikować numeru bezpieczeństwa!</string>
@@ -2878,7 +2881,7 @@
     <string name="verify_display_fragment__mark_as_verified">Oznacz jako zweryfikowany</string>
     <string name="verify_display_fragment__clear_verification">Wycofaj weryfikację</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 414209e458..d09bd1f08c 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Para verificar a segurança da sua criptografia de ponta a ponta com %1$s, compare os números acima com os números no aparelho da outra pessoa. Você pode comparar número por número ou escaneando o código no telefone da outra pessoa. <a href=\"https://signal.org/redirect/safety-numbers\">Saiba mais.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Toque para escanear</string>
     <string name="verify_display_fragment__successful_match">Correspondência bem sucedida</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Falha ao verificar o número de segurança</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Marcar como verificado</string>
     <string name="verify_display_fragment__clear_verification">Apagar verificação</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index aefebc32b8..2bc36a0eff 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Para verificar a segurança da sua encriptação ponta-a-ponta com %1$s, compare os números acima com o dispositivo da outra pessoa. Também pode digitalizar o código no telefone da outra pessoa. <a href=\"https://signal.org/redirect/safety-numbers\">Mais informações.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Toque para ler</string>
     <string name="verify_display_fragment__successful_match">Correspondência bem sucedida</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Falha o verificar o número de segurança</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Marcar como verificado</string>
     <string name="verify_display_fragment__clear_verification">Limpar verificação</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index c46d5186b5..7fb5c3dc54 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -2213,6 +2213,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2790,7 +2792,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Pentru a verifica securitatea criptării integrale între tine și %1$s, compară numerele de mai sus cu cele de pe dispozitivul acestora. Poți de asemenea scana codul de pe telefonul lor. <a href=\"https://signal.org/redirect/safety-numbers\">Află mai multe.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Atinge pentru a scana</string>
     <string name="verify_display_fragment__successful_match">Potrivire reușită</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Verificarea numărului de siguranță a eșuat</string>
@@ -2798,7 +2801,7 @@
     <string name="verify_display_fragment__mark_as_verified">Marchează ca verificat</string>
     <string name="verify_display_fragment__clear_verification">Șterge verificarea</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 97932d2b88..966dd7039a 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -2280,6 +2280,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2870,7 +2872,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Чтобы убедиться в безопасности сквозного шифрования с %1$s, сравните числа выше с устройством вашего собеседника. Вы также можете отсканировать код на его устройстве. <a href=\"https://signal.org/redirect/safety-numbers\">Узнать больше.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Сканировать</string>
     <string name="verify_display_fragment__successful_match">Успешное совпадение</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Не удалось подтвердить код безопасности</string>
@@ -2878,7 +2881,7 @@
     <string name="verify_display_fragment__mark_as_verified">Отметить как подтверждённый</string>
     <string name="verify_display_fragment__clear_verification">Сбросить подтверждение</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index 8d637f8824..1abfaa847c 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -2280,6 +2280,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2870,7 +2872,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Ak chcete overiť bezpečnosť šifrovania end-to-end pomocou %1$s, porovnajte vyššie uvedené čísla s ich zariadeniami. Kód môžete naskenovať aj do ich telefónu. <a href=\"https://signal.org/redirect/safety-numbers\">Viac informácií.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Ťuknutím naskenujte</string>
     <string name="verify_display_fragment__successful_match">Zhoda úspešná</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Bezpečnostné číslo sa nepodarilo overiť</string>
@@ -2878,7 +2881,7 @@
     <string name="verify_display_fragment__mark_as_verified">Označiť ako overené</string>
     <string name="verify_display_fragment__clear_verification">Zrušiť overenie</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml
index f39a280edc..e07160c252 100644
--- a/app/src/main/res/values-sl/strings.xml
+++ b/app/src/main/res/values-sl/strings.xml
@@ -2280,6 +2280,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2870,7 +2872,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Za varnostno potrditev šifriranja od-pošiljatelja-do-prejemnika z uporabnikom_co %1$s, primerjajte zgornja števila s števili na njegovi/njeni napravi. Lahko tudi skenirate kodo QR na njegovem/njenem telefonu. <a href=\"https://signal.org/redirect/safety-numbers\">Več o tem.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Tapnite za skeniranje</string>
     <string name="verify_display_fragment__successful_match">Ujemanje potrjeno</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Varnostnega števila ni bilo mogoče preveriti</string>
@@ -2878,7 +2881,7 @@
     <string name="verify_display_fragment__mark_as_verified">Označi kot potrjeno.</string>
     <string name="verify_display_fragment__clear_verification">Izbris potrditeve</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-sq/strings.xml b/app/src/main/res/values-sq/strings.xml
index 06a8d7231f..44367635a5 100644
--- a/app/src/main/res/values-sq/strings.xml
+++ b/app/src/main/res/values-sq/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Që të verifikoni sigurinë e fshehtëzimit tuaj skaj-më-skaj me %1$s, krahasoni numrat më sipër me pajisjen e tij. Mundeni edhe të skanoni kodin në telefonin e tij. <a href=\"https://signal.org/redirect/safety-numbers\">Mësoni më tepër.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Prekeni që të skanohet</string>
     <string name="verify_display_fragment__successful_match">Përputhje e suksesshme</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">S\\’u arri të verifikohet numër sigurie</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Vëri shenjë si i verifikuar</string>
     <string name="verify_display_fragment__clear_verification">Spastroje verifikimin</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 6dd8976d18..b3cd242449 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Да бисте проверили сигурност ваше шифрирања са %1$s, упоредите горе наведене бројеве са њиховим уређајем. Такође можете да скенирате код на њихов телефон. <a href=\"https://signal.org/redirect/safety-numbers\">Сазнати више.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Тапните за скенирање</string>
     <string name="verify_display_fragment__successful_match">Успешно подударање</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Сигурносни број није оверен</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Означи као проверено</string>
     <string name="verify_display_fragment__clear_verification">Уклони оверу</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 4ddc8f629b..81ccf78c9b 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[För att verifiera säkerheten för din ände-till-ände-kryptering med %1$s, jämför siffrorna ovan med deras enhet. Du kan också skanna koden på deras telefon. <a href=\"https://signal.org/redirect/safety-numbers\">Läs mer.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Tryck för att skanna</string>
     <string name="verify_display_fragment__successful_match">Lyckad matchning</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Det gick inte att verifiera säkerhetsnumret</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Markera som verifierat</string>
     <string name="verify_display_fragment__clear_verification">Rensa verifiering</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml
index 7d712d446b..75580c9e1d 100644
--- a/app/src/main/res/values-sw/strings.xml
+++ b/app/src/main/res/values-sw/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ Ili kudhibitisha usalama wa mfumo wako wa end-to-end na %1$s, linganisha nambari hapo juu na kifaa chake. Pia unaweza kupitisha kwenye skana kodi ilio kwenye simu yao. <a href=\"https://signal.org/redirect/safety-numbers\"> Jifunze zaidi.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Gusa kuskani</string>
     <string name="verify_display_fragment__successful_match">Match imeendana</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Imeshindwa kuthibitisha nambari ya usalama.</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Weka alama kuwa imedhibitishwa</string>
     <string name="verify_display_fragment__clear_verification">Futa uthibitishwaji</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ta/strings.xml b/app/src/main/res/values-ta/strings.xml
index 661ce33989..760e1630b9 100644
--- a/app/src/main/res/values-ta/strings.xml
+++ b/app/src/main/res/values-ta/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ %1$s உடன் உங்கள் முடிவிலிருந்து-முடிவுவரை குறியாக்கத்தின் பாதுகாப்பை சரிபார்க்க, அவர்களின் சாதனத்துடன் மேலிருக்கும் எண்களோடு ஒப்பிடுக. நீங்கள் அவர்களின் தொலைபேசியில் உள்ள குறியீட்டை ஸ்கேன் செய்யலாம். <a href=\"https://signal.org/redirect/safety-numbers\"> மேலும் அறிக.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">ஸ்கேன் செய்ய தட்டவும்</string>
     <string name="verify_display_fragment__successful_match">வெற்றிகரமான இணை</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">பாதுகாப்பு எண்ணைச் சரிபார்க்கத் தவறியது</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">சரிபார்க்கப்பட்டதாகக் குறிக்கவும்</string>
     <string name="verify_display_fragment__clear_verification">சரிபார்ப்பை நீக்கவும்</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-te/strings.xml b/app/src/main/res/values-te/strings.xml
index 7dfa497206..2354f41d4a 100644
--- a/app/src/main/res/values-te/strings.xml
+++ b/app/src/main/res/values-te/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ %1$sతో మీ ఎండ్ టూ ఎండ్ ఎన్‌క్రిప్షన్ భద్రతను ధృవీకరించడానికి, పైన నెంబర్‌లను వారి పరికరంతో పోల్చండి. మీరు కోడ్‌ను వారి పరికరాలపైన కూడా స్కాన్ చేయవచ్చు. <a href=\"https://signal.org/redirect/safety-numbers\">మరింత తెలుసుకోండి.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">స్కాన్ నొక్కండి</string>
     <string name="verify_display_fragment__successful_match">విజయవంతంగా మ్యాచ్ అయింది</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">భద్రతా సంఖ్యను ధృవీకరించడం విఫలమైంది</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">ధృవీకరించినట్లు గుర్తించండి</string>
     <string name="verify_display_fragment__clear_verification">ధృవీకరణను క్లియర్ చేయండి</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 2de71a8490..3abcd796fb 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[หากต้องการตรวจยืนยันความปลอดภัยของการเข้ารหัสจากต้นทางถึงปลายทางด้วย%1$s ให้เปรียบเทียบหมายเลขข้างบนกับอุปกรณ์ของพวกเขา นอกจากนี้คุณยังสามารถสแกนรหัสบนโทรศัพท์ของพวกเขาได้ด้วย <a href=\"https://signal.org/redirect/safety-numbers\">เรียนรู้เพิ่มเติม</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">แตะเพื่อสแกน</string>
     <string name="verify_display_fragment__successful_match">จับคู่สำเร็จ</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">การตรวจยืนยันหมายเลขความปลอดภัยล้มเหลว</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">ทำเครื่องหมายว่าตรวจยืนยันแล้ว</string>
     <string name="verify_display_fragment__clear_verification">ล้างการตรวจยืนยัน</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-tl/strings.xml b/app/src/main/res/values-tl/strings.xml
index 24487ba898..dd4e7aa6bb 100644
--- a/app/src/main/res/values-tl/strings.xml
+++ b/app/src/main/res/values-tl/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Para i-verify ang security ng iyong end-to-end encryption kay %1$s, i-compare ang numbers sa taas with their device. Pwede mo ring i-scan ang code sa kanyang phone. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Pindutin para mag-scan</string>
     <string name="verify_display_fragment__successful_match">Successful match</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Failed to verify safety number</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Mark as verified</string>
     <string name="verify_display_fragment__clear_verification">Clear verification</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 56a990c7e2..72e0f1fbc4 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ %1$s ile uçtan uca şifrelemenizin güvenliğini doğrulamak için, yukarıdaki numaraları onların aygıtındakilerle karşılaştırın. Kodu onların telefonunda da tarayabilirsiniz. <a href=\"https://signal.org/redirect/safety-numbers\">Daha fazlasını öğrenin.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Taramak için dokunun</string>
     <string name="verify_display_fragment__successful_match">Doğru eşleşme</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Güvenlik numarası doğrulanamadı</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">Doğrulanmış olarak işaretle</string>
     <string name="verify_display_fragment__clear_verification">Doğrulamayı temizle</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index ed0176d85a..db427b488b 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%1$s بىلەن ئاراڭلاردىكى تېرمىنالدىن تېرمىنالغىچە بولغان مەخپىيلەشتۈرۈشنىڭ بىخەتەرلىكىنى دەلىللەش ئۈچۈن يۇقىرىدىكى نومۇرلارنى ئۇلارنىڭ ئۈسكۈنىسىدىكى نومۇر بىلەن سېلىشتۇرۇپ بېقىڭ. ئۇلارنىڭ تېلېفونىدىكى كودنى سىكاننېرلىسىڭىزمۇ بولىدۇ. <a href=\"https://signal.org/redirect/safety-numbers\">تەپسىلاتى.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">چېكىلسە تارايدۇ</string>
     <string name="verify_display_fragment__successful_match">ئوڭۇشلۇق ماسلاشتى</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">بىخەتەرلىك نومۇرىنى دەلىللىيەلمىدى</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">دەلىللەندى بەلگىسى سال</string>
     <string name="verify_display_fragment__clear_verification">دەلىللەشنى تازىلا</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index ab225de553..d38a4c76da 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -2280,6 +2280,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2870,7 +2872,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[Щоб перевірити безпеку вашого наскрізного шифрування з %1$s, порівняйте наведені вище числа з їхнім пристроєм. Ви також можете відсканувати код на їхньому телефоні. <a href=\"https://signal.org/redirect/safety-numbers\">Докладніше.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Натисніть, щоб сканувати</string>
     <string name="verify_display_fragment__successful_match">Збіг вдалий</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Не вдалось підтвердити код безпеки</string>
@@ -2878,7 +2881,7 @@
     <string name="verify_display_fragment__mark_as_verified">Позначити перевіреним</string>
     <string name="verify_display_fragment__clear_verification">Чітка верифікація</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 76433afa67..dda796a58b 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -2146,6 +2146,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2710,7 +2712,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[%1$sکے ساتھ آپ کی شروع سے آخر تک کی مرموز کاری کی سکیورٹی کی تصدیق کے لیے، ان کی ڈیوائس سے اوپر کے نمبرز کا موازنہ کریں۔ آپ ان کے فون پر کوڈ بھی اسکین کر سکتے ہیں۔ <a href=\"https://signal.org/redirect/safety-numbers\">مزید جانیں۔</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">اسکین کرنے کے لیے کلک کریں</string>
     <string name="verify_display_fragment__successful_match">کامیاب میچ</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">حفاظتی نمبر کی تصدیق میں ناکام ہو گئے</string>
@@ -2718,7 +2721,7 @@
     <string name="verify_display_fragment__mark_as_verified">تصدیق کے طور پر نشان لگائیں</string>
     <string name="verify_display_fragment__clear_verification">تصدیق ہٹائیں</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 9773f19549..aaef9ff6ed 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ Để xác mình bảo mật thiết bị đầu cuối của bạn với %1$s, hãy so sánh dảy số này với số hiện trên thiết bị của họ. Hoặc bạn có thể quét mã QR trên thiết bị của họ. <a href=\"https://signal.org/redirect/safety-numbers\"> Tìm hiểu thêm.</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">Nhấn để quét</string>
     <string name="verify_display_fragment__successful_match">Kết nối thành công</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">Xác thực số an toàn thất bại</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">Đánh dấu đã xác minh</string>
     <string name="verify_display_fragment__clear_verification">Xóa xác nhận</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-yue/strings.xml b/app/src/main/res/values-yue/strings.xml
index 0df5598d7b..09d9bc5044 100644
--- a/app/src/main/res/values-yue/strings.xml
+++ b/app/src/main/res/values-yue/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[若要驗證您同 %1$s 之間嘅點對點加密係咪安全，請將上面嘅數字同佢部機做比較。或者掃佢部機上面嘅二維碼亦都得。<a href=\"https://signal.org/redirect/safety-numbers\">想知多啲？</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">撳一下去掃描</string>
     <string name="verify_display_fragment__successful_match">完全啱晒</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">驗證安全碼失敗</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">剔低話驗證咗</string>
     <string name="verify_display_fragment__clear_verification">抹走先前個驗證</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index a8bc989020..58f92ccaa0 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[如要验证您与%1$s的端对端加密安全性，请将上方的数字与对方的设备比对。您还可以扫描对方手机上的二维码。<a href=\"https://signal.org/redirect/safety-numbers\">了解详情。</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">点击扫描</string>
     <string name="verify_display_fragment__successful_match">成功匹配</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">验证安全码失败</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">标记为已验证</string>
     <string name="verify_display_fragment__clear_verification">清除验证</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index ceadc963ea..bd384a0182 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[若要驗證您與 %1$s 之間端對端加密的安全性，請比對上方數字與對方裝置上的數字是否一樣。您亦可掃描對方裝置上的二維碼。<a href=\"https://signal.org/redirect/safety-numbers\">了解更多。</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">輕觸以掃描</string>
     <string name="verify_display_fragment__successful_match">比對成功</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">驗證安全碼失敗</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">標記為已驗證</string>
     <string name="verify_display_fragment__clear_verification">清除驗證</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index e156ec8450..f015e7cdc6 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -2079,6 +2079,8 @@
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_ok">OK</string>
     <!-- Learn more option for dialog explaining to user they must exchange messages first to create a safety number  -->
     <string name="VerifyIdentityActivity_dialog_exchange_messages_to_create_safety_number_learn_more">Learn more</string>
+    <!-- Confirmation button on scan result dialogs -->
+    <string name="VerifyDisplayFragment__scan_result_dialog_ok">OK</string>
 
     <!-- ViewOnceMessageActivity -->
   <!-- Removed by excludeNonTranslatables <string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string> -->
@@ -2630,7 +2632,8 @@
 
     <!-- verify_display_fragment -->
     <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s"><![CDATA[ 要與%1$s 驗證點對點加密的安全性，請將上面的數字與其裝置進行比對。你也可以掃描他們手機上的代碼。<a href=\"https://signal.org/redirect/safety-numbers\">了解更多。</a>]]></string>
-    <string name="verify_display_fragment__to_verify_the_security_of_your_end_to_end_encryption_with_s_pnp"><![CDATA[To verify end-to-end encryption with %1$s, compare the numbers above with their device. match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <!-- Explanation of how to verify the safety numbers. %s is replaced with the name of the other recipient -->
+    <string name="verify_display_fragment__pnp_verify_safety_numbers_explanation_with_s">To verify end-to-end encryption with %1$s, match the color card above with their device and compare the numbers. If these don’t match, swipe and try the other pair of safety numbers. Only one pair needs to match.</string>
     <string name="verify_display_fragment__tap_to_scan">點擊掃描</string>
     <string name="verify_display_fragment__successful_match">成功匹配</string>
     <string name="verify_display_fragment__failed_to_verify_safety_number">驗證安全碼失敗</string>
@@ -2638,7 +2641,7 @@
     <string name="verify_display_fragment__mark_as_verified">標記為已驗證</string>
     <string name="verify_display_fragment__clear_verification">清除驗證碼</string>
     <!-- Banner at top of safety numbers screen explaining that we\'re updating how safety numbers work. -->
-    <string name="verify_display_fragment__safety_numbers_are_updating_banner"><![CDATA[Safety numbers are being updated. <a href=\"https://signal.org/redirect/safety-numbers\">Learn more.</a>]]></string>
+    <string name="verify_display_fragment__safety_numbers_are_updating_banner_no_learn_more">Safety numbers are being updated.</string>
 
     <!-- Title for dialog explaining for how safety numbers are transitioning to support usernames -->
     <string name="PnpSafetyNumberEducationDialog__title">Changes to safety numbers</string>
diff --git a/app/static-ips.gradle b/app/static-ips.gradle
index dc2744882f..02c7d69b9c 100644
--- a/app/static-ips.gradle
+++ b/app/static-ips.gradle
@@ -1,5 +1,5 @@
 ext.service_ips='new String[]{"13.248.212.111","76.223.92.165"}'
-ext.storage_ips='new String[]{"142.251.40.115"}'
+ext.storage_ips='new String[]{"142.251.35.179"}'
 ext.cdn_ips='new String[]{"108.138.106.119","108.138.106.68","108.138.106.76","108.138.106.8"}'
 ext.cdn2_ips='new String[]{"104.18.2.43","104.18.3.43"}'
 ext.kbs_ips='new String[]{"20.85.156.233"}'