Sulkta-OSS/element-x-ada
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop' into feature/fga/room-version-upgrade

Browse source
This commit is contained in:
ganfra 2025-06-11 16:30:21 +02:00
commit 88573fd2ae
116 changed files with 1287 additions and 979 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/messages/impl/src/main/kotlin/io/element/android/features/messages/impl/actionlist/ActionListView.kt
View file

@ -30,6 +30,7 @@ import androidx.compose.material3.ListItemDefaults
import androidx.compose.material3.rememberModalBottomSheetState
import androidx.compose.material3.ripple
import androidx.compose.runtime.Composable
import androidx.compose.runtime.ReadOnlyComposable
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
@ -394,6 +395,7 @@ private fun VerifiedUserSendFailureView(
modifier: Modifier = Modifier,
) {
@Composable
@ReadOnlyComposable
fun VerifiedUserSendFailure.headline(): String {
return when (this) {
is None -> ""

4
features/messages/impl/src/main/res/values-es/translations.xml
View file

@ -9,8 +9,8 @@
<string name="emoji_picker_category_places">"Viajes y lugares"</string>
<string name="emoji_picker_category_symbols">"Símbolos"</string>
<string name="screen_report_content_block_user">"Bloquear usuario"</string>
<string name="screen_report_content_block_user_hint">"Marque si quieres ocultar todos los mensajes actuales y futuros de este usuario"</string>
<string name="screen_report_content_explanation">"Este mensaje se notificará al administrador de su homeserver. No podrán leer ningún mensaje cifrado."</string>
<string name="screen_report_content_block_user_hint">"Marca esta casilla si quieres ocultar todos los mensajes actuales y futuros de este usuario"</string>
<string name="screen_report_content_explanation">"Se denunciará este mensaje al administrador de tu servidor base. No será capaz de leer ningún mensaje cifrado."</string>
<string name="screen_report_content_hint">"Motivo para denunciar este contenido"</string>
<string name="screen_room_attachment_source_camera">"Cámara"</string>
<string name="screen_room_attachment_source_camera_photo">"Hacer foto"</string>