ehealthsolutions/element-x-android
3
0
Fork 0
mirror of https://github.com/Novaloop-AG/element-x-android.git synced 2026-11-02 12:07:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into mxandreas/disable-public-rooms

Browse Source 
# Conflicts:
#	enterprise
This commit is contained in:
mxandreas
2026-10-09 09:58:27 +03:00
parent 118b5448ac 6cb8a85539
commit 13a5c5ce1d
580 changed files with 7016 additions and 2776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
features/createroom/impl/build.gradle.kts
-2
View File
@@ -34,7 +34,6 @@ dependencies {
implementation(projects.libraries.designsystem)
implementation(projects.libraries.uiStrings)
implementation(projects.libraries.androidutils)
implementation(projects.libraries.deeplink.api)
implementation(projects.libraries.mediapickers.api)
implementation(projects.libraries.mediaupload.api)
implementation(projects.libraries.permissions.api)
@@ -52,7 +51,6 @@ dependencies {
testImplementation(projects.libraries.mediapickers.test)
testImplementation(projects.libraries.mediaupload.test)
testImplementation(projects.libraries.permissions.test)
testImplementation(projects.features.startchat.test)
testImplementation(projects.libraries.featureflag.test)
testImplementation(projects.features.enterprise.test)
}
features/createroom/impl/src/main/res/values-zh/translations.xml
+2 -2
View File
@@ -8,7 +8,7 @@
<string name="screen_create_room_new_room_title">"新房间"</string>
<string name="screen_create_room_new_space_title">"新空间"</string>
<string name="screen_create_room_private_option_description">"仅限受邀人员加入。"</string>
<string name="screen_create_room_private_option_title">"私密"</string>
<string name="screen_create_room_private_option_title">"私有"</string>
<string name="screen_create_room_public_option_description">"任何人都能找到此房间。
你可以随时在房间设置中更改。"</string>
<string name="screen_create_room_public_option_short_description">"任何人都可以加入，包括你的组织之外的人员。"</string>
@@ -18,7 +18,7 @@
<string name="screen_create_room_room_access_section_knocking_restricted_option_description">"%1$s 中的任何人都可以加入，但其他人必须申请访问。"</string>
<string name="screen_create_room_room_access_section_knocking_restricted_option_title">"申请加入"</string>
<string name="screen_create_room_room_access_section_private_option_description">"仅限受邀人员加入。"</string>
<string name="screen_create_room_room_access_section_private_option_title">"私密"</string>
<string name="screen_create_room_room_access_section_private_option_title">"私有"</string>
<string name="screen_create_room_room_access_section_public_option_description">"任何人都可以加入，包括你的组织之外的人员。"</string>
<string name="screen_create_room_room_access_section_public_option_title">"公共"</string>
<string name="screen_create_room_room_access_section_restricted_option_description">"%1$s 中的任何人都可以加入。"</string>