diff --git a/Emby.Dlna/Didl/DidlBuilder.cs b/Emby.Dlna/Didl/DidlBuilder.cs
index 5e200428a7..c6c213a48b 100644
--- a/Emby.Dlna/Didl/DidlBuilder.cs
+++ b/Emby.Dlna/Didl/DidlBuilder.cs
@@ -393,75 +393,75 @@ namespace Emby.Dlna.Didl
{
if (itemStubType.HasValue && itemStubType.Value == StubType.Latest)
{
- return _localization.GetLocalizedString("ViewTypeMusicLatest");
+ return _localization.GetLocalizedString("Latest");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.Playlists)
{
- return _localization.GetLocalizedString("ViewTypeMusicPlaylists");
+ return _localization.GetLocalizedString("Playlists");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.AlbumArtists)
{
- return _localization.GetLocalizedString("ViewTypeMusicAlbumArtists");
+ return _localization.GetLocalizedString("HeaderAlbumArtists");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.Albums)
{
- return _localization.GetLocalizedString("ViewTypeMusicAlbums");
+ return _localization.GetLocalizedString("Albums");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.Artists)
{
- return _localization.GetLocalizedString("ViewTypeMusicArtists");
+ return _localization.GetLocalizedString("Artists");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.Songs)
{
- return _localization.GetLocalizedString("ViewTypeMusicSongs");
+ return _localization.GetLocalizedString("Songs");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.Genres)
{
- return _localization.GetLocalizedString("ViewTypeTvGenres");
+ return _localization.GetLocalizedString("Genres");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.FavoriteAlbums)
{
- return _localization.GetLocalizedString("ViewTypeMusicFavoriteAlbums");
+ return _localization.GetLocalizedString("HeaderFavoriteAlbums");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.FavoriteArtists)
{
- return _localization.GetLocalizedString("ViewTypeMusicFavoriteArtists");
+ return _localization.GetLocalizedString("HeaderFavoriteArtists");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.FavoriteSongs)
{
- return _localization.GetLocalizedString("ViewTypeMusicFavoriteSongs");
+ return _localization.GetLocalizedString("HeaderFavoriteSongs");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.ContinueWatching)
{
- return _localization.GetLocalizedString("ViewTypeMovieResume");
+ return _localization.GetLocalizedString("HeaderContinueWatching");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.Movies)
{
- return _localization.GetLocalizedString("ViewTypeMovieMovies");
+ return _localization.GetLocalizedString("Movies");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.Collections)
{
- return _localization.GetLocalizedString("ViewTypeMovieCollections");
+ return _localization.GetLocalizedString("Collections");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.Favorites)
{
- return _localization.GetLocalizedString("ViewTypeMovieFavorites");
+ return _localization.GetLocalizedString("Favorites");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.NextUp)
{
- return _localization.GetLocalizedString("ViewTypeTvNextUp");
+ return _localization.GetLocalizedString("HeaderNextUp");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.FavoriteSeries)
{
- return _localization.GetLocalizedString("ViewTypeTvFavoriteSeries");
+ return _localization.GetLocalizedString("HeaderFavoriteShows");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.FavoriteEpisodes)
{
- return _localization.GetLocalizedString("ViewTypeTvFavoriteEpisodes");
+ return _localization.GetLocalizedString("HeaderFavoriteEpisodes");
}
if (itemStubType.HasValue && itemStubType.Value == StubType.Series)
{
- return _localization.GetLocalizedString("ViewTypeTvShowSeries");
+ return _localization.GetLocalizedString("Shows");
}
var episode = item as Episode;
diff --git a/Emby.Server.Implementations/Channels/ChannelManager.cs b/Emby.Server.Implementations/Channels/ChannelManager.cs
index 0036d19708..c42f22804b 100644
--- a/Emby.Server.Implementations/Channels/ChannelManager.cs
+++ b/Emby.Server.Implementations/Channels/ChannelManager.cs
@@ -1547,7 +1547,7 @@ namespace Emby.Server.Implementations.Channels
public Folder GetInternalChannelFolder(CancellationToken cancellationToken)
{
- var name = _localization.GetLocalizedString("ViewTypeChannels");
+ var name = _localization.GetLocalizedString("Channels");
return _libraryManager.GetNamedView(name, "channels", "zz_" + name, cancellationToken);
}
diff --git a/Emby.Server.Implementations/Emby.Server.Implementations.csproj b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
index 518fa0d38d..4f5471bc31 100644
--- a/Emby.Server.Implementations/Emby.Server.Implementations.csproj
+++ b/Emby.Server.Implementations/Emby.Server.Implementations.csproj
@@ -675,46 +675,40 @@
+
-
-
-
-
-
+
-
+
-
-
-
-
+
diff --git a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 82f42c7455..fc5cab0a0b 100644
--- a/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/Emby.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -69,13 +69,13 @@ namespace Emby.Server.Implementations.Library.Resolvers.Movies
if (string.Equals(collectionType, CollectionType.MusicVideos, StringComparison.OrdinalIgnoreCase))
{
- return ResolveVideos(parent, files, directoryService, true, collectionType);
+ return ResolveVideos(parent, files, directoryService, true, collectionType, false);
}
if (string.Equals(collectionType, CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase) ||
string.Equals(collectionType, CollectionType.Photos, StringComparison.OrdinalIgnoreCase))
{
- return ResolveVideos