Merge branch 'develop' into feature/bma/emojiRepresentation

features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/timeline/components/TimelineItemEventRow.kt

@@ -360,6 +360,7 @@ private fun MessageSenderInformation(
             Avatar(senderAvatar)
             Spacer(modifier = Modifier.width(4.dp))
             Text(
+                modifier = Modifier.clipToBounds(),
                 text = sender,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,

features/preferences/impl/src/main/res/values-fr/translations.xml

@@ -31,6 +31,7 @@ Si vous continuez, il est possible que certains de vos paramètres soient modifi
   <string name="screen_notification_settings_enable_notifications">"Activer les notifications sur cet appareil"</string>
   <string name="screen_notification_settings_failed_fixing_configuration">"La configuration n’a pas été corrigée, veuillez réessayer."</string>
   <string name="screen_notification_settings_group_chats">"Discussions de groupe"</string>
+  <string name="screen_notification_settings_invite_for_me_label">"Invitations"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Votre serveur d’accueil ne supporte pas cette option pour les salons chiffrés, vous pourriez ne pas être notifié(e) dans certains salons."</string>
   <string name="screen_notification_settings_mentions_section_title">"Mentions"</string>
   <string name="screen_notification_settings_mode_all">"Tous"</string>

features/preferences/impl/src/main/res/values-in/translations.xml

@@ -31,6 +31,7 @@ Jika Anda melanjutkan, beberapa pengaturan Anda dapat berubah."</string>
   <string name="screen_notification_settings_enable_notifications">"Aktifkan pemberitahuan di perangkat ini"</string>
   <string name="screen_notification_settings_failed_fixing_configuration">"Pengaturan belum diperbaiki, silakan coba lagi."</string>
   <string name="screen_notification_settings_group_chats">"Obrolan grup"</string>
+  <string name="screen_notification_settings_invite_for_me_label">"Undangan"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Homeserver Anda tidak mendukung opsi ini dalam ruangan terenkripsi, Anda mungkin tidak diberi tahu dalam beberapa ruangan."</string>
   <string name="screen_notification_settings_mentions_section_title">"Sebutan"</string>
   <string name="screen_notification_settings_mode_all">"Semua"</string>

features/preferences/impl/src/main/res/values-sk/translations.xml

@@ -31,6 +31,7 @@ Ak budete pokračovať, niektoré z vašich nastavení sa môžu zmeniť."</stri
   <string name="screen_notification_settings_enable_notifications">"Povoliť oznámenia na tomto zariadení"</string>
   <string name="screen_notification_settings_failed_fixing_configuration">"Konfigurácia nebola opravená, skúste to prosím znova."</string>
   <string name="screen_notification_settings_group_chats">"Skupinové rozhovory"</string>
+  <string name="screen_notification_settings_invite_for_me_label">"Pozvánky"</string>
   <string name="screen_notification_settings_mentions_only_disclaimer">"Váš domovský server nepodporuje túto možnosť v šifrovaných miestnostiach, v niektorých miestnostiach nemusíte dostať upozornenie."</string>
   <string name="screen_notification_settings_mentions_section_title">"Zmienky"</string>
   <string name="screen_notification_settings_mode_all">"Všetky"</string>

features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/members/details/RoomMemberHeaderSection.kt

@@ -29,13 +29,14 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
+import io.element.android.compound.theme.ElementTheme
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.designsystem.theme.components.Text
-import io.element.android.compound.theme.ElementTheme
 
 @Composable
 fun RoomMemberHeaderSection(
@@ -56,7 +57,11 @@ fun RoomMemberHeaderSection(
         }
         Spacer(modifier = Modifier.height(24.dp))
         if (userName != null) {
-            Text(text = userName, style = ElementTheme.typography.fontHeadingLgBold)
+            Text(
+                modifier = Modifier.clipToBounds(),
+                text = userName,
+                style = ElementTheme.typography.fontHeadingLgBold,
+            )
             Spacer(modifier = Modifier.height(6.dp))
         }
         Text(