Merge branch 'develop' into fix

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt

@@ -208,6 +208,10 @@ class PreferencesFlowNode(
                                 navigateUp()
                             }
                         }
+
+                        override fun openIgnoredUsers() {
+                            backstack.push(NavTarget.BlockedUsers)
+                        }
                     })
                     .build()
             }

features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/tasks/ClearCacheUseCase.kt

@@ -12,7 +12,6 @@ import coil3.SingletonImageLoader
 import dev.zacsweers.metro.ContributesBinding
 import dev.zacsweers.metro.Inject
 import dev.zacsweers.metro.Provider
-import io.element.android.features.ftue.api.state.FtueService
 import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.features.preferences.impl.DefaultCacheService
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
@@ -36,7 +35,6 @@ class DefaultClearCacheUseCase(
     private val coroutineDispatchers: CoroutineDispatchers,
     private val defaultCacheService: DefaultCacheService,
     private val okHttpClient: Provider<OkHttpClient>,
-    private val ftueService: FtueService,
     private val pushService: PushService,
     private val seenInvitesStore: SeenInvitesStore,
     private val activeRoomsHolder: ActiveRoomsHolder,
@@ -56,7 +54,6 @@ class DefaultClearCacheUseCase(
         // Clear app cache
         context.cacheDir.deleteRecursively()
         // Clear some settings
-        ftueService.reset()
         seenInvitesStore.clear()
         // Ensure any error will be displayed again
         pushService.setIgnoreRegistrationError(matrixClient.sessionId, false)

features/preferences/impl/src/main/res/values-cy/translations.xml

@@ -13,6 +13,13 @@
   <string name="screen_advanced_settings_media_compression_description">"Llwythwch i fyny lluniau a fideos yn gynt a lleihau\'r defnydd o ddata"</string>
   <string name="screen_advanced_settings_media_compression_title">"Optimeiddio ansawdd y cyfryngau"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"Cymedroli a Diogelwch"</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_description">"Optimeiddio delweddau\'n awtomatig ar gyfer llwytho cyflymach a meintiau ffeiliau llai."</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_title">"Optimeiddio ansawdd llwytho delweddau"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_description">"%1$s Tapiwch yma i newid."</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_high">"Uchel (1080p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_low">"Isel (480c)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_standard">"Safonol (720p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_title">"Ansawdd lwytho fideo"</string>
   <string name="screen_advanced_settings_push_provider_android">"Darparwr hysbysiad gwthio"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"Analluogi\'r golygydd testun cyfoethog i deipio Markdown â llaw."</string>
   <string name="screen_advanced_settings_send_read_receipts">"Derbynebau darllen"</string>

features/preferences/impl/src/main/res/values-fi/translations.xml

@@ -16,6 +16,9 @@
   <string name="screen_advanced_settings_optimise_image_upload_quality_description">"Optimoi kuvat automaattisesti nopeampia lähetysnopeuksia ja pienempiä tiedostokokoja varten."</string>
   <string name="screen_advanced_settings_optimise_image_upload_quality_title">"Optimoi kuvien lähetyslaatu"</string>
   <string name="screen_advanced_settings_optimise_video_upload_quality_description">"%1$s. Napauta tästä vaihtaaksesi."</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_high">"Korkea (1080p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_low">"Matala (480p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_standard">"Normaali (720p)"</string>
   <string name="screen_advanced_settings_optimise_video_upload_quality_title">"Videon lähetyslaatu"</string>
   <string name="screen_advanced_settings_push_provider_android">"Push-ilmoitusten tarjoaja"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"Ota rikastettu tekstieditori pois käytöstä, jotta voit kirjoittaa Markdownia manuaalisesti."</string>

features/preferences/impl/src/main/res/values-zh-rTW/translations.xml

@@ -13,6 +13,13 @@
   <string name="screen_advanced_settings_media_compression_description">"上傳照片與影片更快且減少資料使用量"</string>
   <string name="screen_advanced_settings_media_compression_title">"最佳化媒體品質"</string>
   <string name="screen_advanced_settings_moderation_and_safety_section_title">"管理與安全"</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_description">"自動最佳化影像以提供更快的上傳速度與較小的檔案大小。"</string>
+  <string name="screen_advanced_settings_optimise_image_upload_quality_title">"最佳化影像上傳品質"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_description">"%1$s。輕點此處以變更。"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_high">"高 (1080p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_low">"低 (480p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_standard">"標準 (720p)"</string>
+  <string name="screen_advanced_settings_optimise_video_upload_quality_title">"視訊上傳品質"</string>
   <string name="screen_advanced_settings_push_provider_android">"推播通知提供者"</string>
   <string name="screen_advanced_settings_rich_text_editor_description">"手動輸入 Markdown，停用格式化文字編輯器。"</string>
   <string name="screen_advanced_settings_send_read_receipts">"已讀回條"</string>