diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 6b4a1b93a8..b44741e6f2 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -353,12 +353,12 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="zero">Only %1$d edits can be applied to this message.</item>
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="two">Only %1$d edits can be applied to this message.</item>
-        <item quantity="few">Only %1$d edits can be applied to this message.</item>
-        <item quantity="many">Only %1$d edits can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="zero">يمكن تطبيق %1$d تعديل فقط على هذه الرسالة.</item>
+        <item quantity="one">يمكن تطبيق %1$d تعديل فقط على هذه الرسالة.</item>
+        <item quantity="two">يمكن تطبيق %1$d تعديلين فقط على هذه الرسالة.</item>
+        <item quantity="few">يمكن تطبيق %1$d تعديلات فقط على هذه الرسالة.</item>
+        <item quantity="many">يمكن تطبيق %1$d تعديلًا فقط على هذه الرسالة.</item>
+        <item quantity="other">يمكن تطبيق %1$d تعديل فقط على هذه الرسالة.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">جهة اتصال غير صحيحة!</string>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
index d7499b0f8b..55dbf99d6e 100644
--- a/app/src/main/res/values-bn/strings.xml
+++ b/app/src/main/res/values-bn/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">এই মেসেজটি শুধুমাত্র %1$d বার এডিট করা যাবে।</item>
+        <item quantity="other">এই মেসেজটি শুধুমাত্র %1$d বার এডিট করা যাবে।</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">অকার্যকর প্রাপক!</string>
diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml
index 7f461edfaf..a807a29f8e 100644
--- a/app/src/main/res/values-ca/strings.xml
+++ b/app/src/main/res/values-ca/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Només es pot fer %1$d canvi en aquest missatge.</item>
+        <item quantity="other">Només es poden fer %1$d canvis en aquest missatge.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Destinatari no vàlid.</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index f6dcb6a9f9..f19398bb4c 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -349,10 +349,10 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="few">Only %1$d edits can be applied to this message.</item>
-        <item quantity="many">Only %1$d edits can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Na tuto zprávu lze použít pouze %1$d úpravu.</item>
+        <item quantity="few">Na tuto zprávu lze použít pouze %1$d úpravy.</item>
+        <item quantity="many">Na tuto zprávu lze použít pouze %1$d úprav.</item>
+        <item quantity="other">Na tuto zprávu lze použít pouze %1$d úprav.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Chybný příjemce!</string>
diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml
index 04777c32f1..d7b1076b9f 100644
--- a/app/src/main/res/values-da/strings.xml
+++ b/app/src/main/res/values-da/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Denne besked kan kun redigeres %1$d gang.</item>
+        <item quantity="other">Denne besked kan kun redigeres %1$d gange.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Ugyldig modtager!</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 947e90e370..6ef35f3204 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Diese Nachricht kann nur %1$d Mal bearbeitet werden.</item>
+        <item quantity="other">Diese Nachricht kann nur %1$d Male bearbeitet werden.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Ungültiger Empfänger!</string>
diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml
index f1e1b9cd73..0143bd0e7c 100644
--- a/app/src/main/res/values-el/strings.xml
+++ b/app/src/main/res/values-el/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Μόνο ο/η %1$d μπορεί να επεξεργαστεί αυτό το μήνυμα.</item>
+        <item quantity="other">Μόνο οι %1$d μπορούν να επεξεργαστούν αυτό το μήνυμα.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Μη έγκυρος/η παραλήπτης/τρια!</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 550d5aa80e..e2b48c68c9 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Solo se puede hacer %1$d cambio en este mensaje de texto.</item>
+        <item quantity="other">Solo se pueden hacer %1$d cambios en este mensaje de texto.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">¡Destinatari@ inválid@!</string>
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index f08849d0c3..846afba253 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">فقط %1$d ویرایش قابل اعمال به این پیام است.</item>
+        <item quantity="other">فقط %1$d ویرایش قابل اعمال به این پیام است.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">گیرنده نامعتبر!</string>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index ffbbfe4722..6fa8243de1 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Tähän viestiin voidaan tehdä vain %1$d muokkaus.</item>
+        <item quantity="other">Tähän viestiin voidaan tehdä vain %1$d muokkausta.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Virheellinen vastaanottaja!</string>
@@ -6061,9 +6061,9 @@
     <!-- Displayed when the user turns off their mic -->
     <string name="CallStateUpdatePopupWindow__mic_off">Mikrofoni pois päältä</string>
     <!-- Displayed when the user turns on their speakerphone -->
