Merge remote-tracking branch 'origin/main' into feat/141-media-browse

# Conflicts:
#	ErsatzTV.Tests/Controllers/OpenApiErrorResponseContractTests.cs
#	web/src/App.tsx
#	web/src/screens/SettingsScreen.tsx

web/src/api/generated/v1.d.ts

@@ -14,6 +14,9 @@ export interface components {
     "songIds": null | Array<number>;
     "imageIds": null | Array<number>;
     "remoteStreamIds": null | Array<number>;
+  };
+    "AddTraktListRequest": {
+    "url": null | string;
   };
     "ArtworkContentTypeModel": {
     "path": null | string;
@@ -598,6 +601,10 @@ export interface components {
     "PagedPlayoutsResponseModel": {
     "totalCount": number;
     "page": null | Array<components["schemas"]["PlayoutListItemResponseModel"]>;
+  };
+    "PagedTraktListsResponseModel": {
+    "totalCount": number;
+    "page": Array<components["schemas"]["TraktListResponseModel"]>;
   };
     "PlaybackOrder": "None" | "Chronological" | "Random" | "Shuffle" | "ShuffleInOrder" | "MultiEpisodeShuffle" | "SeasonEpisode" | "RandomRotation" | "Marathon";
     "PlaylistViewModel": {
@@ -808,6 +815,19 @@ export interface components {
     "StartType": "Dynamic" | "Fixed";
     "StreamingMode": "TransportStream" | "HttpLiveStreamingDirect" | "HttpLiveStreamingSegmenter" | "TransportStreamHybrid";
     "TailMode": "None" | "Offline" | "Slate" | "Filler";
+    "TraktListResponseModel": {
+    "id": number;
+    "traktId": number;
+    "slug": string;
+    "name": string;
+    "itemCount": number;
+    "matchCount": number;
+    "autoRefresh": boolean;
+    "generatePlaylist": boolean;
+  };
+    "TraktStatusResponseModel": {
+    "busy": boolean;
+  };
     "TroubleshootingInfoResponseModel": {
     "generalJson": string;
     "nvidiaCapabilities": null | string;
@@ -975,6 +995,10 @@ export interface components {
     "UpdateSmartCollectionRequest": {
     "name": null | string;
     "query": null | string;
+  };
+    "UpdateTraktListRequest": {
+    "autoRefresh": boolean;
+    "generatePlaylist": boolean;
   };
     "UpdateUiSettingsRequest": {
     "isDarkMode": boolean;