Merge remote-tracking branch 'upstream/master' into optimize-db-helper-memory

# Conflicts:
#	src/Jellyfin.Database/Jellyfin.Database.Providers.Sqlite/Migrations/JellyfinDbModelSnapshot.cs

1 files changed, 2 insertions, 2 deletions

diff --git a/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs b/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs
index 7d7de94348..d973076ed3 100644
--- a/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs
+++ b/tests/Jellyfin.Server.Implementations.Tests/Localization/LocalizationManagerTests.cs
@@ -349,7 +349,7 @@ namespace Jellyfin.Server.Implementations.Tests.Localization
             });
 
             var translated = localizationManager.GetLocalizedString("Artists", "de");
-            Assert.Equal("Interpreten", translated);
+            Assert.Equal("Künstler", translated);
         }
 
         [Fact]
@@ -406,7 +406,7 @@ namespace Jellyfin.Server.Implementations.Tests.Localization
             {
                 CultureInfo.CurrentUICulture = CultureInfo.GetCultureInfo("fr");
                 var translated = localizationManager.GetServerLocalizedString("Artists");
-                Assert.Equal("Interpreten", translated);
+                Assert.Equal("Künstler", translated);
             }
             finally
             {