-    <string name="CallStateUpdatePopupWindow__speaker_on">Speaker on</string>
+    <string name="CallStateUpdatePopupWindow__speaker_on">Kaiutin käytössä</string>
     <!-- Displayed when the user turns off their speakerphone -->
-    <string name="CallStateUpdatePopupWindow__speaker_off">Speaker off</string>
+    <string name="CallStateUpdatePopupWindow__speaker_off">Kaiutin pois käytöstä</string>
 
     <!-- Accessibility label describing the capture button on the camera screen -->
     <string name="CameraControls_capture_button_accessibility_label">Ota kuva -painike</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 315a191842..71e07cdda3 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">%1$d modification peut-être appliquée à ce message.</item>
+        <item quantity="other">%1$d modifications seulement peuvent être appliquées à ce message.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Le destinataire est invalide</string>
diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml
index 977fed2ee1..21c01ccc71 100644
--- a/app/src/main/res/values-ga/strings.xml
+++ b/app/src/main/res/values-ga/strings.xml
@@ -351,11 +351,11 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="two">Only %1$d edits can be applied to this message.</item>
-        <item quantity="few">Only %1$d edits can be applied to this message.</item>
-        <item quantity="many">Only %1$d edits can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Ní féidir ach %1$d eagarthóireacht amháin a dhéanamh ar an teachtaireacht seo.</item>
+        <item quantity="two">Ní féidir ach %1$d eagarthóireacht a dhéanamh ar an teachtaireacht seo.</item>
+        <item quantity="few">Ní féidir ach %1$d eagarthóireacht a dhéanamh ar an teachtaireacht seo.</item>
+        <item quantity="many">Ní féidir ach %1$d n-eagarthóireacht a dhéanamh ar an teachtaireacht seo.</item>
+        <item quantity="other">Ní féidir ach %1$d eagarthóireacht a dhéanamh ar an teachtaireacht seo.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Faighteoir neamhbhailí!</string>
diff --git a/app/src/main/res/values-gu/strings.xml b/app/src/main/res/values-gu/strings.xml
index fe662ba3dc..448aa311d8 100644
--- a/app/src/main/res/values-gu/strings.xml
+++ b/app/src/main/res/values-gu/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">આ મેસેજ પર માત્ર %1$d ફેરફાર જ કરી શકાય છે.</item>
+        <item quantity="other">આ મેસેજ પર માત્ર %1$d ફેરફારો જ કરી શકાય છે.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">અમાન્ય પ્રાપ્તકર્તા</string>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
index 8316c7b498..c6c5733690 100644
--- a/app/src/main/res/values-hi/strings.xml
+++ b/app/src/main/res/values-hi/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">इस संदेश को केवल %1$d बार संपादित किया जा सकता है।</item>
+        <item quantity="other">इस संदेश को केवल %1$d बार संपादित किया जा सकता है।</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">अवैध प्राप्तकर्ता</string>
diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml
index ae749db95e..80e8c51489 100644
--- a/app/src/main/res/values-hr/strings.xml
+++ b/app/src/main/res/values-hr/strings.xml
@@ -349,10 +349,10 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="few">Only %1$d edits can be applied to this message.</item>
-        <item quantity="many">Only %1$d edits can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Poruku je moguće uređivati samo %1$d put.</item>
+        <item quantity="few">Poruku je moguće uređivati samo %1$d puta.</item>
+        <item quantity="many">Poruku je moguće uređivati samo %1$d puta.</item>
+        <item quantity="other">Poruku je moguće uređivati samo %1$d puta.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Nevažeći primatelj!</string>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 92018ae276..967c97c86f 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Csak %1$d szerkesztés alkalmazható erre az üzenetre.</item>
+        <item quantity="other">Csak %1$d szerkesztés alkalmazható erre az üzenetre.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Érvénytelen címzett!</string>
diff --git a/app/src/main/res/values-in/strings.xml b/app/src/main/res/values-in/strings.xml
index c2402ca1ba..e175afa21f 100644
--- a/app/src/main/res/values-in/strings.xml
+++ b/app/src/main/res/values-in/strings.xml
@@ -343,7 +343,7 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="other">Hanya %1$d editan yang bisa diterapkan pada pesan ini.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Penerima tidak valid!</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 05c74bd347..5fb64cf512 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Può essere effettuata solo %1$d modifica a questo messaggio.</item>
+        <item quantity="other">Possono essere effettuate solo %1$d modifiche a questo messaggio.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Destinatario non valido!</string>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
index 557cdf9ff1..8ca19a1792 100644
--- a/app/src/main/res/values-iw/strings.xml
+++ b/app/src/main/res/values-iw/strings.xml
@@ -349,10 +349,10 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="two">Only %1$d edits can be applied to this message.</item>
-        <item quantity="many">Only %1$d edits can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">אפשר לבצע רק עריכה %1$d בהודעה זו.</item>
+        <item quantity="two">אפשר לבצע רק %1$d עריכות בהודעה זו.</item>
+        <item quantity="many">אפשר לבצע רק %1$d עריכות בהודעה זו.</item>
+        <item quantity="other">אפשר לבצע רק %1$d עריכות בהודעה זו.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">מקבל בלתי תקף!</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index b9cecb33e1..b8349c1d0c 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -343,7 +343,7 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="other">%1$d だけがこのメッセージを編集できます。</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">無効な宛先です！</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index 339012c3c6..2a53b343c3 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -343,7 +343,7 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="other">이 메시지는 오직 %1$d 님만 수정할 수 있습니다.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">잘못된 수신자입니다!</string>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
index 0387d6ebc9..eefa7c8304 100644
--- a/app/src/main/res/values-mr/strings.xml
+++ b/app/src/main/res/values-mr/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">या संदेशाला फक्त %1$d संपादन लागू केले जाऊ शकते.</item>
+        <item quantity="other">या संदेशाला फक्त %1$d संपादने लागू केली जाऊ शकतात.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">अवैध प्राप्तकर्ता!</string>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
index 00d35b26a1..de47032e11 100644
--- a/app/src/main/res/values-ms/strings.xml
+++ b/app/src/main/res/values-ms/strings.xml
@@ -343,7 +343,7 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="other">Hanya %1$d edit boleh dibuat pada mesej ini.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Penerima tidak sah!</string>
diff --git a/app/src/main/res/values-nb/strings.xml b/app/src/main/res/values-nb/strings.xml
index b5b914d6cd..880e91d211 100644
--- a/app/src/main/res/values-nb/strings.xml
+++ b/app/src/main/res/values-nb/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Du kan kun gjøre %1$d endring i denne meldingen.</item>
+        <item quantity="other">Du kan kun gjøre %1$d endringer i denne meldingen.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Ugyldig mottaker.</string>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 8f4acdcedc..3b04178281 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Dit bericht kan slechts %1$d keer bewerkt worden.</item>
+        <item quantity="other">Dit bericht kan slechts %1$d keren bewerkt worden.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Ongeldige ontvanger!</string>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 1b765d9aa3..8fcfa35731 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -349,10 +349,10 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="few">Only %1$d edits can be applied to this message.</item>
-        <item quantity="many">Only %1$d edits can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Tę wiadomość można edytować tylko %1$d raz.</item>
+        <item quantity="few">Tę wiadomość można edytować tylko %1$d razy.</item>
+        <item quantity="many">Tę wiadomość można edytować tylko %1$d razy.</item>
+        <item quantity="other">Tę wiadomość można edytować tylko %1$d raza.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Nieprawidłowy adresat!</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index 4732bff79b..2c7704415e 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Só é possível fazer %1$d edição nesta mensagem.</item>
+        <item quantity="other">Só é possível fazer %1$d edições nesta mensagem.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Destinatário inválido!</string>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index e318395e24..161ffc77eb 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Só %1$d edição pode ser aplicada a esta mensagem.</item>
+        <item quantity="other">Só %1$d edições podem ser aplicadas a esta mensagem.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Destinatário inválido!</string>
diff --git a/app/src/main/res/values-ro/strings.xml b/app/src/main/res/values-ro/strings.xml
index f9e45a7f8c..02e0863594 100644
--- a/app/src/main/res/values-ro/strings.xml
+++ b/app/src/main/res/values-ro/strings.xml
@@ -347,9 +347,9 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="few">Only %1$d edits can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Numai %1$d modificare poate fi aplicată acestui mesaj.</item>
+        <item quantity="few">Numai %1$d modificări pot fi aplicate acestui mesaj.</item>
+        <item quantity="other">Numai %1$d de modificări pot fi aplicate acestui mesaj.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Destinatar invalid!</string>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index b4420a623a..90f777be01 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -349,10 +349,10 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="few">Only %1$d edits can be applied to this message.</item>
-        <item quantity="many">Only %1$d edits can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Только %1$d изменение может быть внесено в это сообщение.</item>
+        <item quantity="few">Только %1$d изменения могут быть внесены в это сообщение.</item>
+        <item quantity="many">Только %1$d изменений могут быть внесены в это сообщение.</item>
+        <item quantity="other">Только %1$d изменения могут быть внесены в это сообщение.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Неверный получатель!</string>
diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml
index ee5a745db6..2e003bf560 100644
--- a/app/src/main/res/values-sk/strings.xml
+++ b/app/src/main/res/values-sk/strings.xml
@@ -349,10 +349,10 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="few">Only %1$d edits can be applied to this message.</item>
-        <item quantity="many">Only %1$d edits can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Na túto správu je možné použiť iba %1$d úpravu.</item>
+        <item quantity="few">Na túto správu je možné použiť iba %1$d úpravy.</item>
+        <item quantity="many">Na túto správu je možné použiť iba %1$d úprav.</item>
+        <item quantity="other">Na túto správu je možné použiť iba %1$d úprav.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Neplatný príjemca</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
index 8969bd4806..1d6f2b067f 100644
--- a/app/src/main/res/values-sr/strings.xml
+++ b/app/src/main/res/values-sr/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Број измена које се могу унети у ову поруку: %1$d.</item>
+        <item quantity="other">Број измена које се могу унети у ову поруку: %1$d.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Неисправан прималац!</string>
@@ -6061,9 +6061,9 @@
     <!-- Displayed when the user turns off their mic -->
     <string name="CallStateUpdatePopupWindow__mic_off">Микрофон је искључен</string>
     <!-- Displayed when the user turns on their speakerphone -->
