Merge pull request #1687 from MediaBrowser/dev

Dev

8 files changed, 251 insertions, 189 deletions

diff --git a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
index 71019e0ade..e84b66c5a7 100644
--- a/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
+++ b/MediaBrowser.Server.Implementations/EntryPoints/Notifications/Notifications.cs
@@ -215,6 +215,12 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
                 return;
             }
 
+            var video = e.Item as Video;
+            if (video != null && video.IsThemeMedia)
+            {
+                return;
+            }
+
             var type = GetPlaybackNotificationType(item.MediaType);
 
             SendPlaybackNotification(type, e);
@@ -230,6 +236,12 @@ namespace MediaBrowser.Server.Implementations.EntryPoints.Notifications
                 return;
             }
 
+            var video = e.Item as Video;
+            if (video != null && video.IsThemeMedia)
+            {
+                return;
+            }
+
             var type = GetPlaybackStoppedNotificationType(item.MediaType);
 
             SendPlaybackNotification(type, e);
diff --git a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
index 13a06afc23..09ca134d1a 100644
--- a/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
+++ b/MediaBrowser.Server.Implementations/IO/LibraryMonitor.cs
@@ -663,7 +663,7 @@ namespace MediaBrowser.Server.Implementations.IO
 
             while (item == null && !string.IsNullOrEmpty(path))
             {
-                item = LibraryManager.FindByPath(path);
+                item = LibraryManager.FindByPath(path, null);
 
                 path = Path.GetDirectoryName(path);
             }
diff --git a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
index 17c4f59ba0..e1bcfa861e 100644
--- a/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/LibraryManager.cs
@@ -801,11 +801,12 @@ namespace MediaBrowser.Server.Implementations.Library
             return _userRootFolder;
         }
 
-        public BaseItem FindByPath(string path)
+        public BaseItem FindByPath(string path, bool? isFolder)
         {
             var query = new InternalItemsQuery
             {
-                Path = path
+                Path = path,
+                IsFolder = isFolder
             };
 
             // Only use the database result if there's exactly one item, otherwise we run the risk of returning old data that hasn't been cleaned yet.
diff --git a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
index 95f5cb0e10..092b797ce7 100644
--- a/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
+++ b/MediaBrowser.Server.Implementations/Library/MediaSourceManager.cs
@@ -269,13 +269,15 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             var userData = item == null ? new UserItemData() : _userDataManager.GetUserData(user.Id, item.GetUserDataKey());
 
-            SetDefaultAudioStreamIndex(source, userData, user);
-            SetDefaultSubtitleStreamIndex(source, userData, user);
+            var allowRememberingSelection = item == null || item.EnableRememberingTrackSelections;
+
+            SetDefaultAudioStreamIndex(source, userData, user, allowRememberingSelection);
+            SetDefaultSubtitleStreamIndex(source, userData, user, allowRememberingSelection);
         }
 
-        private void SetDefaultSubtitleStreamIndex(MediaSourceInfo source, UserItemData userData, User user)
+        private void SetDefaultSubtitleStreamIndex(MediaSourceInfo source, UserItemData userData, User user, bool allowRememberingSelection)
         {
-            if (userData.SubtitleStreamIndex.HasValue && user.Configuration.RememberSubtitleSelections && user.Configuration.SubtitleMode != SubtitlePlaybackMode.None)
+            if (userData.SubtitleStreamIndex.HasValue && user.Configuration.RememberSubtitleSelections && user.Configuration.SubtitleMode != SubtitlePlaybackMode.None && allowRememberingSelection)
             {
                 var index = userData.SubtitleStreamIndex.Value;
                 // Make sure the saved index is still valid
@@ -304,9 +306,9 @@ namespace MediaBrowser.Server.Implementations.Library
                 user.Configuration.SubtitleMode, audioLangage);
         }
 
