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_list_filter_iteration

Browse source
This commit is contained in:
ganfra 2024-03-12 15:40:38 +01:00
commit 23b276dfcb
368 changed files with 6450 additions and 2317 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libraries/eventformatter/impl/src/main/res/values-ru/translations.xml
View file

@ -2,7 +2,7 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<string name="state_event_avatar_changed_too">"(аватар тоже был изменен)"</string>
<string name="state_event_avatar_url_changed">"%1$s сменили свой аватар"</string>
<string name="state_event_avatar_url_changed_by_you">"Вы сменили аватар"</string>
<string name="state_event_avatar_url_changed_by_you">"Вы сменили изображение"</string>
<string name="state_event_display_name_changed_from">"%1$s изменил свое отображаемое имя с %2$s на %3$s"</string>
<string name="state_event_display_name_changed_from_by_you">"Вы изменили свое отображаемое имя с %1$s на %2$s"</string>
<string name="state_event_display_name_removed">"%1$s удалил свое отображаемое имя (оно было %2$s)"</string>
@ -13,7 +13,7 @@
<string name="state_event_room_avatar_changed_by_you">"Вы изменили аватар комнаты"</string>
<string name="state_event_room_avatar_removed">"%1$s удалил аватар комнаты"</string>
<string name="state_event_room_avatar_removed_by_you">"Вы удалили аватар комнаты"</string>
<string name="state_event_room_ban">"%1$s заблокирован %2$s"</string>
<string name="state_event_room_ban">"%1$s заблокировал %2$s"</string>
<string name="state_event_room_ban_by_you">"Вы заблокировали %1$s"</string>
<string name="state_event_room_created">"%1$s создал комнату"</string>
<string name="state_event_room_created_by_you">"Вы создали комнату"</string>
@ -23,7 +23,7 @@
<string name="state_event_room_invite_by_you">"Вы пригласили %1$s"</string>
<string name="state_event_room_invite_you">"Пользователь %1$s пригласил вас"</string>
<string name="state_event_room_join">"%1$s присоединился к комнате"</string>
<string name="state_event_room_join_by_you">"Вы вошли в комнату"</string>
<string name="state_event_room_join_by_you">"Вы присоединились к комнате"</string>
<string name="state_event_room_knock">"%1$s запросил присоединение"</string>
<string name="state_event_room_knock_accepted">"%1$s разрешил %2$s присоединиться"</string>
<string name="state_event_room_knock_accepted_by_you">"%1$s разрешил вам присоединиться"</string>
@ -39,7 +39,7 @@
<string name="state_event_room_name_changed_by_you">"Вы изменили название комнаты на: %1$s"</string>
<string name="state_event_room_name_removed">"%1$s удалил название комнаты"</string>
<string name="state_event_room_name_removed_by_you">"Вы удалили название комнаты"</string>
<string name="state_event_room_none">"%1$s ничего не изменилось"</string>
<string name="state_event_room_none">"%1$s ничего не изменил"</string>
<string name="state_event_room_none_by_you">"Вы не внесли никаких изменений"</string>
<string name="state_event_room_reject">"%1$s отклонил приглашение"</string>
<string name="state_event_room_reject_by_you">"Вы отклонили приглашение"</string>
@ -53,7 +53,7 @@
<string name="state_event_room_topic_changed_by_you">"Вы изменили тему на: %1$s"</string>
<string name="state_event_room_topic_removed">"%1$s удалил тему комнаты"</string>
<string name="state_event_room_topic_removed_by_you">"Вы удалили тему комнаты"</string>
<string name="state_event_room_unban">"%1$s разблокирован %2$s"</string>
<string name="state_event_room_unban">"%1$s разблокировал %2$s"</string>
<string name="state_event_room_unban_by_you">"Вы разблокировали %1$s"</string>
<string name="state_event_room_unknown_membership_change">"%1$s внес неизвестное изменение для своих участников"</string>
</resources>

4
libraries/eventformatter/impl/src/main/res/values/localazy.xml
View file

@ -3,12 +3,16 @@
<string name="state_event_avatar_changed_too">"(avatar was changed too)"</string>
<string name="state_event_avatar_url_changed">"%1$s changed their avatar"</string>
<string name="state_event_avatar_url_changed_by_you">"You changed your avatar"</string>
<string name="state_event_demoted_to_member">"%1$s was demoted to member"</string>
<string name="state_event_demoted_to_moderator">"%1$s was demoted to moderator"</string>
<string name="state_event_display_name_changed_from">"%1$s changed their display name from %2$s to %3$s"</string>
<string name="state_event_display_name_changed_from_by_you">"You changed your display name from %1$s to %2$s"</string>
<string name="state_event_display_name_removed">"%1$s removed their display name (it was %2$s)"</string>
<string name="state_event_display_name_removed_by_you">"You removed your display name (it was %1$s)"</string>
<string name="state_event_display_name_set">"%1$s set their display name to %2$s"</string>
<string name="state_event_display_name_set_by_you">"You set your display name to %1$s"</string>
<string name="state_event_promoted_to_administrator">"%1$s was promoted to admin"</string>
<string name="state_event_promoted_to_moderator">"%1$s was promoted to moderator"</string>
<string name="state_event_room_avatar_changed">"%1$s changed the room avatar"</string>
<string name="state_event_room_avatar_changed_by_you">"You changed the room avatar"</string>
<string name="state_event_room_avatar_removed">"%1$s removed the room avatar"</string>