-    <string name="CallStateUpdatePopupWindow__speaker_on">Speaker on</string>
+    <string name="CallStateUpdatePopupWindow__speaker_on">Звучник је укључен</string>
     <!-- Displayed when the user turns off their speakerphone -->
-    <string name="CallStateUpdatePopupWindow__speaker_off">Speaker off</string>
+    <string name="CallStateUpdatePopupWindow__speaker_off">Звучник је искључен</string>
 
     <!-- Accessibility label describing the capture button on the camera screen -->
     <string name="CameraControls_capture_button_accessibility_label">Дугме за фотографисање</string>
diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml
index 116a902f3e..11ba9055d9 100644
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Endast %1$d redigering kan tillämpas på det här meddelandet.</item>
+        <item quantity="other">Endast %1$d redigeringar kan tillämpas på det här meddelandet.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Ogiltig mottagare!</string>
diff --git a/app/src/main/res/values-th/strings.xml b/app/src/main/res/values-th/strings.xml
index 39c4165383..7d24b91efe 100644
--- a/app/src/main/res/values-th/strings.xml
+++ b/app/src/main/res/values-th/strings.xml
@@ -343,7 +343,7 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="other">สามารถแก้ไขข้อความนี้ได้ %1$d ครั้งเท่านั้น</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">ผู้รับไม่ถูกต้อง</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 6783513877..c1bbaa46cf 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Bu mesaja yalnızca %1$d düzenleme uygulanabilir.</item>
+        <item quantity="other">Bu mesaja yalnızca %1$d düzenleme uygulanabilir.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Geçersiz alıcı!</string>
diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml
index 6ce5363ffe..497f9e905e 100644
--- a/app/src/main/res/values-ug/strings.xml
+++ b/app/src/main/res/values-ug/strings.xml
@@ -343,7 +343,7 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="other">بۇ ئۇچۇرغا پەقەت %1$d تەھرىرلەشنى قوللانغىلى بولىدۇ.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">ئىناۋەتسىز تاپشۇرۇۋالغۇچى!</string>
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index cbe832213b..48ed9d6981 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -349,10 +349,10 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="few">Only %1$d edits can be applied to this message.</item>
-        <item quantity="many">Only %1$d edits can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">Це повідомлення можна змінити тільки %1$d раз.</item>
+        <item quantity="few">Це повідомлення можна змінити тільки %1$d рази.</item>
+        <item quantity="many">Це повідомлення можна змінити тільки %1$d разів.</item>
+        <item quantity="other">Це повідомлення можна змінити тільки %1$d разу.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Неприпустимий отримувач!</string>
diff --git a/app/src/main/res/values-ur/strings.xml b/app/src/main/res/values-ur/strings.xml
index 4c38aa0371..01d59c358d 100644
--- a/app/src/main/res/values-ur/strings.xml
+++ b/app/src/main/res/values-ur/strings.xml
@@ -345,8 +345,8 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="one">Only %1$d edit can be applied to this message.</item>
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="one">اس میسج پر صرف %1$d ترمیم کا اطلاق کیا جا سکتا ہے۔</item>
+        <item quantity="other">اس میسج پر صرف %1$d ترامیم کا اطلاق کیا جا سکتا ہے۔</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">غلط وصول کنندo</string>
@@ -6061,9 +6061,9 @@
     <!-- Displayed when the user turns off their mic -->
     <string name="CallStateUpdatePopupWindow__mic_off">مائیک آف</string>
     <!-- Displayed when the user turns on their speakerphone -->