-        private void SetDefaultAudioStreamIndex(MediaSourceInfo source, UserItemData userData, User user)
+        private void SetDefaultAudioStreamIndex(MediaSourceInfo source, UserItemData userData, User user, bool allowRememberingSelection)
         {
-            if (userData.AudioStreamIndex.HasValue && user.Configuration.RememberAudioSelections)
+            if (userData.AudioStreamIndex.HasValue && user.Configuration.RememberAudioSelections && allowRememberingSelection)
             {
                 var index = userData.AudioStreamIndex.Value;
                 // Make sure the saved index is still valid
diff --git a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
index 61a5d98a32..e271fbcb25 100644
--- a/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
+++ b/MediaBrowser.Server.Implementations/Library/SearchEngine.cs
@@ -87,13 +87,16 @@ namespace MediaBrowser.Server.Implementations.Library
         {
             var searchTerm = query.SearchTerm;
 
+            if (searchTerm != null)
+            {
+                searchTerm = searchTerm.Trim().RemoveDiacritics();
+            }
+
             if (string.IsNullOrWhiteSpace(searchTerm))
             {
                 throw new ArgumentNullException("searchTerm");
             }
 
-            searchTerm = searchTerm.Trim().RemoveDiacritics();
-
             var terms = GetWords(searchTerm);
 
             var hints = new List<Tuple<BaseItem, string, int>>();
diff --git a/MediaBrowser.Server.Implementations/Localization/Core/en-US.json b/MediaBrowser.Server.Implementations/Localization/Core/en-US.json
index 0d5b5c4aa9..5e2f98c093 100644
--- a/MediaBrowser.Server.Implementations/Localization/Core/en-US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Core/en-US.json
@@ -1,178 +1,179 @@
 {
-    "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "UserDownloadingItemWithValues": "{0} is downloading {1}",
-    "FolderTypeMixed": "Mixed content",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV",
-    "FolderTypeInherit": "Inherit",
-    "HeaderCastCrew": "Cast & Crew",
-    "HeaderPeople": "People",
-    "ValueSpecialEpisodeName": "Special - {0}",
-    "LabelChapterName": "Chapter {0}",
-    "NameSeasonNumber": "Season {0}",
-    "LabelExit": "Exit",
-    "LabelVisitCommunity": "Visit Community",
-    "LabelGithub": "Github",
-    "LabelApiDocumentation": "Api Documentation",
-    "LabelDeveloperResources": "Developer Resources",
-    "LabelBrowseLibrary": "Browse Library",
-    "LabelConfigureServer": "Configure Emby",
-    "LabelRestartServer": "Restart Server",
-    "CategorySync": "Sync",
-    "CategoryUser": "User",
-    "CategorySystem": "System",
-    "CategoryApplication": "Application",
-    "CategoryPlugin": "Plugin",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionGamePlayback": "Game playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionGamePlaybackStopped": "Game playback stopped",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "ViewTypePlaylists": "Playlists",
-    "ViewTypeMovies": "Movies",
-    "ViewTypeTvShows": "TV",
-    "ViewTypeGames": "Games",
-    "ViewTypeMusic": "Music",
-    "ViewTypeMusicGenres": "Genres",
-    "ViewTypeMusicArtists": "Artists",
-    "ViewTypeBoxSets": "Collections",
-    "ViewTypeChannels": "Channels",
-    "ViewTypeLiveTV": "Live TV",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicPlaylists": "Playlists",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
-    "HeaderOtherDisplaySettings": "Display Settings",
-    "ViewTypeMusicSongs": "Songs",
-    "ViewTypeMusicFavorites": "Favorites",
-    "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
-    "ViewTypeMusicFavoriteArtists": "Favorite Artists",
-    "ViewTypeMusicFavoriteSongs": "Favorite Songs",
-    "ViewTypeFolders": "Folders",
-    "ViewTypeLiveTvRecordingGroups": "Recordings",
-    "ViewTypeLiveTvChannels": "Channels",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "ScheduledTaskStartedWithName": "{0} started",
-    "VersionNumber": "Version {0}",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUpdatedWithName": "{0} was updated",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "ItemAddedWithName": "{0} was added to the library",
-    "ItemRemovedWithName": "{0} was removed from the library",
-    "LabelIpAddressValue": "Ip address: {0}",
-    "DeviceOnlineWithName": "{0} is connected",
-    "UserOnlineFromDevice": "{0} is online from {1}",
-    "ProviderValue": "Provider: {0}",
-    "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
-    "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserPasswordChangedWithName": "Password has been changed for user {0}",
-    "UserDeletedWithName": "User {0} has been deleted",
-    "MessageServerConfigurationUpdated": "Server configuration has been updated",
-    "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
-    "MessageApplicationUpdated": "Emby Server has been updated",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "DeviceOfflineWithName": "{0} has disconnected",
-    "UserLockedOutWithName": "User {0} has been locked out",
-    "UserOfflineFromDevice": "{0} has disconnected from {1}",
-    "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
-    "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
-    "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
-    "HeaderUnidentified": "Unidentified",
-    "HeaderImagePrimary": "Primary",
-    "HeaderImageBackdrop": "Backdrop",
-    "HeaderImageLogo": "Logo",
-    "HeaderUserPrimaryImage": "User Image",
-    "HeaderOverview": "Overview",
-    "HeaderShortOverview": "Short Overview",
-    "HeaderType": "Type",
-    "HeaderSeverity": "Severity",
-    "HeaderUser": "User",
-    "HeaderName": "Name",
-    "HeaderDate": "Date",
-    "HeaderPremiereDate": "Premiere Date",
-    "HeaderDateAdded": "Date Added",
-    "HeaderReleaseDate": "Release date",
-    "HeaderRuntime": "Runtime",
-    "HeaderPlayCount": "Play Count",
-    "HeaderSeason": "Season",
-    "HeaderSeasonNumber": "Season number",
-    "HeaderSeries": "Series:",
-    "HeaderNetwork": "Network",
-    "HeaderYear": "Year:",
-    "HeaderYears": "Years:",
-    "HeaderParentalRating": "Parental Rating",
-    "HeaderCommunityRating": "Community rating",
-    "HeaderTrailers": "Trailers",
-    "HeaderSpecials": "Specials",
-    "HeaderGameSystems": "Game Systems",
-    "HeaderPlayers": "Players:",
-    "HeaderAlbumArtists": "Album Artists",
-    "HeaderAlbums": "Albums",
-    "HeaderDisc": "Disc",
-    "HeaderTrack": "Track",
-    "HeaderAudio": "Audio",
-    "HeaderVideo": "Video",
-    "HeaderEmbeddedImage": "Embedded image",
-    "HeaderResolution": "Resolution",
-    "HeaderSubtitles": "Subtitles",
-    "HeaderGenres": "Genres",
-    "HeaderCountries": "Countries",
-    "HeaderStatus": "Status",
-    "HeaderTracks": "Tracks",
-    "HeaderMusicArtist": "Music artist",
-    "HeaderLocked": "Locked",
-    "HeaderStudios": "Studios",
-    "HeaderActor": "Actors",
-    "HeaderComposer": "Composers",
-    "HeaderDirector": "Directors",
-    "HeaderGuestStar": "Guest star",
-    "HeaderProducer": "Producers",
-    "HeaderWriter": "Writers",
-    "HeaderParentalRatings": "Parental Ratings",
-    "HeaderCommunityRatings": "Community ratings",
-    "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
+  "DbUpgradeMessage": "Please wait while your Emby Server database is upgraded. {0}% complete.",
+  "AppDeviceValues": "App: {0}, Device: {1}",
+  "UserDownloadingItemWithValues": "{0} is downloading {1}",
+  "FolderTypeMixed": "Mixed content",
+  "FolderTypeMovies": "Movies",
+  "FolderTypeMusic": "Music",
+  "FolderTypeAdultVideos": "Adult videos",
+  "FolderTypePhotos": "Photos",
+  "FolderTypeMusicVideos": "Music videos",
+  "FolderTypeHomeVideos": "Home videos",
+  "FolderTypeGames": "Games",
+  "FolderTypeBooks": "Books",
+  "FolderTypeTvShows": "TV",
+  "FolderTypeInherit": "Inherit",
+  "HeaderCastCrew": "Cast & Crew",
+  "HeaderPeople": "People",
+  "ValueSpecialEpisodeName": "Special - {0}",
+  "LabelChapterName": "Chapter {0}",
+  "NameSeasonUnknown": "Season Unknown",
+  "NameSeasonNumber": "Season {0}",
+  "LabelExit": "Exit",
+  "LabelVisitCommunity": "Visit Community",
+  "LabelGithub": "Github",
+  "LabelApiDocumentation": "Api Documentation",
+  "LabelDeveloperResources": "Developer Resources",
+  "LabelBrowseLibrary": "Browse Library",
+  "LabelConfigureServer": "Configure Emby",
+  "LabelRestartServer": "Restart Server",
+  "CategorySync": "Sync",
+  "CategoryUser": "User",
+  "CategorySystem": "System",
+  "CategoryApplication": "Application",
+  "CategoryPlugin": "Plugin",
+  "NotificationOptionPluginError": "Plugin failure",
+  "NotificationOptionApplicationUpdateAvailable": "Application update available",
+  "NotificationOptionApplicationUpdateInstalled": "Application update installed",
+  "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
+  "NotificationOptionPluginInstalled": "Plugin installed",
+  "NotificationOptionPluginUninstalled": "Plugin uninstalled",
+  "NotificationOptionVideoPlayback": "Video playback started",
+  "NotificationOptionAudioPlayback": "Audio playback started",
+  "NotificationOptionGamePlayback": "Game playback started",
+  "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
+  "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
+  "NotificationOptionGamePlaybackStopped": "Game playback stopped",
+  "NotificationOptionTaskFailed": "Scheduled task failure",
+  "NotificationOptionInstallationFailed": "Installation failure",
+  "NotificationOptionNewLibraryContent": "New content added",
+  "NotificationOptionNewLibraryContentMultiple": "New content added (multiple)",
+  "NotificationOptionCameraImageUploaded": "Camera image uploaded",
+  "NotificationOptionUserLockedOut": "User locked out",
+  "NotificationOptionServerRestartRequired": "Server restart required",
+  "ViewTypePlaylists": "Playlists",
+  "ViewTypeMovies": "Movies",
+  "ViewTypeTvShows": "TV",
+  "ViewTypeGames": "Games",
+  "ViewTypeMusic": "Music",
+  "ViewTypeMusicGenres": "Genres",
+  "ViewTypeMusicArtists": "Artists",
+  "ViewTypeBoxSets": "Collections",
+  "ViewTypeChannels": "Channels",
+  "ViewTypeLiveTV": "Live TV",
+  "ViewTypeLiveTvNowPlaying": "Now Airing",
+  "ViewTypeLatestGames": "Latest Games",
+  "ViewTypeRecentlyPlayedGames": "Recently Played",
+  "ViewTypeGameFavorites": "Favorites",
+  "ViewTypeGameSystems": "Game Systems",
+  "ViewTypeGameGenres": "Genres",
+  "ViewTypeTvResume": "Resume",
+  "ViewTypeTvNextUp": "Next Up",
+  "ViewTypeTvLatest": "Latest",
+  "ViewTypeTvShowSeries": "Series",
+  "ViewTypeTvGenres": "Genres",
+  "ViewTypeTvFavoriteSeries": "Favorite Series",
+  "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
+  "ViewTypeMovieResume": "Resume",
+  "ViewTypeMovieLatest": "Latest",
+  "ViewTypeMovieMovies": "Movies",
+  "ViewTypeMovieCollections": "Collections",
+  "ViewTypeMovieFavorites": "Favorites",
+  "ViewTypeMovieGenres": "Genres",
+  "ViewTypeMusicLatest": "Latest",
+  "ViewTypeMusicPlaylists": "Playlists",
+  "ViewTypeMusicAlbums": "Albums",
+  "ViewTypeMusicAlbumArtists": "Album Artists",
+  "HeaderOtherDisplaySettings": "Display Settings",
+  "ViewTypeMusicSongs": "Songs",
+  "ViewTypeMusicFavorites": "Favorites",
+  "ViewTypeMusicFavoriteAlbums": "Favorite Albums",
+  "ViewTypeMusicFavoriteArtists": "Favorite Artists",
+  "ViewTypeMusicFavoriteSongs": "Favorite Songs",
+  "ViewTypeFolders": "Folders",
+  "ViewTypeLiveTvRecordingGroups": "Recordings",
+  "ViewTypeLiveTvChannels": "Channels",
+  "ScheduledTaskFailedWithName": "{0} failed",
+  "LabelRunningTimeValue": "Running time: {0}",
+  "ScheduledTaskStartedWithName": "{0} started",
+  "VersionNumber": "Version {0}",
+  "PluginInstalledWithName": "{0} was installed",
+  "PluginUpdatedWithName": "{0} was updated",
+  "PluginUninstalledWithName": "{0} was uninstalled",
+  "ItemAddedWithName": "{0} was added to the library",
+  "ItemRemovedWithName": "{0} was removed from the library",
+  "LabelIpAddressValue": "Ip address: {0}",
+  "DeviceOnlineWithName": "{0} is connected",
+  "UserOnlineFromDevice": "{0} is online from {1}",
+  "ProviderValue": "Provider: {0}",
+  "SubtitlesDownloadedForItem": "Subtitles downloaded for {0}",
+  "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
+  "UserCreatedWithName": "User {0} has been created",
+  "UserPasswordChangedWithName": "Password has been changed for user {0}",
+  "UserDeletedWithName": "User {0} has been deleted",
+  "MessageServerConfigurationUpdated": "Server configuration has been updated",
+  "MessageNamedServerConfigurationUpdatedWithValue": "Server configuration section {0} has been updated",
+  "MessageApplicationUpdated": "Emby Server has been updated",
+  "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
+  "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
+  "DeviceOfflineWithName": "{0} has disconnected",
+  "UserLockedOutWithName": "User {0} has been locked out",
+  "UserOfflineFromDevice": "{0} has disconnected from {1}",
+  "UserStartedPlayingItemWithValues": "{0} has started playing {1}",
+  "UserStoppedPlayingItemWithValues": "{0} has stopped playing {1}",
+  "SubtitleDownloadFailureForItem": "Subtitles failed to download for {0}",
+  "HeaderUnidentified": "Unidentified",
+  "HeaderImagePrimary": "Primary",
+  "HeaderImageBackdrop": "Backdrop",
+  "HeaderImageLogo": "Logo",
+  "HeaderUserPrimaryImage": "User Image",
+  "HeaderOverview": "Overview",
+  "HeaderShortOverview": "Short Overview",
+  "HeaderType": "Type",
+  "HeaderSeverity": "Severity",
+  "HeaderUser": "User",
+  "HeaderName": "Name",
+  "HeaderDate": "Date",
+  "HeaderPremiereDate": "Premiere Date",
+  "HeaderDateAdded": "Date Added",
+  "HeaderReleaseDate": "Release date",
+  "HeaderRuntime": "Runtime",
+  "HeaderPlayCount": "Play Count",
+  "HeaderSeason": "Season",
+  "HeaderSeasonNumber": "Season number",
+  "HeaderSeries": "Series:",
+  "HeaderNetwork": "Network",
+  "HeaderYear": "Year:",
+  "HeaderYears": "Years:",
+  "HeaderParentalRating": "Parental Rating",
+  "HeaderCommunityRating": "Community rating",
+  "HeaderTrailers": "Trailers",
+  "HeaderSpecials": "Specials",
+  "HeaderGameSystems": "Game Systems",
+  "HeaderPlayers": "Players:",
+  "HeaderAlbumArtists": "Album Artists",
+  "HeaderAlbums": "Albums",
+  "HeaderDisc": "Disc",
+  "HeaderTrack": "Track",
+  "HeaderAudio": "Audio",
+  "HeaderVideo": "Video",
+  "HeaderEmbeddedImage": "Embedded image",
+  "HeaderResolution": "Resolution",
+  "HeaderSubtitles": "Subtitles",
+  "HeaderGenres": "Genres",
+  "HeaderCountries": "Countries",
+  "HeaderStatus": "Status",
+  "HeaderTracks": "Tracks",
+  "HeaderMusicArtist": "Music artist",
+  "HeaderLocked": "Locked",
+  "HeaderStudios": "Studios",
+  "HeaderActor": "Actors",
+  "HeaderComposer": "Composers",
+  "HeaderDirector": "Directors",
+  "HeaderGuestStar": "Guest star",
+  "HeaderProducer": "Producers",
+  "HeaderWriter": "Writers",
+  "HeaderParentalRatings": "Parental Ratings",
+  "HeaderCommunityRatings": "Community ratings",
+  "StartupEmbyServerIsLoading": "Emby Server is loading. Please try again shortly."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs b/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs
index debcd054fe..76682c63b8 100644
--- a/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/MediaStreamColumns.cs
@@ -26,6 +26,38 @@ namespace MediaBrowser.Server.Implementations.Persistence
             AddCodecTagColumn();
             AddCommentColumn();
             AddNalColumn();
+            AddIsAvcColumn();
+        }
+
+        private void AddIsAvcColumn()
+        {
+            using (var cmd = _connection.CreateCommand())
+            {
+                cmd.CommandText = "PRAGMA table_info(mediastreams)";
+
+                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
+                {
+                    while (reader.Read())
+                    {
+                        if (!reader.IsDBNull(1))
+                        {
+                            var name = reader.GetString(1);
+
+                            if (string.Equals(name, "IsAvc", StringComparison.OrdinalIgnoreCase))
+                            {
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+
+            var builder = new StringBuilder();
+
+            builder.AppendLine("alter table mediastreams");
+            builder.AppendLine("add column IsAvc BIT NULL");
+
+            _connection.RunQueries(new[] { builder.ToString() }, _logger);
         }
 
         private void AddNalColumn()
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
index fb91a2dd24..783bd5ff43 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteItemRepository.cs
@@ -124,7 +124,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             _connection = await SqliteExtensions.ConnectToDb(dbFile, Logger).ConfigureAwait(false);
 
             var createMediaStreamsTableCommand
-               = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, PRIMARY KEY (ItemId, StreamIndex))";
+               = "create table if not exists mediastreams (ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, CodecTag TEXT NULL, Comment TEXT NULL, NalLengthSize TEXT NULL, IsAvc BIT NULL, PRIMARY KEY (ItemId, StreamIndex))";
 
             string[] queries = {
 
@@ -391,7 +391,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
             "RefFrames",
             "CodecTag",
             "Comment",
-            "NalLengthSize"
+            "NalLengthSize",
+            "IsAvc"
         };
 
         /// <summary>
@@ -1574,6 +1575,10 @@ namespace MediaBrowser.Server.Implementations.Persistence
             {
                 return "RuntimeTicks";
             }
+            if (string.Equals(name, ItemSortBy.IsFolder, StringComparison.OrdinalIgnoreCase))
+            {
+                return "IsFolder";
+            }
             if (string.Equals(name, ItemSortBy.Random, StringComparison.OrdinalIgnoreCase))
             {
                 return "RANDOM()";
@@ -2893,6 +2898,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     _saveStreamCommand.GetParameter(index++).Value = stream.CodecTag;
                     _saveStreamCommand.GetParameter(index++).Value = stream.Comment;
                     _saveStreamCommand.GetParameter(index++).Value = stream.NalLengthSize;
+                    _saveStreamCommand.GetParameter(index++).Value = stream.IsAVC;
 
                     _saveStreamCommand.Transaction = transaction;
                     _saveStreamCommand.ExecuteNonQuery();
@@ -3056,6 +3062,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 item.NalLengthSize = reader.GetString(27);
             }
 
+            if (!reader.IsDBNull(28))
+            {
+                item.IsAVC = reader.GetBoolean(28);
+            }
+
             return item;
         }