Merge branch 'main' into localize_strings

Shared/ArticleStyles/ArticleThemeDownloader.swift

@@ -77,6 +77,10 @@ public class ArticleThemeDownloader: Logging {
 	private func findThemeFile(in searchPath: String) -> String? {
 		if let directoryContents = FileManager.default.enumerator(atPath: searchPath) {
 			while let file = directoryContents.nextObject() as? String {
+				if file.hasPrefix("__MACOSX/") {
+					logger.debug("Ignoring theme file in __MACOSX folder.")
+					continue
+				}
 				if file.hasSuffix(".nnwtheme") {
 					return file
 				}