Merge branch 'develop' into feature/bma/dataObject

This commit is contained in:
Benoit Marty 2023-08-28 10:56:02 +02:00 committed by GitHub
commit 55255735d7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
129 changed files with 2140 additions and 487 deletions

View file

@ -7,7 +7,7 @@
<string name="notification_inline_reply_failed">"** Senden fehlgeschlagen - bitte Raum öffnen"</string>
<string name="notification_invitation_action_join">"Beitreten"</string>
<string name="notification_invitation_action_reject">"Ablehnen"</string>
<string name="notification_invite_body">"Hat dich eingeladen"</string>
<string name="notification_invite_body">"Hat dich zum Chatten eingeladen"</string>
<string name="notification_new_messages">"Neue Nachrichten"</string>
<string name="notification_reaction_body">"Reagierte mit %1$s"</string>
<string name="notification_room_action_mark_as_read">"Als gelesen markieren"</string>