Merge pull request #7757 from element-hq/feature/bma/removeMessageUpdate

Update remove message confirmation dialog.

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/MessagesView.kt

@@ -460,8 +460,7 @@ fun MessagesView(
     if (state.redactEventAction is MessagesState.ConfirmingRedaction) {
         TextFieldDialog(
             title = stringResource(R.string.screen_room_confirm_removal_title),
-            content = stringResource(R.string.screen_room_confirm_removal_message),
-            placeholder = stringResource(R.string.screen_room_confirm_removal_reason_placeholder_android),
+            placeholder = stringResource(R.string.screen_room_confirm_removal_reason_placeholder),
             supportingText = stringResource(R.string.screen_room_confirm_removal_reason_supporting_text),
             value = null,
             submitText = stringResource(CommonStrings.action_remove),

features/messages/impl/src/main/res/values-de/translations.xml

@@ -47,10 +47,8 @@
   <string name="screen_room_attachment_source_location">"Standort teilen"</string>
   <string name="screen_room_attachment_source_poll">"Umfrage"</string>
   <string name="screen_room_attachment_text_formatting">"Textformatierung"</string>
-  <string name="screen_room_confirm_removal_message">"Möchtest du diese Nachricht wirklich entfernen?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Grund (optional)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Eingeben …"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Grund …"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Optional)"</string>
   <string name="screen_room_confirm_removal_title">"Entfernen bestätigen"</string>
   <string name="screen_room_encrypted_history_banner">"Der Nachrichtenverlauf ist derzeit nicht verfügbar."</string>

features/messages/impl/src/main/res/values-fi/translations.xml

@@ -47,10 +47,8 @@
   <string name="screen_room_attachment_source_location">"Jaa sijainti"</string>
   <string name="screen_room_attachment_source_poll">"Kysely"</string>
   <string name="screen_room_attachment_text_formatting">"Tekstin muotoilu"</string>
-  <string name="screen_room_confirm_removal_message">"Oletko varma, että haluat poistaa tämän viestin?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Syy (valinnainen)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Kirjoita…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Syy…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Valinnainen)"</string>
   <string name="screen_room_confirm_removal_title">"Vahvista poistaminen"</string>
   <string name="screen_room_encrypted_history_banner">"Viestihistoria ei ole tällä hetkellä saatavilla"</string>

features/messages/impl/src/main/res/values-hr/translations.xml

@@ -47,10 +47,8 @@
   <string name="screen_room_attachment_source_location">"Dijeli lokaciju"</string>
   <string name="screen_room_attachment_source_poll">"Anketa"</string>
   <string name="screen_room_attachment_text_formatting">"Oblikovanje teksta"</string>
-  <string name="screen_room_confirm_removal_message">"Jeste li sigurni da želite ukloniti ovu poruku?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Razlog (neobavezno)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Unesite…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Razlog"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Neobavezno)"</string>
   <string name="screen_room_confirm_removal_title">"Potvrdite uklanjanje"</string>
   <string name="screen_room_encrypted_history_banner">"Povijest poruka trenutačno nije dostupna."</string>

features/messages/impl/src/main/res/values-hu/translations.xml

@@ -47,10 +47,8 @@
   <string name="screen_room_attachment_source_location">"Hely megosztása"</string>
   <string name="screen_room_attachment_source_poll">"Szavazás"</string>
   <string name="screen_room_attachment_text_formatting">"Szövegformázás"</string>
-  <string name="screen_room_confirm_removal_message">"Biztosan eltávolítja ezt az üzenetet?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Ok (nem kötelező)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Írja be…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Ok…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Választható)"</string>
   <string name="screen_room_confirm_removal_title">"Eltávolítás megerősítése"</string>
   <string name="screen_room_encrypted_history_banner">"Az üzenetelőzmények jelenleg nem érhetők el."</string>

features/messages/impl/src/main/res/values-ja/translations.xml

@@ -46,10 +46,8 @@
   <string name="screen_room_attachment_source_location">"場所を共有"</string>
   <string name="screen_room_attachment_source_poll">"投票"</string>
   <string name="screen_room_attachment_text_formatting">"書式設定"</string>
-  <string name="screen_room_confirm_removal_message">"このメッセージを削除しますか？"</string>
   <string name="screen_room_confirm_removal_reason_label">"理由 (任意)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"入力…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"理由…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(任意)"</string>
   <string name="screen_room_confirm_removal_title">"削除の確認"</string>
   <string name="screen_room_encrypted_history_banner">"過去のメッセージを現在表示できません。"</string>

features/messages/impl/src/main/res/values-pl/translations.xml

@@ -48,10 +48,8 @@
   <string name="screen_room_attachment_source_location">"Udostępnij lokalizację"</string>
   <string name="screen_room_attachment_source_poll">"Ankieta"</string>
   <string name="screen_room_attachment_text_formatting">"Formatowanie tekstu"</string>
-  <string name="screen_room_confirm_removal_message">"Czy na pewno chcesz usunąć wiadomość?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Powód (opcjonalne)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Powód…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Powód…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Opcjonalne)"</string>
   <string name="screen_room_confirm_removal_title">"Potwierdź usunięcie"</string>
   <string name="screen_room_encrypted_history_banner">"Historia wiadomości jest obecnie niedostępna."</string>

features/messages/impl/src/main/res/values-ru/translations.xml

@@ -48,10 +48,8 @@
   <string name="screen_room_attachment_source_location">"Поделиться местоположением"</string>
   <string name="screen_room_attachment_source_poll">"Опрос"</string>
   <string name="screen_room_attachment_text_formatting">"Форматирование текста"</string>
-  <string name="screen_room_confirm_removal_message">"Вы уверены, что хотите удалить это сообщение?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Причина (необязательно)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Введите…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Причина…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Необязательно)"</string>
   <string name="screen_room_confirm_removal_title">"Подтвердите удаление"</string>
   <string name="screen_room_encrypted_history_banner">"В настоящее время история сообщений недоступна в этой комнате."</string>

features/messages/impl/src/main/res/values-uk/translations.xml

@@ -48,10 +48,8 @@
   <string name="screen_room_attachment_source_location">"Поділитися місцеперебуванням"</string>
   <string name="screen_room_attachment_source_poll">"Опитування"</string>
   <string name="screen_room_attachment_text_formatting">"Форматування тексту"</string>
-  <string name="screen_room_confirm_removal_message">"Ви впевнені, що хочете вилучити це повідомлення?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Причина (необов\'язково)"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"Ввести…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Причина…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Необов\'язково)"</string>
   <string name="screen_room_confirm_removal_title">"Підтвердити вилучення"</string>
   <string name="screen_room_encrypted_history_banner">"Історія повідомлень наразі недоступна."</string>

features/messages/impl/src/main/res/values-zh/translations.xml

@@ -46,10 +46,8 @@
   <string name="screen_room_attachment_source_location">"共享位置"</string>
   <string name="screen_room_attachment_source_poll">"投票"</string>
   <string name="screen_room_attachment_text_formatting">"文本格式化"</string>
-  <string name="screen_room_confirm_removal_message">"确定要移除此消息？"</string>
   <string name="screen_room_confirm_removal_reason_label">"理由（可选）"</string>
   <string name="screen_room_confirm_removal_reason_placeholder">"输入…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"理由…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"（可选）"</string>
   <string name="screen_room_confirm_removal_title">"确认移除"</string>
   <string name="screen_room_encrypted_history_banner">"消息历史记录当前不可用。"</string>

features/messages/impl/src/main/res/values/localazy.xml

@@ -47,12 +47,10 @@
   <string name="screen_room_attachment_source_location">"Share location"</string>
   <string name="screen_room_attachment_source_poll">"Poll"</string>
   <string name="screen_room_attachment_text_formatting">"Text Formatting"</string>
-  <string name="screen_room_confirm_removal_message">"Are you sure you wish to remove this message?"</string>
   <string name="screen_room_confirm_removal_reason_label">"Reason (optional)"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder">"Enter…"</string>
-  <string name="screen_room_confirm_removal_reason_placeholder_android">"Reason…"</string>
+  <string name="screen_room_confirm_removal_reason_placeholder">"Enter reason…"</string>
   <string name="screen_room_confirm_removal_reason_supporting_text">"(Optional)"</string>
-  <string name="screen_room_confirm_removal_title">"Confirm removal"</string>
+  <string name="screen_room_confirm_removal_title">"Remove message?"</string>
   <string name="screen_room_encrypted_history_banner">"Message history is currently unavailable."</string>
   <string name="screen_room_encrypted_history_banner_unverified">"Message history is unavailable in this room. Verify this device to see your message history."</string>
   <string name="screen_room_invite_again_alert_message">"Would you like to invite them back?"</string>

tests/uitests/src/test/snapshots/images/features.messages.impl_MessagesView_Night_6_en.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:22ea7fe121a63b35a2c2bb47609e692f8bf2b913871a6baf3d420c04334c6c4a
-size 44344
+oid sha256:7c88b3ed8cc69dee59d4d0a726a9e383d00f2815b6525315f7dcd96f9c25ec2a
+size 45618