[pull] main from immich-app:main

i18n/en.json

@@ -849,6 +849,7 @@
   "delete_api_key_prompt": "Are you sure you want to delete this API key?",
   "delete_dialog_alert": "These items will be permanently deleted from Immich and from your device",
   "delete_dialog_alert_local": "These items will be permanently removed from your device but still be available on the Immich server",
+  "delete_dialog_alert_local_ios": "These items will be deleted from Photos, but will still be available on the Immich server. They will be in Recently Deleted for 30 days.",
   "delete_dialog_alert_local_non_backed_up": "Some of the items aren't backed up to Immich and will be permanently removed from your device",
   "delete_dialog_title": "Delete Permanently",
   "delete_duplicates_confirmation": "Are you sure you want to permanently delete these duplicates?",
@@ -1482,6 +1483,7 @@
   "move_to": "Move to",
   "move_to_device_trash": "Move to device trash",
   "move_to_lock_folder_action_prompt": "{count} added to the locked folder",
+  "move_to_lock_folder_partial_prompt": "{count} added to the locked folder, some local copies were kept",
   "move_to_locked_folder": "Move to locked folder",
   "move_to_locked_folder_confirmation": "These photos and video will be removed from all albums, and only viewable from the locked folder",
   "moved_to_trash": "Moved to trash",

mobile/.gitignore

@@ -32,6 +32,7 @@
 .pub/
 /build/
 lib/**/*.drift.dart
+lib/**/*.steps.dart
 lib/**/*.freezed.dart
 lib/routing/router.gr.dart
 test/drift/main/generated/

mobile/lib/domain/services/asset.service.dart

@@ -176,17 +176,17 @@ class AssetService {
     }
   }
 
-  Future<int> deleteLocal(List<String> localIds) async {
+  Future<int> deleteLocal(List<String> localIds, {bool trash = true}) async {
     if (localIds.isEmpty) {
       return 0;
     }
 
-    final deletedIds = await _mediaRepository.deleteAll(localIds);
+    final deletedIds = await _mediaRepository.deleteAll(localIds, trash: trash);
     if (deletedIds.isEmpty) {
       return 0;
     }
 
-    if (CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
+    if (trash && CurrentPlatform.isAndroid && Store.get(StoreKey.manageLocalMediaAndroid, false)) {
       await _trashedLocalRepository.applyTrashedAssets(deletedIds);
     } else {
       await _localRepository.deleteAssets(deletedIds);