matrix/element-android
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2025-07-29 19:41:14 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into feature/eric/new-layout-labs

Browse Source 
# Conflicts:
#	vector/src/main/java/im/vector/app/features/settings/VectorSettingsLabsFragment.kt
This commit is contained in:
ericdecanini
2022-09-06 15:32:00 +02:00
parent 468c7b600c b3eac52e3f
commit 31a3552e26
62 changed files with 768 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/ui-strings/src/main/res/values/strings.xml
View File

@ -454,6 +454,9 @@
<!-- Invites fragment -->
<string name="invites_title">Invites</string>
<string name="invites_empty_title">Nothing new.</string>
<string name="invites_empty_message">This is where your new requests and invites will be.</string>
<!-- People fragment -->
<string name="direct_chats_header">Conversations</string>
<string name="matrix_only_filter">Matrix contacts only</string>
@ -3259,4 +3262,15 @@
<string name="home_empty_no_unreads_title">Nothing to report.</string>
<string name="home_empty_no_unreads_message">This is where your unread messages will show up, when you have some.</string>
<string name="onboarding_new_app_layout_welcome_title">Welcome to a new view!</string>
<!-- Note to translators: for RTL languages, menu will be at the bottom left. Please translate "bottom-left" instead of "bottom-right". Thanks!-->
<string name="onboarding_new_app_layout_welcome_message">To simplify your ${app_name}, tabs are now optional. Manage them using the top-right menu.</string>
<string name="onboarding_new_app_layout_spaces_title">Access Spaces</string>
<!-- Note to translators: for RTL languages, Spaces will be at the bottom left. Please translate "bottom-left" instead of "bottom-right". Thanks!-->
<string name="onboarding_new_app_layout_spaces_message">Access your Spaces (bottom-right) faster and easier than ever before.</string>
<string name="onboarding_new_app_layout_feedback_title">Give Feedback</string>
<!-- Note to translators: for RTL languages, context menu will be at top left corner instead of top right corner. Thanks!-->
<string name="onboarding_new_app_layout_feedback_message">Tap top right to see the option to feedback.</string>
<string name="onboarding_new_app_layout_button_try">Try it out</string>
</resources>