diff --git a/_locales/ar/messages.json b/_locales/ar/messages.json
index cbe2000ae3..02927955d6 100644
--- a/_locales/ar/messages.json
+++ b/_locales/ar/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/bg/messages.json b/_locales/bg/messages.json
index 57bb7d091b..60660a450d 100644
--- a/_locales/bg/messages.json
+++ b/_locales/bg/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/cs/messages.json b/_locales/cs/messages.json
index 7333371e88..50f15ccafb 100644
--- a/_locales/cs/messages.json
+++ b/_locales/cs/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/da/messages.json b/_locales/da/messages.json
index 8630eaa488..0c5e632daf 100644
--- a/_locales/da/messages.json
+++ b/_locales/da/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/el/messages.json b/_locales/el/messages.json
index 3e127f52fa..3742a3f9e6 100644
--- a/_locales/el/messages.json
+++ b/_locales/el/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/es/messages.json b/_locales/es/messages.json
index 7d6b77875e..69f154a967 100644
--- a/_locales/es/messages.json
+++ b/_locales/es/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/es_419/messages.json b/_locales/es_419/messages.json
index cdfdad83ac..84530dc55e 100644
--- a/_locales/es_419/messages.json
+++ b/_locales/es_419/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/fa/messages.json b/_locales/fa/messages.json
index 3c4c2220f1..725174603b 100644
--- a/_locales/fa/messages.json
+++ b/_locales/fa/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json
index d545f704bb..14446691c7 100644
--- a/_locales/fr/messages.json
+++ b/_locales/fr/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/he/messages.json b/_locales/he/messages.json
index e8c0484cc3..5b40867c41 100644
--- a/_locales/he/messages.json
+++ b/_locales/he/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/hi/messages.json b/_locales/hi/messages.json
index b4bae9fa88..45cc4e9acc 100644
--- a/_locales/hi/messages.json
+++ b/_locales/hi/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/hr/messages.json b/_locales/hr/messages.json
index 18c9dde62e..9139003000 100644
--- a/_locales/hr/messages.json
+++ b/_locales/hr/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/hu/messages.json b/_locales/hu/messages.json
index 3a8272f8f5..be6f1540e4 100644
--- a/_locales/hu/messages.json
+++ b/_locales/hu/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/id/messages.json b/_locales/id/messages.json
index 7171c21699..bfb8710b98 100644
--- a/_locales/id/messages.json
+++ b/_locales/id/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/it/messages.json b/_locales/it/messages.json
index 9ae30af525..613f4f2005 100644
--- a/_locales/it/messages.json
+++ b/_locales/it/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "I tuoi numeri sicuri con $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json
index 3fa66de085..19f74bfc5d 100644
--- a/_locales/ja/messages.json
+++ b/_locales/ja/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "$name$に対する安全番号",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/kn/messages.json b/_locales/kn/messages.json
index 59bba22496..b380d06a88 100644
--- a/_locales/kn/messages.json
+++ b/_locales/kn/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json
index fb0feb0713..a89f7f645a 100644
--- a/_locales/ko/messages.json
+++ b/_locales/ko/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/lt/messages.json b/_locales/lt/messages.json
index 20b2c07a4c..5769afb74d 100644
--- a/_locales/lt/messages.json
+++ b/_locales/lt/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/mk/messages.json b/_locales/mk/messages.json
index 2a2900f75b..bb17b44612 100644
--- a/_locales/mk/messages.json
+++ b/_locales/mk/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json
index fe941c199c..9ba82c9225 100644
--- a/_locales/nl/messages.json
+++ b/_locales/nl/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Je veiligheidsnummer met $name$",
+        "message": "Je veiligheidsnummers met $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/no/messages.json b/_locales/no/messages.json
index 6948cf743b..53b3144095 100644
--- a/_locales/no/messages.json
+++ b/_locales/no/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json
index 3b36742b89..ba8ac61d14 100644
--- a/_locales/pl/messages.json
+++ b/_locales/pl/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Twój numer bezpieczeństwa z $name$",
+        "message": "Twoje numery bezpieczeństwa z $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json
index db09047f12..454e05b29e 100644
--- a/_locales/pt_BR/messages.json
+++ b/_locales/pt_BR/messages.json
@@ -12,11 +12,11 @@
         "description": "Displayed for incoming unsupported attachment"
     },
     "verifySafetyNumbers": {
-        "message": "Verificar códigos de segurança",
+        "message": "Verificar números de segurança",
         "description": ""
     },
     "youChangedTheTimer": {
-        "message": "Você programou o cronômetro para $time$.",
+        "message": "Você definiu o cronômetro para $time$.",
         "description": "Message displayed when you change the message expiration timer in a conversation.",
         "placeholders": {
             "time": {
@@ -134,7 +134,7 @@
         "description": "Label for the time a message was sent"
     },
     "theyChangedTheTimer": {
-        "message": "$name$ programou o cronômetro para $time$.",
+        "message": "$name$ definiu o cronômetro para $time$.",
         "description": "Message displayed when someone else changes the message expiration timer in a conversation.",
         "placeholders": {
             "name": {
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "O seu código de segurança com $name$",
+        "message": "Os seus números de segurança com $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
@@ -436,7 +436,7 @@
         "description": ""
     },
     "keychanged": {
-        "message": "O código de segurança de $name$ mudou.",
+        "message": "O número de segurança de $name$ mudou.",
         "description": "",
         "placeholders": {
             "name": {
@@ -446,7 +446,7 @@
         }
     },
     "safetyNumbersSettingDescription": {
-        "message": "Requerer confirmação do novo código de segurança quando ele for mudado.",
+        "message": "Requerer aprovação do novo número de segurança quando ele for mudado.",
         "description": "Description for safety numbers setting"
     },
     "to": {
@@ -498,7 +498,7 @@
         "description": ""
     },
     "timerSetTo": {
-        "message": "Cronômetro programado para  $time$",
+        "message": "Cronômetro definido para  $time$",
         "description": "Displayed in the conversation list when the timer is updated.",
         "placeholders": {
             "time": {
diff --git a/_locales/pt_PT/messages.json b/_locales/pt_PT/messages.json
index dde6115614..f2c3aff139 100644
--- a/_locales/pt_PT/messages.json
+++ b/_locales/pt_PT/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/ro/messages.json b/_locales/ro/messages.json
index 8cd2d857d2..efb3a54b18 100644
--- a/_locales/ro/messages.json
+++ b/_locales/ro/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Numărul tău de siguranță cu $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json
index cafc3ee4c7..96560b0fd5 100644
--- a/_locales/ru/messages.json
+++ b/_locales/ru/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/sk/messages.json b/_locales/sk/messages.json
index b4bae9fa88..45cc4e9acc 100644
--- a/_locales/sk/messages.json
+++ b/_locales/sk/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/sl/messages.json b/_locales/sl/messages.json
index 24cca2d8a8..61584f5566 100644
--- a/_locales/sl/messages.json
+++ b/_locales/sl/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Vaša varnostna števila za $name$",
+        "message": "Vaša varnostna števila pri uporabniku $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/sr/messages.json b/_locales/sr/messages.json
index bd9ca0319c..59a436f198 100644
--- a/_locales/sr/messages.json
+++ b/_locales/sr/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/sv/messages.json b/_locales/sv/messages.json
index a96efdd192..6dd31e684a 100644
--- a/_locales/sv/messages.json
+++ b/_locales/sv/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/tr/messages.json b/_locales/tr/messages.json
index 181e389570..63d3dad36d 100644
--- a/_locales/tr/messages.json
+++ b/_locales/tr/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/uk/messages.json b/_locales/uk/messages.json
index 11c5c31881..e744b215cc 100644
--- a/_locales/uk/messages.json
+++ b/_locales/uk/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/vi/messages.json b/_locales/vi/messages.json
index e7c6356beb..9988935344 100644
--- a/_locales/vi/messages.json
+++ b/_locales/vi/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json
index b4bae9fa88..45cc4e9acc 100644
--- a/_locales/zh_CN/messages.json
+++ b/_locales/zh_CN/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {
diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json
index b4bae9fa88..45cc4e9acc 100644
--- a/_locales/zh_TW/messages.json
+++ b/_locales/zh_TW/messages.json
@@ -256,7 +256,7 @@
         "description": "Label text for button to upgrade the app to the latest version"
     },
     "yourSafetyNumberWith": {
-        "message": "Your safety number with $name$",
+        "message": "Your safety numbers with $name$",
         "description": "Heading for safety number view",
         "placeholders": {
             "name": {