Merge branch 'develop' into merge/2024-02-03

# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/SearchService.ts
#	packages/frontend/src/pages/search.note.vue
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml

sharkey-locales/en-US.yml

@@ -459,4 +459,15 @@ _genKeysDialog:
   text: "Are you sure that you want to generate new keys? This will stop push notifications for all users who have already enabled them."
   title: "Generate new keys"
 
+_noteSearch:
+  newestToOldest: "Sort by newest to oldest"
+  fileType: "File Type"
+  _fileType:
+    none: "None"
+    image: "Images"
+    video: "Videos"
+    audio: "Audio"
+    module: "Module"
+    flash: "Flash"
+
 id: "ID"