-    <string name="CallStateUpdatePopupWindow__speaker_on">Speaker on</string>
+    <string name="CallStateUpdatePopupWindow__speaker_on">اسپیکر آن ہے</string>
     <!-- Displayed when the user turns off their speakerphone -->
-    <string name="CallStateUpdatePopupWindow__speaker_off">Speaker off</string>
+    <string name="CallStateUpdatePopupWindow__speaker_off">اسپیکر آف ہے</string>
 
     <!-- Accessibility label describing the capture button on the camera screen -->
     <string name="CameraControls_capture_button_accessibility_label">کیپچر بٹن</string>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
index 48ffb2bba9..851ac7fdc0 100644
--- a/app/src/main/res/values-vi/strings.xml
+++ b/app/src/main/res/values-vi/strings.xml
@@ -343,7 +343,7 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="other">Chỉ %1$d chỉnh sửa có thể được áp dụng cho tin nhắn này.</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">Người nhận không hợp lệ!</string>
diff --git a/app/src/main/res/values-yue/strings.xml b/app/src/main/res/values-yue/strings.xml
index 4c476b5326..d91e382f46 100644
--- a/app/src/main/res/values-yue/strings.xml
+++ b/app/src/main/res/values-yue/strings.xml
@@ -343,7 +343,7 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="other">呢個訊息只可以套用 %1$d 次編輯。</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">收件人唔啱噃！</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 5f39e16a95..7c9ef9f395 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -343,7 +343,7 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="other">此消息只能应用 %1$d 次编辑。</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">无效收件人！</string>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
index 255e2c9302..731bfdcb91 100644
--- a/app/src/main/res/values-zh-rHK/strings.xml
+++ b/app/src/main/res/values-zh-rHK/strings.xml
@@ -343,7 +343,7 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="other">只有 %1$d 項編輯能套用到此訊息。</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">收件人無效！</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c19f1ad988..f6d81a5804 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -343,7 +343,7 @@
     </plurals>
     <!-- Warning dialog text shown to user if they try to edit a message too many times. Where %1$d is replaced with the number of edits -->
     <plurals name="ConversationActivity_edit_message_too_many_edits">
-        <item quantity="other">Only %1$d edits can be applied to this message.</item>
+        <item quantity="other">只有 %1$d 項編輯能套用到此訊息。</item>
     </plurals>
 
     <string name="ConversationActivity_invalid_recipient">無效的收件人！</string>
diff --git a/app/static-ips.gradle b/app/static-ips.gradle
index 8f4d2db854..2203cfc655 100644
--- a/app/static-ips.gradle
+++ b/app/static-ips.gradle
@@ -1,9 +1,9 @@
 ext.service_ips='new String[]{"13.248.212.111","76.223.92.165"}'
-ext.storage_ips='new String[]{"142.251.40.243"}'
-ext.cdn_ips='new String[]{"13.225.63.108","13.225.63.118","13.225.63.53","13.225.63.63"}'
+ext.storage_ips='new String[]{"142.251.40.115"}'
+ext.cdn_ips='new String[]{"18.160.18.106","18.160.18.114","18.160.18.42","18.160.18.45"}'
 ext.cdn2_ips='new String[]{"104.18.2.43","104.18.3.43"}'
 ext.kbs_ips='new String[]{"20.85.156.233"}'
-ext.sfu_ips='new String[]{"35.244.193.211"}'
+ext.sfu_ips='new String[]{"34.160.76.231"}'
 ext.content_proxy_ips='new String[]{"107.178.250.75"}'
-ext.svr2_ips='new String[]{"20.119.62.85"}'
+ext.svr2_ips='new String[]{"20.104.52.125"}'
 ext.cdsi_ips='new String[]{"40.122.45.194"}'
\ No newline at end of file