Add user cinema mode setting

MediaBrowser.Api/ItemLookupService.cs

@@ -147,13 +147,6 @@ namespace MediaBrowser.Api
             return ToOptimizedResult(result);
         }
 
-        public object Post(GetAdultVideoRemoteSearchResults request)
-        {
-            var result = _providerManager.GetRemoteSearchResults<AdultVideo, ItemLookupInfo>(request, CancellationToken.None).Result;
-
-            return ToOptimizedResult(result);
-        }
-
         public object Post(GetSeriesRemoteSearchResults request)
         {
             var result = _providerManager.GetRemoteSearchResults<Series, SeriesInfo>(request, CancellationToken.None).Result;

MediaBrowser.Api/Library/LibraryService.cs

@@ -406,7 +406,6 @@ namespace MediaBrowser.Api.Library
             var games = filteredItems.OfType<Game>().ToList();
             var movies = filteredItems.OfType<Movie>().ToList();
             var musicVideos = filteredItems.OfType<MusicVideo>().ToList();
-            var adultVideos = filteredItems.OfType<AdultVideo>().ToList();
             var boxsets = filteredItems.OfType<BoxSet>().ToList();
             var books = filteredItems.OfType<Book>().ToList();
             var songs = filteredItems.OfType<Audio>().ToList();
@@ -422,7 +421,6 @@ namespace MediaBrowser.Api.Library
                 SeriesCount = series.Count,
                 SongCount = songs.Count,
                 MusicVideoCount = musicVideos.Count,
-                AdultVideoCount = adultVideos.Count,
                 BoxSetCount = boxsets.Count,
                 BookCount = books.Count,
 

MediaBrowser.Api/Playback/BaseStreamingService.cs

@@ -1,5 +1,4 @@
-using System.Net.WebSockets;
+using MediaBrowser.Common.Extensions;
-using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Channels;
 using MediaBrowser.Controller.Configuration;
@@ -779,24 +778,9 @@ namespace MediaBrowser.Api.Playback
 
         private bool SupportsThrottleWithStream
         {
-            // TODO: These checks are a hack. 
-            // They should go through the IHttpServer interface or IServerManager to find out this information
-
             get
             {
-#if __MonoCS__
+                return false;
-                return true;
-#endif
-
-                try
-                {
-                    new ClientWebSocket();
-                    return true;
-                }
-                catch
-                {
-                    return false;
-                }
             }
         }
 

MediaBrowser.Common.Implementations/HttpClientManager/HttpClientManager.cs

@@ -233,7 +233,7 @@ namespace MediaBrowser.Common.Implementations.HttpClientManager
         {
             HttpResponseInfo response;
 
-            if (!options.EnableUnconditionalCache)
+            if (options.CacheMode == CacheMode.None)
             {
                 response = await SendAsyncInternal(options, httpMethod).ConfigureAwait(false);
                 return response;

MediaBrowser.Common/Net/HttpRequestOptions.cs

@@ -91,7 +91,7 @@ namespace MediaBrowser.Common.Net
         public bool LogErrorResponseBody { get; set; }
         public bool EnableKeepAlive { get; set; }
 
-        public bool EnableUnconditionalCache { get; set; }
+        public CacheMode CacheMode { get; set; }
         public TimeSpan CacheLength { get; set; }
 
         private string GetHeaderValue(string name)
@@ -125,4 +125,10 @@ namespace MediaBrowser.Common.Net
             RequestContentType = "application/x-www-form-urlencoded";
         }
     }
+
+    public enum CacheMode
+    {
+        None = 1,
+        Unconditional = 2
+    }
 }

MediaBrowser.Controller/Entities/AdultVideo.cs

@@ -1,8 +1,10 @@
-using System.Collections.Generic;
+using MediaBrowser.Controller.Providers;
-using MediaBrowser.Controller.Providers;
+using System;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Controller.Entities
 {
+    [Obsolete]
     public class AdultVideo : Video, IHasProductionLocations, IHasPreferredMetadataLanguage, IHasTaglines
     {
         /// <summary>

MediaBrowser.LocalMetadata/Images/LocalImageProvider.cs

@@ -173,7 +173,7 @@ namespace MediaBrowser.LocalMetadata.Images
             }
 
             // Support plex/xbmc convention
-            if (item is Movie || item is MusicVideo || item is AdultVideo)
+            if (item is Video && !(item is Episode))
             {
                 AddImage(files, images, imagePrefix + "movie", ImageType.Primary);
             }

MediaBrowser.LocalMetadata/MediaBrowser.LocalMetadata.csproj

@@ -58,7 +58,6 @@
     <Compile Include="Parsers\SeasonXmlParser.cs" />
     <Compile Include="Parsers\SeriesXmlParser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Providers\AdultVideoXmlProvider.cs" />
     <Compile Include="Providers\AlbumXmlProvider.cs" />
     <Compile Include="Providers\ArtistXmlProvider.cs" />
     <Compile Include="Providers\BoxSetXmlProvider.cs" />

MediaBrowser.LocalMetadata/Providers/AdultVideoXmlProvider.cs

@@ -1,37 +0,0 @@
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.LocalMetadata.Parsers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
-
-namespace MediaBrowser.LocalMetadata.Providers
-{
-    class AdultVideoXmlProvider : BaseXmlProvider<AdultVideo>
-    {
-        private readonly ILogger _logger;
-
-        public AdultVideoXmlProvider(IFileSystem fileSystem, ILogger logger)
-            : base(fileSystem)
-        {
-            _logger = logger;
-        }
-
-        protected override void Fetch(LocalMetadataResult<AdultVideo> result, string path, CancellationToken cancellationToken)
-        {
-            var chapters = new List<ChapterInfo>();
-
-            new MovieXmlParser(_logger).Fetch(result.Item, chapters, path, cancellationToken);
-
-            result.Chapters = chapters;
-        }
-
-        protected override FileSystemInfo GetXmlFile(ItemInfo info, IDirectoryService directoryService)
-        {
-            return MovieXmlProvider.GetXmlFileInfo(info, FileSystem);
-        }
-    }
-}

MediaBrowser.Model/Activity/ActivityLogEntry.cs

@@ -53,6 +53,12 @@ namespace MediaBrowser.Model.Activity
         /// <value>The user identifier.</value>
         public string UserId { get; set; }
 
+        /// <summary>
+        /// Gets or sets the user primary image tag.
+        /// </summary>
+        /// <value>The user primary image tag.</value>
+        public string UserPrimaryImageTag { get; set; }
+
         /// <summary>
         /// Gets or sets the log severity.
         /// </summary>

MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs

@@ -8,7 +8,6 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableIntrosForWatchedContent { get; set; }
         public bool EnableIntrosFromUpcomingTrailers { get; set; }
         public bool EnableIntrosFromMoviesInLibrary { get; set; }
-        public bool EnableCustomIntro { get; set; }
         public bool EnableIntrosParentalControl { get; set; }
         public string CustomIntroPath { get; set; }
         public bool EnableIntrosFromUpcomingDvdMovies { get; set; }
@@ -16,12 +15,7 @@ namespace MediaBrowser.Model.Configuration
 
         public CinemaModeConfiguration()
         {
-            EnableCustomIntro = true;
-            EnableIntrosFromMoviesInLibrary = true;
-            EnableIntrosFromUpcomingTrailers = true;
             EnableIntrosParentalControl = true;
-            EnableIntrosFromUpcomingDvdMovies = true;
-            EnableIntrosFromUpcomingStreamingMovies = true;
         }
     }
 }

MediaBrowser.Model/Configuration/UserConfiguration.cs

@@ -84,6 +84,8 @@ namespace MediaBrowser.Model.Configuration
 
         public bool IncludeTrailersInSuggestions { get; set; }
 
+        public bool EnableCinemaMode { get; set; }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="UserConfiguration" /> class.
         /// </summary>
@@ -108,6 +110,7 @@ namespace MediaBrowser.Model.Configuration
             SyncConnectName = true;
             SyncConnectImage = true;
             IncludeTrailersInSuggestions = true;
+            EnableCinemaMode = true;
         }
     }
 }

MediaBrowser.Model/Dto/BaseItemDto.cs

@@ -680,7 +680,6 @@ namespace MediaBrowser.Model.Dto
         /// <value>The locked fields.</value>
         public List<MetadataFields> LockedFields { get; set; }
 
-        public int? AdultVideoCount { get; set; }
         /// <summary>
         /// Gets or sets the movie count.
         /// </summary>

MediaBrowser.Model/Dto/ItemCounts.cs

@@ -7,7 +7,6 @@ namespace MediaBrowser.Model.Dto
     /// </summary>
     public class ItemCounts
     {
-        public int AdultVideoCount { get; set; }
         /// <summary>
         /// Gets or sets the movie count.
         /// </summary>

MediaBrowser.Providers/AdultVideos/AdultVideoMetadataService.cs

@@ -1,32 +0,0 @@
-using MediaBrowser.Common.IO;
-using MediaBrowser.Controller.Configuration;
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Providers;
-using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.Logging;
-using MediaBrowser.Providers.Manager;
-using System.Collections.Generic;
-
-namespace MediaBrowser.Providers.AdultVideos
-{
-    class AdultVideoMetadataService : MetadataService<AdultVideo, ItemLookupInfo>
-    {
-        public AdultVideoMetadataService(IServerConfigurationManager serverConfigurationManager, ILogger logger, IProviderManager providerManager, IProviderRepository providerRepo, IFileSystem fileSystem, IUserDataManager userDataManager) : base(serverConfigurationManager, logger, providerManager, providerRepo, fileSystem, userDataManager)
-        {
-        }
-
-        /// <summary>
-        /// Merges the specified source.
-        /// </summary>
-        /// <param name="source">The source.</param>
-        /// <param name="target">The target.</param>
-        /// <param name="lockedFields">The locked fields.</param>
-        /// <param name="replaceData">if set to <c>true</c> [replace data].</param>
-        /// <param name="mergeMetadataSettings">if set to <c>true</c> [merge metadata settings].</param>
-        protected override void MergeData(AdultVideo source, AdultVideo target, List<MetadataFields> lockedFields, bool replaceData, bool mergeMetadataSettings)
-        {
-            ProviderUtils.MergeBaseItemData(source, target, lockedFields, replaceData, mergeMetadataSettings);
-        }
-    }
-}

MediaBrowser.Providers/Manager/ProviderManager.cs

@@ -446,7 +446,6 @@ namespace MediaBrowser.Providers.Manager
                 GetPluginSummary<Studio>(),
                 GetPluginSummary<GameGenre>(),
                 GetPluginSummary<MusicGenre>(),
-                GetPluginSummary<AdultVideo>(),
                 GetPluginSummary<MusicVideo>(),
                 GetPluginSummary<Video>(),
                 GetPluginSummary<LiveTvChannel>(),

MediaBrowser.Providers/MediaBrowser.Providers.csproj

@@ -76,7 +76,6 @@
     <Compile Include="..\SharedVersion.cs">
       <Link>Properties\SharedVersion.cs</Link>
     </Compile>
-    <Compile Include="AdultVideos\AdultVideoMetadataService.cs" />
     <Compile Include="Books\BookMetadataService.cs" />
     <Compile Include="BoxSets\BoxSetMetadataService.cs" />
     <Compile Include="BoxSets\MovieDbBoxSetImageProvider.cs" />

MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs

@@ -28,7 +28,6 @@ namespace MediaBrowser.Providers.MediaInfo
     public class FFProbeProvider : ICustomMetadataProvider<Episode>,
         ICustomMetadataProvider<MusicVideo>,
         ICustomMetadataProvider<Movie>,
-        ICustomMetadataProvider<AdultVideo>,
         ICustomMetadataProvider<LiveTvVideoRecording>,
         ICustomMetadataProvider<LiveTvAudioRecording>,
         ICustomMetadataProvider<Trailer>,
@@ -72,11 +71,6 @@ namespace MediaBrowser.Providers.MediaInfo
             return FetchVideoInfo(item, options, cancellationToken);
         }
 
-        public Task<ItemUpdateType> FetchAsync(AdultVideo item, MetadataRefreshOptions options, CancellationToken cancellationToken)
-        {
-            return FetchVideoInfo(item, options, cancellationToken);
-        }
-
         public Task<ItemUpdateType> FetchAsync(LiveTvVideoRecording item, MetadataRefreshOptions options, CancellationToken cancellationToken)
         {
             return FetchVideoInfo(item, options, cancellationToken);

MediaBrowser.Providers/Movies/MovieDbProvider.cs

@@ -155,7 +155,7 @@ namespace MediaBrowser.Providers.Movies
                 Url = string.Format(TmdbConfigUrl, ApiKey),
                 CancellationToken = cancellationToken,
                 AcceptHeader = AcceptHeader,
-                EnableUnconditionalCache = true,
+                CacheMode = CacheMode.Unconditional,
                 CacheLength = TimeSpan.FromDays(3)
 
             }).ConfigureAwait(false))
@@ -298,7 +298,7 @@ namespace MediaBrowser.Providers.Movies
             cancellationToken.ThrowIfCancellationRequested();
 
             // Cache if not using a tmdbId because we won't have the tmdb cache directory structure. So use the lower level cache.
-            var enableResponseCache = !isTmdbId;
+            var cacheMode = isTmdbId ? CacheMode.None : CacheMode.Unconditional;
             var cacheLength = TimeSpan.FromDays(3);
 
             using (var json = await GetMovieDbResponse(new HttpRequestOptions
@@ -306,7 +306,7 @@ namespace MediaBrowser.Providers.Movies
                 Url = url,
                 CancellationToken = cancellationToken,
                 AcceptHeader = AcceptHeader,
-                EnableUnconditionalCache = enableResponseCache,
+                CacheMode = cacheMode,
                 CacheLength = cacheLength
 
             }).ConfigureAwait(false))
@@ -329,7 +329,7 @@ namespace MediaBrowser.Providers.Movies
                         Url = url,
                         CancellationToken = cancellationToken,
                         AcceptHeader = AcceptHeader,
-                        EnableUnconditionalCache = enableResponseCache,
+                        CacheMode = cacheMode,
                         CacheLength = cacheLength
 
                     }).ConfigureAwait(false))

MediaBrowser.Providers/Music/MusicBrainzAlbumProvider.cs

@@ -307,7 +307,7 @@ namespace MediaBrowser.Providers.Music
 
                 if (!isSearch)
                 {
-                    options.EnableUnconditionalCache = true;
+                    options.CacheMode = CacheMode.Unconditional;
                     options.CacheLength = TimeSpan.FromDays(7);
                 }
 

MediaBrowser.Providers/Omdb/OmdbProvider.cs

@@ -38,7 +38,7 @@ namespace MediaBrowser.Providers.Omdb
                 Url = url,
                 ResourcePool = ResourcePool,
                 CancellationToken = cancellationToken,
-                EnableUnconditionalCache = true,
+                CacheMode = CacheMode.Unconditional,
                 CacheLength = TimeSpan.FromDays(7)
 
             }).ConfigureAwait(false))

MediaBrowser.Server.Implementations/Activity/ActivityManager.cs

@@ -1,10 +1,12 @@
 using MediaBrowser.Common.Events;
 using MediaBrowser.Controller.Activity;
+using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Activity;
 using MediaBrowser.Model.Events;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.Querying;
 using System;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Implementations.Activity
@@ -15,11 +17,13 @@ namespace MediaBrowser.Server.Implementations.Activity
         
         private readonly IActivityRepository _repo;
         private readonly ILogger _logger;
+        private readonly IUserManager _userManager;
 
-        public ActivityManager(ILogger logger, IActivityRepository repo)
+        public ActivityManager(ILogger logger, IActivityRepository repo, IUserManager userManager)
         {
             _logger = logger;
             _repo = repo;
+            _userManager = userManager;
         }
 
         public async Task Create(ActivityLogEntry entry)
@@ -34,7 +38,20 @@ namespace MediaBrowser.Server.Implementations.Activity
 
         public QueryResult<ActivityLogEntry> GetActivityLogEntries(DateTime? minDate, int? startIndex, int? limit)
         {
-            return _repo.GetActivityLogEntries(minDate, startIndex, limit);
+            var result = _repo.GetActivityLogEntries(minDate, startIndex, limit);
+
+            foreach (var item in result.Items.Where(i => !string.IsNullOrWhiteSpace(i.UserId)))
+            {
+                var user = _userManager.GetUserById(item.UserId);
+
+                if (user != null)
+                {
+                    var dto = _userManager.GetUserDto(user);
+                    item.UserPrimaryImageTag = dto.PrimaryImageTag;
+                }
+            }
+
+            return result;
         }
     }
 }

MediaBrowser.Server.Implementations/Channels/ChannelManager.cs

@@ -869,7 +869,56 @@ namespace MediaBrowser.Server.Implementations.Channels
 
         private async Task<ChannelItemResult> GetAllItems(IIndexableChannel indexable, IChannel channel, InternalAllChannelMediaQuery query, CancellationToken cancellationToken)
         {
-            return await indexable.GetAllMedia(query, cancellationToken).ConfigureAwait(false);
+            var cacheLength = CacheLength;
+            var folderId = _jsonSerializer.SerializeToString(query).GetMD5().ToString("N");
+            var cachePath = GetChannelDataCachePath(channel, query.UserId, folderId, null, false);
+
+            try
+            {
+                if (_fileSystem.GetLastWriteTimeUtc(cachePath).Add(cacheLength) > DateTime.UtcNow)
+                {
+                    return _jsonSerializer.DeserializeFromFile<ChannelItemResult>(cachePath);
+                }
+            }
+            catch (FileNotFoundException)
+            {
+
+            }
+            catch (DirectoryNotFoundException)
+            {
+
+            }
+
+            await _resourcePool.WaitAsync(cancellationToken).ConfigureAwait(false);
+
+            try
+            {
+                try
+                {
+                    if (_fileSystem.GetLastWriteTimeUtc(cachePath).Add(cacheLength) > DateTime.UtcNow)
+                    {
+                        return _jsonSerializer.DeserializeFromFile<ChannelItemResult>(cachePath);
+                    }
+                }
+                catch (FileNotFoundException)
+                {
+
+                }
+                catch (DirectoryNotFoundException)
+                {
+
+                }
+
+                var result = await indexable.GetAllMedia(query, cancellationToken).ConfigureAwait(false);
+
+                CacheResponse(result, cachePath);
+
+                return result;
+            }
+            finally
+            {
+                _resourcePool.Release();
+            }
         }
 
         public async Task<QueryResult<BaseItem>> GetChannelItemsInternal(ChannelItemQuery query, IProgress<double> progress, CancellationToken cancellationToken)

MediaBrowser.Server.Implementations/Configuration/ServerConfigurationManager.cs

@@ -221,7 +221,6 @@ namespace MediaBrowser.Server.Implementations.Configuration
             DisableMetadataService(typeof(Series), Configuration, service);
             DisableMetadataService(typeof(MusicVideo), Configuration, service);
             DisableMetadataService(typeof(Trailer), Configuration, service);
-            DisableMetadataService(typeof(AdultVideo), Configuration, service);
             DisableMetadataService(typeof(Video), Configuration, service);
         }
 

MediaBrowser.Server.Implementations/Dto/DtoService.cs

@@ -215,7 +215,6 @@ namespace MediaBrowser.Server.Implementations.Dto
             {
                 // This populates them all and covers Genre, Person, Studio, Year
 
-                dto.AdultVideoCount = taggedItems.Count(i => i is AdultVideo);
                 dto.AlbumCount = taggedItems.Count(i => i is MusicAlbum);
                 dto.EpisodeCount = taggedItems.Count(i => i is Episode);
                 dto.GameCount = taggedItems.Count(i => i is Game);

MediaBrowser.Server.Implementations/EntryPoints/ActivityLogEntryPoint.cs

@@ -129,13 +129,14 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
                 return;
             }
 
-            var username = e.Users.First().Name;
+            var user = e.Users.First();
 
             CreateLogEntry(new ActivityLogEntry
             {
-                Name = string.Format(_localization.GetLocalizedString("UserStoppedPlayingItemWithValues"), username, item.Name),
+                Name = string.Format(_localization.GetLocalizedString("UserStoppedPlayingItemWithValues"), user.Name, item.Name),
                 Type = "PlaybackStopped",
-                ShortOverview = string.Format(_localization.GetLocalizedString("AppDeviceValues"), e.ClientName, e.DeviceName)
+                ShortOverview = string.Format(_localization.GetLocalizedString("AppDeviceValues"), e.ClientName, e.DeviceName),
+                UserId = user.Id.ToString("N")
             });
         }
 
@@ -161,13 +162,14 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
                 return;
             }
 
-            var username = e.Users.First().Name;
+            var user = e.Users.First();
 
             CreateLogEntry(new ActivityLogEntry
             {
-                Name = string.Format(_localization.GetLocalizedString("UserStartedPlayingItemWithValues"), username, item.Name),
+                Name = string.Format(_localization.GetLocalizedString("UserStartedPlayingItemWithValues"), user.Name, item.Name),
                 Type = "PlaybackStart",
-                ShortOverview = string.Format(_localization.GetLocalizedString("AppDeviceValues"), e.ClientName, e.DeviceName)
+                ShortOverview = string.Format(_localization.GetLocalizedString("AppDeviceValues"), e.ClientName, e.DeviceName),
+                UserId = user.Id.ToString("N")
             });
         }
 
@@ -192,7 +194,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             {
                 Name = name,
                 Type = "SessionEnded",
-                ShortOverview = string.Format(_localization.GetLocalizedString("LabelIpAddressValue"), session.RemoteEndPoint)
+                ShortOverview = string.Format(_localization.GetLocalizedString("LabelIpAddressValue"), session.RemoteEndPoint),
+                UserId = (session.UserId.HasValue ? session.UserId.Value.ToString("N") : null)
             });
         }
 
@@ -255,7 +258,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("UserConfigurationUpdatedWithName"), e.Argument.Name),
-                Type = "UserConfigurationUpdated"
+                Type = "UserConfigurationUpdated",
+                UserId = e.Argument.Id.ToString("N")
             });
         }
 
@@ -273,7 +277,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("UserPasswordChangedWithName"), e.Argument.Name),
-                Type = "UserPasswordChanged"
+                Type = "UserPasswordChanged",
+                UserId = e.Argument.Id.ToString("N")
             });
         }
 
@@ -282,7 +287,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             CreateLogEntry(new ActivityLogEntry
             {
                 Name = string.Format(_localization.GetLocalizedString("UserCreatedWithName"), e.Argument.Name),
-                Type = "UserCreated"
+                Type = "UserCreated",
+                UserId = e.Argument.Id.ToString("N")
             });
         }
 
@@ -318,7 +324,8 @@ namespace MediaBrowser.Server.Implementations.EntryPoints
             {
                 Name = name,
                 Type = "SessionStarted",
-                ShortOverview = string.Format(_localization.GetLocalizedString("LabelIpAddressValue"), session.RemoteEndPoint)
+                ShortOverview = string.Format(_localization.GetLocalizedString("LabelIpAddressValue"), session.RemoteEndPoint),
+                UserId = (session.UserId.HasValue ? session.UserId.Value.ToString("N") : null)
             });
         }
 

MediaBrowser.Server.Implementations/Intros/DefaultIntroProvider.cs

@@ -140,7 +140,7 @@ namespace MediaBrowser.Server.Implementations.Intros
                 }));
             }
 
-            var customIntros = config.EnableCustomIntro ?
+            var customIntros = !string.IsNullOrWhiteSpace(config.CustomIntroPath) ?
                 GetCustomIntros(item) :
                 new List<IntroInfo>();
 

MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs

@@ -92,7 +92,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
 
                 if (string.Equals(collectionType, CollectionType.AdultVideos, StringComparison.OrdinalIgnoreCase))
                 {
-                    return FindMovie<AdultVideo>(args.Path, args.Parent, args.FileSystemChildren.ToList(), args.DirectoryService, true, false);
+                    return FindMovie<Video>(args.Path, args.Parent, args.FileSystemChildren.ToList(), args.DirectoryService, true, false);
                 }
 
                 if (string.Equals(collectionType, CollectionType.HomeVideos, StringComparison.OrdinalIgnoreCase))
@@ -132,7 +132,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
 
             if (string.Equals(collectionType, CollectionType.AdultVideos, StringComparison.OrdinalIgnoreCase))
             {
-                item = ResolveVideo<AdultVideo>(args);
+                item = ResolveVideo<Video>(args);
             }
 
             // To find a movie file, the collection type must be movies or boxsets

MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json

@@ -11,7 +11,7 @@
     "FileNotFound": "\u0627\u0644\u0645\u0644\u0641 \u063a\u064a\u0631 \u0645\u0648\u062c\u0648\u062f.",
     "FileReadError": "\u062d\u062f\u062b \u062e\u0637\u0623 \u0628\u0642\u0631\u0627\u0621\u0629 \u0627\u0644\u0645\u0644\u0641.",
     "DeleteUser": "\u062d\u0630\u0641 \u0645\u0633\u062a\u062e\u062f\u0645",
-    "DeleteUserConfirmation": "\u0647\u0644 \u0627\u0646\u062a \u0645\u062a\u0627\u0643\u062f \u0645\u0646 \u0627\u0646\u0643 \u062a\u0631\u064a\u062f \u062d\u0630\u0641 {0} \u061f",
+    "DeleteUserConfirmation": "\u0647\u0644 \u0627\u0646\u062a \u0645\u062a\u0627\u0643\u062f \u0645\u0646 \u0627\u0646\u0643 \u062a\u0631\u064a\u062f \u062d\u0630\u0641 \u0647\u0630\u0627 \u0627\u0644\u0645\u0633\u062a\u062e\u062f\u0645 \u061f",
     "PasswordResetHeader": "\u0627\u0639\u0627\u062f\u0629 \u062a\u0639\u064a\u064a\u0646 \u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631",
     "PasswordResetComplete": "\u0644\u0642\u062f \u062a\u0645 \u0627\u0639\u0627\u062f\u0629 \u062a\u0639\u064a\u064a\u0646 \u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631.",
     "PasswordResetConfirmation": "\u0647\u0644 \u0627\u0646\u062a \u0645\u062a\u0627\u0643\u062f \u0645\u0646 \u0627\u0646\u0643 \u062a\u0631\u064a\u062f \u0627\u0639\u0627\u062f\u0629 \u062a\u0639\u064a\u064a\u0646 \u0643\u0644\u0645\u0629 \u0627\u0644\u0633\u0631\u061f",
@@ -91,13 +91,13 @@
     "MessageRecordingDeleted": "Recording deleted.",
     "ButonCancelRecording": "Cancel Recording",
     "MessageRecordingSaved": "Recording saved.",
-    "OptionSunday": "Sunday",
+    "OptionSunday": "\u0627\u0644\u0627\u062d\u062f",
-    "OptionMonday": "Monday",
+    "OptionMonday": "\u0627\u0644\u0627\u062b\u0646\u064a\u0646",
-    "OptionTuesday": "Tuesday",
+    "OptionTuesday": "\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621",
-    "OptionWednesday": "Wednesday",
+    "OptionWednesday": "\u0627\u0644\u0627\u0631\u0628\u0639\u0627\u0621",
-    "OptionThursday": "Thursday",
+    "OptionThursday": "\u0627\u0644\u062e\u0645\u064a\u0633",
-    "OptionFriday": "Friday",
+    "OptionFriday": "\u0627\u0644\u062c\u0645\u0639\u0629",
-    "OptionSaturday": "Saturday",
+    "OptionSaturday": "\u0627\u0644\u0633\u0628\u062a",
     "HeaderConfirmDeletion": "Confirm Deletion",
     "MessageConfirmPathSubstitutionDeletion": "Are you sure you wish to delete this path substitution?",
     "LiveTvUpdateAvailable": "(Update available)",

MediaBrowser.Server.Implementations/Localization/JavaScript/hr.json

@@ -143,8 +143,8 @@
     "HeaderSelectChannelDownloadPath": "Select Channel Download Path",
     "HeaderSelectChannelDownloadPathHelp": "Browse or enter the path to use for storing channel cache files. The folder must be writeable.",
     "OptionNewCollection": "New...",
-    "ButtonAdd": "Add",
+    "ButtonAdd": "Dodaj",
-    "ButtonRemove": "Remove",
+    "ButtonRemove": "Ukloni",
     "LabelChapterDownloaders": "Chapter downloaders:",
     "LabelChapterDownloadersHelp": "Enable and rank your preferred chapter downloaders in order of priority. Lower priority downloaders will only be used to fill in missing information.",
     "HeaderFavoriteAlbums": "Favorite Albums",
@@ -168,7 +168,7 @@
     "HeaderShutdown": "Shutdown",
     "MessageConfirmRestart": "Are you sure you wish to restart Media Browser Server?",
     "MessageConfirmShutdown": "Are you sure you wish to shutdown Media Browser Server?",
-    "ButtonUpdateNow": "Update Now",
+    "ButtonUpdateNow": "A\u017euriraj sad",
     "NewVersionOfSomethingAvailable": "A new version of {0} is available!",
     "VersionXIsAvailableForDownload": "Version {0} is now available for download.",
     "LabelVersionNumber": "Version {0}",
@@ -200,7 +200,7 @@
     "ButtonShuffle": "Shuffle",
     "ButtonInstantMix": "Instant mix",
     "ButtonResume": "Resume",
-    "HeaderScenes": "Scenes",
+    "HeaderScenes": "Scene",
     "HeaderAudioTracks": "Audio Tracks",
     "HeaderSubtitles": "Subtitles",
     "HeaderVideoQuality": "Video Quality",
@@ -211,14 +211,14 @@
     "ButtonReports": "Reports",
     "ButtonMetadataManager": "Metadata Manager",
     "HeaderTime": "Time",
-    "HeaderName": "Name",
+    "HeaderName": "Ime",
     "HeaderAlbum": "Album",
     "HeaderAlbumArtist": "Album Artist",
     "HeaderArtist": "Artist",
     "LabelAddedOnDate": "Added {0}",
     "ButtonStart": "Start",
     "HeaderChannels": "Channels",
-    "HeaderMediaFolders": "Media Folders",
+    "HeaderMediaFolders": "Medijska mapa",
     "HeaderBlockItemsWithNoRating": "Block items with no rating information:",
     "OptionBlockOthers": "Others",
     "OptionBlockTvShows": "TV Shows",
@@ -287,7 +287,7 @@
     "HeaderChangeFolderTypeHelp": "To change the folder type, please remove and rebuild the collection with the new type.",
     "HeaderAlert": "Alert",
     "MessagePleaseRestart": "Please restart to finish updating.",
-    "ButtonRestart": "Restart",
+    "ButtonRestart": "Ponovo pokreni",
     "MessagePleaseRefreshPage": "Please refresh this page to receive new updates from the server.",
     "ButtonHide": "Hide",
     "MessageSettingsSaved": "Settings saved.",
@@ -318,7 +318,7 @@
     "HeaderNotifications": "Notifications",
     "HeaderSelectPlayer": "Select Player:",
     "ButtonSelect": "Odaberi",
-    "ButtonNew": "New",
+    "ButtonNew": "Novo",
     "MessageInternetExplorerWebm": "For best results with Internet Explorer please install the WebM playback plugin.",
     "HeaderVideoError": "Video Error",
     "ButtonAddToPlaylist": "Add to playlist",
@@ -384,10 +384,10 @@
     "LabelTitleDisplayOrder": "Title display order:",
     "OptionSortName": "Sort name",
     "OptionReleaseDate": "Release date",
-    "LabelSeasonNumber": "Season number:",
+    "LabelSeasonNumber": "Broj sezone:",
     "LabelDiscNumber": "Disc number",
     "LabelParentNumber": "Parent number",
-    "LabelEpisodeNumber": "Episode number:",
+    "LabelEpisodeNumber": "Broj epizode:",
     "LabelTrackNumber": "Track number:",
     "LabelNumber": "Number:",
     "LabelReleaseDate": "Release date:",

MediaBrowser.Server.Implementations/Localization/JavaScript/it.json

@@ -571,18 +571,18 @@
     "LabelFullReview": "Recensione completa:",
     "LabelShortRatingDescription": "Breve riassunto Valutazione:",
     "OptionIRecommendThisItem": "Consiglio questo elemento",
-    "WebClientTourContent": "View your recently added media, next episodes, and more. The green circles indicate how many unplayed items you have.",
+    "WebClientTourContent": "Visualizza i file multimediali aggiunti di recente, i prossimi episodi, e altro ancora. I cerchi verdi indicano quanti oggetti unplayed avete.",
-    "WebClientTourMovies": "Play movies, trailers and more from any device with a web browser",
+    "WebClientTourMovies": "Riprodurre filmati, trailer e altro da qualsiasi dispositivo con un browser web",
-    "WebClientTourMouseOver": "Hold the mouse over any poster for quick access to important information",
+    "WebClientTourMouseOver": "Tenete il mouse su ogni manifesto per un rapido accesso alle informazioni importanti",
-    "WebClientTourTapHold": "Tap and hold or right click any poster for a context menu",
+    "WebClientTourTapHold": "Toccare e tenere premuto o fare clic destro qualsiasi manifesto per un menu di scelta rapida",
-    "WebClientTourMetadataManager": "Click edit to open the metadata manager",
+    "WebClientTourMetadataManager": "Fare clic su Modifica per aprire la gestione dei metadati",
-    "WebClientTourPlaylists": "Easily create playlists and instant mixes, and play them on any device",
+    "WebClientTourPlaylists": "Facile creazione di playlist , e riprodurli su qualsiasi dispositivo",
-    "WebClientTourCollections": "Create movie collections to group box sets together",
+    "WebClientTourCollections": "Creare collezioni di film di casella di gruppo imposta insieme",
-    "WebClientTourUserPreferences1": "User preferences allow you to customize the way your library is presented in all of your Media Browser apps",
+    "WebClientTourUserPreferences1": "Le preferenze utente consentono di personalizzare il modo in cui la vostra biblioteca si presenta in tutte le applicazioni Media Browser",
-    "WebClientTourUserPreferences2": "Configure your audio and subtitle language settings once, for every Media Browser app",
+    "WebClientTourUserPreferences2": "Configurare le impostazioni della lingua dei sottotitoli audio e una volta, per ogni Browser media app",
-    "WebClientTourUserPreferences3": "Design the web client home page to your liking",
+    "WebClientTourUserPreferences3": "Progettare la home page del client web a proprio piacimento",
-    "WebClientTourUserPreferences4": "Configure backdrops, theme songs and external players",
+    "WebClientTourUserPreferences4": "Configurare fondali, sigle e lettori esterni",
-    "WebClientTourMobile1": "The web client works great on smartphones and tablets...",
+    "WebClientTourMobile1": "Il client web funziona alla grande su smartphone e tablet ...",
-    "WebClientTourMobile2": "and easily controls other devices and Media Browser apps",
+    "WebClientTourMobile2": "e controlla facilmente altri dispositivi e applicazioni Media Browser",
-    "MessageEnjoyYourStay": "Enjoy your stay"
+    "MessageEnjoyYourStay": "Godetevi il vostro soggiorno"
 }

MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json

@@ -119,7 +119,7 @@
     "MessagePleaseSelectTwoItems": "Vennligst velg minst to elementer.",
     "MessageTheFollowingItemsWillBeGrouped": "F\u00f8lgende titler vil bli gruppert til ett element:",
     "MessageConfirmItemGrouping": "Media Browser klienter vil automatisk velge den mest optimale versjonen for avspilling basert p\u00e5 enhet og nettverks ytelse. Er du sikker p\u00e5 at du vil fortsette?",
-    "HeaderResume": "Fortsett",
+    "HeaderResume": "Fortsette",
     "HeaderMyViews": "Mitt Syn",
     "HeaderLibraryFolders": "Media Mapper",
     "HeaderLatestMedia": "Siste Media",
@@ -199,7 +199,7 @@
     "ButtonOpenInNewTab": "\u00c5pne i ny fane",
     "ButtonShuffle": "Shuffle",
     "ButtonInstantMix": "Direktemiks",
-    "ButtonResume": "Fortsett",
+    "ButtonResume": "Fortsette",
     "HeaderScenes": "Scener",
     "HeaderAudioTracks": "Lydspor",
     "HeaderSubtitles": "Undertekster",
@@ -437,7 +437,7 @@
     "ValueReviewCount": "{0} Anmeldelser",
     "MessageYouHaveVersionInstalled": "You currently have version {0} installed.",
     "MessageTrialExpired": "Pr\u00f8veperioden for denne funksjonen er utl\u00f8pt",
-    "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
+    "MessageTrialWillExpireIn": "Pr\u00f8veperioden for denne funksjonen utl\u00f8per om {0} dag (er)",
     "MessageInstallPluginFromApp": "Dette programtillegget m\u00e5 installeres direkte i appen du har tenkt \u00e5 bruke den i.",
     "ValuePriceUSD": "Pris: {0} (USD)",
     "MessageFeatureIncludedWithSupporter": "Du er registrert for denne funksjonen, og vil kunne fortsette \u00e5 bruke den med et aktiv supporter medlemskap.",
@@ -463,7 +463,7 @@
     "ButtonImDone": "Jeg er ferdig",
     "OptionWatched": "Sett",
     "OptionUnwatched": "Usett",
-    "ExternalPlayerPlaystateOptionsHelp": "Specify how you would like to resume playing this video next time.",
+    "ExternalPlayerPlaystateOptionsHelp": "Spesifiser hvordan du vil fortsette avspillingen av denne videoen neste gang.",
     "LabelMarkAs": "Merk som:",
     "OptionInProgress": "In-Progress",
     "LabelResumePoint": "Fortsettelsespunkt",
@@ -492,9 +492,9 @@
     "TooltipDislike": "Misliker",
     "TooltipPlayed": "Sett",
     "ValueSeriesYearToPresent": "{0}-Present",
-    "ValueAwards": "Awards: {0}",
+    "ValueAwards": "Priser: {0}",
-    "ValueBudget": "Budget: {0}",
+    "ValueBudget": "Budsjett: {0}",
-    "ValueRevenue": "Revenue: {0}",
+    "ValueRevenue": "Inntjening: {0}",
     "ValuePremiered": "Premiered {0}",
     "ValuePremieres": "Premieres {0}",
     "ValueStudio": "Studio: {0}",
@@ -514,7 +514,7 @@
     "MediaInfoExposureTime": "Eksponeringstid",
     "MediaInfoFocalLength": "Brennvidde",
     "MediaInfoOrientation": "Orientering",
-    "MediaInfoIsoSpeedRating": "Iso speed rating",
+    "MediaInfoIsoSpeedRating": "ISO innstilling",
     "MediaInfoLatitude": "Breddegrad",
     "MediaInfoLongitude": "Lengdegrad",
     "MediaInfoShutterSpeed": "Lukkerhastighet",
@@ -541,8 +541,8 @@
     "MediaInfoForced": "Forced",
     "MediaInfoExternal": "Ekstern",
     "MediaInfoTimestamp": "Timestamp",
-    "MediaInfoPixelFormat": "Pixel format",
+    "MediaInfoPixelFormat": "Pikselformat",
-    "MediaInfoBitDepth": "Bit depth",
+    "MediaInfoBitDepth": "Bitdybde",
     "MediaInfoSampleRate": "Sample rate",
     "MediaInfoBitrate": "Bitrate",
     "MediaInfoChannels": "Kanaler",
@@ -578,8 +578,8 @@
     "WebClientTourMetadataManager": "Klikk rediger for \u00e5 \u00e5pne metadata behandleren",
     "WebClientTourPlaylists": "Du kan enkelt lage spillelister og direktemikser, og spille dem p\u00e5 hvilken som helst enhet",
     "WebClientTourCollections": "Lag dine egne samlebokser",
-    "WebClientTourUserPreferences1": "User preferences allow you to customize the way your library is presented in all of your Media Browser apps",
+    "WebClientTourUserPreferences1": "Brukerpreferanser lar deg tilpasse m\u00e5ten biblioteket er presentert i alle Media Browser apper",
-    "WebClientTourUserPreferences2": "Configure your audio and subtitle language settings once, for every Media Browser app",
+    "WebClientTourUserPreferences2": "Konfigurer spr\u00e5kpreferanse for lyd og undertekst en gang, for hver media nettleser app",
     "WebClientTourUserPreferences3": "Utform webklient startsiden slik du \u00f8nsker",
     "WebClientTourUserPreferences4": "Konfigurer bakgrunner, tema sanger og eksterne avspillere",
     "WebClientTourMobile1": "Webklienten fungerer bra p\u00e5 smarttelefoner og nettbrett ...",

MediaBrowser.Server.Implementations/Localization/Server/ar.json

@@ -33,7 +33,7 @@
     "LabelRunningTimeValue": "Running time: {0}",
     "TitleMediaBrowser": "\u0645\u064a\u062f\u064a\u0627 \u0628\u0631\u0627\u0648\u0632\u0631",
     "LabelIpAddressValue": "Ip address: {0}",
-    "ThisWizardWillGuideYou": "\u0645\u0631\u0634\u062f \u0627\u0644\u0627\u0639\u062f\u0627\u062f\u0627\u062a \u0633\u064a\u0633\u0627\u0639\u062f\u0643 \u062e\u0644\u0627\u0644 \u062e\u0637\u0648\u0627\u062a \u0639\u0645\u0644\u064a\u0629 \u0627\u0644\u0627\u0639\u062f\u0627\u062f\u0627\u062a.",
+    "ThisWizardWillGuideYou": "\u0645\u0631\u0634\u062f \u0627\u0644\u0627\u0639\u062f\u0627\u062f\u0627\u062a \u0633\u064a\u0633\u0627\u0639\u062f\u0643 \u062e\u0644\u0627\u0644 \u062e\u0637\u0648\u0627\u062a \u0639\u0645\u0644\u064a\u0629 \u0627\u0644\u0627\u0639\u062f\u0627\u062f\u0627\u062a. \u0644\u0644\u0628\u062f\u0621, \u0627\u0644\u0631\u062c\u0627\u0621 \u0627\u062e\u062a\u064a\u0627\u0631 \u0644\u063a\u062a\u0643 \u0627\u0644\u0645\u0641\u0636\u0644\u0629.",
     "UserConfigurationUpdatedWithName": "User configuration has been updated for {0}",
     "TellUsAboutYourself": "\u0627\u062e\u0628\u0631\u0646\u0627 \u0639\u0646 \u0646\u0641\u0633\u0643",
     "UserCreatedWithName": "User {0} has been created",
@@ -307,7 +307,7 @@
     "LabelExternalPlayersHelp": "Display buttons to play content in external players. This is only available on devices that support url schemes, generally Android and iOS. With external players there is generally no support for remote control or resuming.",
     "HeaderSubtitleProfile": "Subtitle Profile",
     "ScheduledTasksHelp": "Click a task to adjust its schedule.",
-    "ScheduledTasksTitle": "Scheduled Tasks",
+    "ScheduledTasksTitle": "\u062c\u062f\u0648\u0644\u0629 \u0627\u0644\u0645\u0647\u0627\u0645",
     "HeaderSubtitleProfiles": "Subtitle Profiles",
     "HeaderSubtitleProfilesHelp": "Subtitle profiles describe the subtitle formats supported by the device.",
     "TabMyPlugins": "My Plugins",
@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Theme Video",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Movies",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Studios",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Latest Movies",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Latest Trailers",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Special Features",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "IMDb Rating",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Parental Rating",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "\u062a\u0627\u0631\u064a\u062e \u0627\u0644\u0639\u0631\u0636",
     "TabBasic": "Basic",
     "TabAdvanced": "Advanced",
@@ -379,13 +384,13 @@
     "OptionContinuing": "Continuing",
     "OptionEnded": "Ended",
     "HeaderAirDays": "Air Days",
-    "OptionSunday": "Sunday",
+    "OptionSunday": "\u0627\u0644\u0627\u062d\u062f",
-    "OptionMonday": "Monday",
+    "OptionMonday": "\u0627\u0644\u0627\u062b\u0646\u064a\u0646",
-    "OptionTuesday": "Tuesday",
+    "OptionTuesday": "\u0627\u0644\u062b\u0644\u0627\u062b\u0627\u0621",
-    "OptionWednesday": "Wednesday",
+    "OptionWednesday": "\u0627\u0644\u0627\u0631\u0628\u0639\u0627\u0621",
-    "OptionThursday": "Thursday",
+    "OptionThursday": "\u0627\u0644\u062e\u0645\u064a\u0633",
-    "OptionFriday": "Friday",
+    "OptionFriday": "\u0627\u0644\u062c\u0645\u0639\u0629",
-    "OptionSaturday": "Saturday",
+    "OptionSaturday": "\u0627\u0644\u0633\u0628\u062a",
     "HeaderManagement": "Management",
     "LabelManagement": "Management:",
     "OptionMissingImdbId": "Missing IMDb Id",

MediaBrowser.Server.Implementations/Localization/Server/ca.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Theme Video",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Movies",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Studios",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Latest Movies",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Latest Trailers",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Special Features",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "IMDb Rating",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Parental Rating",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Premiere Date",
     "TabBasic": "Basic",
     "TabAdvanced": "Advanced",

MediaBrowser.Server.Implementations/Localization/Server/cs.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Tematick\u00e9 video",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Filmy",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Studia",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Uk\u00e1zky\/trailery",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Posledn\u00ed filmy",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Posledn\u00ed uk\u00e1zky\/trailery",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Speci\u00e1ln\u00ed funkce",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "Hodnocen\u00ed IMDb",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Rodi\u010dovsk\u00e9 hodnocen\u00ed",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Datum premi\u00e9ry",
     "TabBasic": "Z\u00e1kladn\u00ed",
     "TabAdvanced": "Pokro\u010dil\u00e9",

MediaBrowser.Server.Implementations/Localization/Server/da.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Tema Video",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Film",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Studier",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Trailere",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Seneste Film",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Seneste Trailere",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Specielle Egenskaber",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "IMDB Bed\u00f8mmelse",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Parental Rating",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Pr\u00e6miere Dato",
     "TabBasic": "Simpel",
     "TabAdvanced": "Advanceret",

MediaBrowser.Server.Implementations/Localization/Server/de.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Titelvideo",
     "LabelEnableIntroParentalControlHelp": "Es werden nur Trailer ausgew\u00e4hlt, die der Altersfreigabe des Inhalts entsprechen der angesehen wird.",
     "TabMovies": "Filme",
-    "LabelThisFeatureRequiresSupporterHelp": "Diese Funktion ben\u00f6tigt eine aktive Unterst\u00fctzer Mitgliedschaft.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "Diese Funktion ben\u00f6tigt eine aktive Unterst\u00fctzer Mitgliedschaft und die Installation des Trailer Channel Plugins.",
     "TabStudios": "Studios",
     "OptionTrailersFromMyMoviesHelp": "Ben\u00f6tigt die Einrichtung lokaler Trailer.",
     "TabTrailers": "Trailer",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Trenne mehrere Eintr\u00e4ge durch ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Neueste Filme",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet Trailer:",
     "HeaderLatestTrailers": "Neueste Trailer",
+    "OptionUpcomingDvdMovies": "Beinhaltet Trailer von neuen und erscheinenden Filmen auf DVD & Blu-ray",
     "OptionHasSpecialFeatures": "Besonderes Merkmal",
+    "OptionUpcomingStreamingMovies": "Beinhaltet Trailer von neuen und erscheinenden Filmen auf Netflix",
     "OptionImdbRating": "IMDb Bewertung",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Zeigt Trailer innerhalb von Filmvorschl\u00e4gen",
     "OptionParentalRating": "Altersfreigabe",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Ben\u00f6tigt die Installation des Trailer Channels.",
     "OptionPremiereDate": "Premiere",
     "TabBasic": "Einfach",
     "TabAdvanced": "Erweitert",

MediaBrowser.Server.Implementations/Localization/Server/el.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Theme Video",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Movies",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Studios",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Latest Movies",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Latest Trailers",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Special Features",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "IMDb Rating",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Parental Rating",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Premiere Date",
     "TabBasic": "Basic",
     "TabAdvanced": "Advanced",

MediaBrowser.Server.Implementations/Localization/Server/en_GB.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Theme Video",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Movies",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Studios",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Latest Movies",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Latest Trailers",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Special Features",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "IMDb Rating",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Parental Rating",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Premiere Date",
     "TabBasic": "Basic",
     "TabAdvanced": "Advanced",

MediaBrowser.Server.Implementations/Localization/Server/en_US.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Theme Video",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Movies",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Studios",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Latest Movies",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Latest Trailers",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Special Features",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "IMDb Rating",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Parental Rating",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Premiere Date",
     "TabBasic": "Basic",
     "TabAdvanced": "Advanced",

MediaBrowser.Server.Implementations/Localization/Server/es.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Viideotema",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Pel\u00edculas",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Estudios",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "\u00daltimas pel\u00edculas",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "\u00daltimos trailers",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Caracter\u00edsticas especiales",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "Valoraci\u00f3n IMDb",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Clasificaci\u00f3n parental",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Fecha de estreno",
     "TabBasic": "B\u00e1sico",
     "TabAdvanced": "Avanzado",

MediaBrowser.Server.Implementations/Localization/Server/es_MX.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Video del Tema",
     "LabelEnableIntroParentalControlHelp": "Los avances s\u00f3lo ser\u00e1n seleccionados con una clasificaci\u00f3n parental igual o menor a la del contenido que se est\u00e1 reproduciendo.",
     "TabMovies": "Pel\u00edculas",
-    "LabelThisFeatureRequiresSupporterHelp": "Esta caracter\u00edstica requiere de una membres\u00eda de aficionado activa.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "Estas caractwr\u00edsticas requieren de una membres\u00eda de aficionado activa y de la instalaci\u00f3n del complemento del canal de avances.",
     "TabStudios": "Estudios",
     "OptionTrailersFromMyMoviesHelp": "Requiere configurar avances locales.",
     "TabTrailers": "Avances",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separar m\u00faltiples empleando:",
     "ValueSpecialEpisodeName": "Especial: {0}",
     "HeaderLatestMovies": "Pel\u00edculas Recientes",
+    "LabelSelectInternetTrailersForCinemaMode": "Avances de Internet",
     "HeaderLatestTrailers": "Avances Recientes",
+    "OptionUpcomingDvdMovies": "Incluir avances de pel\u00edculas en DVD y Blu-ray nuevas y por estrenar",
     "OptionHasSpecialFeatures": "Caracter\u00edsticas Especiales",
+    "OptionUpcomingStreamingMovies": "Incluir avances de pel\u00edculas nuevas o por estrenar en Netflix",
     "OptionImdbRating": "Calificaci\u00f3n de IMDb",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Desplegar avances dentro de las sugerencias de pel\u00edculas",
     "OptionParentalRating": "Clasificaci\u00f3n Parental",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requiere la instalaci\u00f3n del canal de avances.",
     "OptionPremiereDate": "Fecha de Estreno",
     "TabBasic": "B\u00e1sico",
     "TabAdvanced": "Avanzado",

MediaBrowser.Server.Implementations/Localization/Server/fr.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Vid\u00e9o th\u00e8me",
     "LabelEnableIntroParentalControlHelp": "Les bandes-annonces ne pourront \u00eatre s\u00e9lectionn\u00e9es qu'avec un niveau d'acc\u00e8s \u00e9gal ou inf\u00e9rieur \u00e0 celui du contenu \u00e0 visionner.",
     "TabMovies": "Films",
-    "LabelThisFeatureRequiresSupporterHelp": "Ce plugin requiert un compte supporter actif.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Studios",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Bandes-annonces",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Usage multiple s\u00e9par\u00e9 ;",
     "ValueSpecialEpisodeName": "Sp\u00e9cial - {0}",
     "HeaderLatestMovies": "Films les plus r\u00e9cents",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Derni\u00e8res bandes-annonces",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Bonus",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "Note IMDb",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Note d'\u00e9valuation de contr\u00f4le parental",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Date de la premi\u00e8re",
     "TabBasic": "Standard",
     "TabAdvanced": "Avanc\u00e9",

MediaBrowser.Server.Implementations/Localization/Server/he.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "\u05e1\u05e8\u05d8 \u05e0\u05d5\u05e9\u05d0",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "\u05e1\u05e8\u05d8\u05d9\u05dd",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "\u05d0\u05d5\u05dc\u05e4\u05e0\u05d9\u05dd",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "\u05d8\u05e8\u05d9\u05d9\u05dc\u05e8\u05d9\u05dd",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "\u05e1\u05e8\u05d8\u05d9\u05dd \u05d0\u05d7\u05e8\u05d5\u05e0\u05d9\u05dd",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "\u05d8\u05e8\u05d9\u05d9\u05dc\u05d9\u05e8\u05d9\u05dd \u05d0\u05d7\u05e8\u05d5\u05e0\u05d9\u05dd",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "\u05de\u05d0\u05e4\u05d9\u05d9\u05e0\u05d9\u05dd \u05de\u05d9\u05d5\u05d7\u05d3\u05d9\u05dd",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "\u05d3\u05d9\u05e8\u05d5\u05d2 IMDb",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "\u05d3\u05d9\u05e8\u05d5\u05d2 \u05d1\u05e7\u05e8\u05ea \u05d4\u05d5\u05e8\u05d9\u05dd",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "\u05ea\u05d0\u05e8\u05d9\u05da \u05e9\u05d9\u05d3\u05d5\u05e8 \u05e8\u05d0\u05e9\u05d5\u05df",
     "TabBasic": "\u05d1\u05e1\u05d9\u05e1\u05d9",
     "TabAdvanced": "\u05de\u05ea\u05e7\u05d3\u05dd",

MediaBrowser.Server.Implementations/Localization/Server/hr.json

@@ -72,7 +72,7 @@
     "OptionComposers": "Composers",
     "ButtonCancel": "Odustani",
     "OptionOthers": "Others",
-    "ButtonNew": "New",
+    "ButtonNew": "Novo",
     "HeaderSetupLibrary": "Postavi svoju medijsku biblioteku",
     "HeaderDownloadPeopleMetadataForHelp": "Enabling additional options will provide more on-screen information but will result in slower library scans.",
     "ButtonAddMediaFolder": "Dodaj mapu sa medijem",
@@ -109,11 +109,11 @@
     "OptionAddMissingDataOnly": "Add missing data only",
     "TabMetadata": "Metadata",
     "OptionLocalRefreshOnly": "Local refresh only",
-    "TabImages": "Images",
+    "TabImages": "Slike",
     "HeaderRefreshMetadata": "Refresh Metadata",
     "TabNotifications": "Notifications",
     "HeaderPersonInfo": "Person Info",
-    "TabCollectionTitles": "Titles",
+    "TabCollectionTitles": "Naslovi",
     "HeaderIdentifyItem": "Identify Item",
     "LabelDisplayMissingEpisodesWithinSeasons": "Prika\u017ei epizode koje nedostaju unutar sezone",
     "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
@@ -291,7 +291,7 @@
     "XmlDocumentAttributeListHelp": "These attributes are applied to the root element of every xml response.",
     "OptionPoster": "Poster",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
-    "OptionBackdrop": "Backdrop",
+    "OptionBackdrop": "Pozadina",
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTimeline": "Vremenska linija",
     "LabelExtractChaptersDuringLibraryScanHelp": "If enabled, chapter images will be extracted when videos are imported during the library scan. If disabled they will be extracted during the chapter images scheduled task, allowing the regular library scan to complete faster.",
@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Video teme",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Filmovi",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Studio",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Zadnji Filmovi",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Zadnji trailersi",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Specijalne opcije",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "IMDb ocjena",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Roditeljska ocjena",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Datum premijere",
     "TabBasic": "Osnovno",
     "TabAdvanced": "Napredno",
@@ -515,212 +520,212 @@
     "ButtonEdit": "Izmjeni",
     "ButtonRecord": "Snimi",
     "ButtonDelete": "Izbri\u0161i",
-    "ButtonRemove": "Remove",
+    "ButtonRemove": "Ukloni",
     "OptionRecordSeries": "Snimi serije",
     "HeaderDetails": "Detalji",
-    "TitleLiveTV": "Live TV",
+    "TitleLiveTV": "TV",
-    "LabelNumberOfGuideDays": "Number of days of guide data to download:",
+    "LabelNumberOfGuideDays": "Broj dana TV vodi\u010da za preuzet:",
-    "LabelNumberOfGuideDaysHelp": "Downloading more days worth of guide data provides the ability to schedule out further in advance and view more listings, but it will also take longer to download. Auto will choose based on the number of channels.",
+    "LabelNumberOfGuideDaysHelp": "Preuzimanje vi\u0161e dana TV vodi\u010da, omogu\u0107iti \u0107e vam zakazivanje snimanja dalje u budu\u0107nost , ali \u0107e i preuzimanje du\u017ee trajati. Automaski - odabir \u0107e se prilagoditi broju kanala.",
-    "LabelActiveService": "Active Service:",
+    "LabelActiveService": "Aktivne usluge:",
-    "LabelActiveServiceHelp": "Multiple tv plugins can be installed but only one can be active at a time.",
+    "LabelActiveServiceHelp": "Vi\u0161e TV dodataka mo\u017ee biti instalirano ali samo jedan mo\u017ee biti aktivan u isto vrijeme.",
-    "OptionAutomatic": "Auto",
+    "OptionAutomatic": "Automatski",
-    "LiveTvPluginRequired": "A Live TV service provider plugin is required in order to continue.",
+    "LiveTvPluginRequired": "TV u\u017eivo usluga je obavezna ako \u017eelite nastaviti.",
-    "LiveTvPluginRequiredHelp": "Please install one of our available plugins, such as Next Pvr or ServerWmc.",
+    "LiveTvPluginRequiredHelp": "Molimo instalirajte jedan od dostupnih dodataka, kaoo \u0161to su Next Pvr ili ServerWmc.",
     "LabelCustomizeOptionsPerMediaType": "Customize for media type:",
-    "OptionDownloadThumbImage": "Thumb",
+    "OptionDownloadThumbImage": "Sli\u010dica",
-    "OptionDownloadMenuImage": "Menu",
+    "OptionDownloadMenuImage": "Meni",
     "OptionDownloadLogoImage": "Logo",
-    "OptionDownloadBoxImage": "Box",
+    "OptionDownloadBoxImage": "Kutija",
-    "OptionDownloadDiscImage": "Disc",
+    "OptionDownloadDiscImage": "Disk",
-    "OptionDownloadBannerImage": "Banner",
+    "OptionDownloadBannerImage": "Zaglavlje",
-    "OptionDownloadBackImage": "Back",
+    "OptionDownloadBackImage": "Druga str.",
-    "OptionDownloadArtImage": "Art",
+    "OptionDownloadArtImage": "Grafike",
-    "OptionDownloadPrimaryImage": "Primary",
+    "OptionDownloadPrimaryImage": "Primarno",
-    "HeaderFetchImages": "Fetch Images:",
+    "HeaderFetchImages": "Dohvati slike:",
-    "HeaderImageSettings": "Image Settings",
+    "HeaderImageSettings": "Postavke slike",
     "TabOther": "Other",
-    "LabelMaxBackdropsPerItem": "Maximum number of backdrops per item:",
+    "LabelMaxBackdropsPerItem": "Maksimalni broj pozadina po stavci:",
-    "LabelMaxScreenshotsPerItem": "Maximum number of screenshots per item:",
+    "LabelMaxScreenshotsPerItem": "Maksimalni broj isje\u010daka po stavci:",
-    "LabelMinBackdropDownloadWidth": "Minimum backdrop download width:",
+    "LabelMinBackdropDownloadWidth": "Minimalna \u0161irina pozadine za preuzimanje:",
-    "LabelMinScreenshotDownloadWidth": "Minimum screenshot download width:",
+    "LabelMinScreenshotDownloadWidth": "Minimalna \u0161irina isje\u010dka za preuzimanje:",
-    "ButtonAddScheduledTaskTrigger": "Add Task Trigger",
+    "ButtonAddScheduledTaskTrigger": "Dodaj pokreta\u010d zadatka",
-    "HeaderAddScheduledTaskTrigger": "Add Task Trigger",
+    "HeaderAddScheduledTaskTrigger": "Dodaj pokreta\u010d zadatka",
-    "ButtonAdd": "Add",
+    "ButtonAdd": "Dodaj",
-    "LabelTriggerType": "Trigger Type:",
+    "LabelTriggerType": "Tip pokreta\u010da:",
-    "OptionDaily": "Daily",
+    "OptionDaily": "Dnevno",
-    "OptionWeekly": "Weekly",
+    "OptionWeekly": "Tjedno",
-    "OptionOnInterval": "On an interval",
+    "OptionOnInterval": "U intervalu",
-    "OptionOnAppStartup": "On application startup",
+    "OptionOnAppStartup": "Kada se aplikacija pokrene",
-    "OptionAfterSystemEvent": "After a system event",
+    "OptionAfterSystemEvent": "Nakon doga\u0111aja u sistemu",
-    "LabelDay": "Day:",
+    "LabelDay": "Dan:",
-    "LabelTime": "Time:",
+    "LabelTime": "Vrijeme:",
-    "LabelEvent": "Event:",
+    "LabelEvent": "Doga\u0111aj:",
-    "OptionWakeFromSleep": "Wake from sleep",
+    "OptionWakeFromSleep": "Pokreni iz stanja mirovanja",
-    "LabelEveryXMinutes": "Every:",
+    "LabelEveryXMinutes": "Svaki:",
-    "HeaderTvTuners": "Tuners",
+    "HeaderTvTuners": "TV ure\u0111aji",
-    "HeaderGallery": "Gallery",
+    "HeaderGallery": "Galerija",
-    "HeaderLatestGames": "Latest Games",
+    "HeaderLatestGames": "Zadnje igrice",
-    "HeaderRecentlyPlayedGames": "Recently Played Games",
+    "HeaderRecentlyPlayedGames": "Zadnje igrane igrice",
-    "TabGameSystems": "Game Systems",
+    "TabGameSystems": "Sistemi igrica",
-    "TitleMediaLibrary": "Media Library",
+    "TitleMediaLibrary": "Medijska bibilioteka",
-    "TabFolders": "Folders",
+    "TabFolders": "Mapa",
-    "TabPathSubstitution": "Path Substitution",
+    "TabPathSubstitution": "Zamjenska putanja",
-    "LabelSeasonZeroDisplayName": "Season 0 display name:",
+    "LabelSeasonZeroDisplayName": "Prikaz naziva Sezona 0:",
-    "LabelEnableRealtimeMonitor": "Enable real time monitoring",
+    "LabelEnableRealtimeMonitor": "Omogu\u0107i nadgledanje u realnom vremenu",
-    "LabelEnableRealtimeMonitorHelp": "Changes will be processed immediately, on supported file systems.",
+    "LabelEnableRealtimeMonitorHelp": "Promjene \u0107e biti procesuirane odmah, nad podr\u017eanim datotekama sistema.",
-    "ButtonScanLibrary": "Scan Library",
+    "ButtonScanLibrary": "Skeniraj biblioteku",
-    "HeaderNumberOfPlayers": "Players:",
+    "HeaderNumberOfPlayers": "Izvo\u0111a\u010di:",
-    "OptionAnyNumberOfPlayers": "Any",
+    "OptionAnyNumberOfPlayers": "Bilo koji",
     "Option1Player": "1+",
     "Option2Player": "2+",
     "Option3Player": "3+",
     "Option4Player": "4+",
-    "HeaderMediaFolders": "Media Folders",
+    "HeaderMediaFolders": "Medijska mapa",
-    "HeaderThemeVideos": "Theme Videos",
+    "HeaderThemeVideos": "Tema Videa",
-    "HeaderThemeSongs": "Theme Songs",
+    "HeaderThemeSongs": "Pjesme tema",
-    "HeaderScenes": "Scenes",
+    "HeaderScenes": "Scene",
-    "HeaderAwardsAndReviews": "Awards and Reviews",
+    "HeaderAwardsAndReviews": "Nagrade i recenzije",
-    "HeaderSoundtracks": "Soundtracks",
+    "HeaderSoundtracks": "Filmska glazba",
-    "HeaderMusicVideos": "Music Videos",
+    "HeaderMusicVideos": "Muzi\u010dki spotovi",
-    "HeaderSpecialFeatures": "Special Features",
+    "HeaderSpecialFeatures": "Specijalne zna\u010dajke",
-    "HeaderCastCrew": "Cast & Crew",
+    "HeaderCastCrew": "Glumci i ekipa",
-    "HeaderAdditionalParts": "Additional Parts",
+    "HeaderAdditionalParts": "Dodatni djelovi",
-    "ButtonSplitVersionsApart": "Split Versions Apart",
+    "ButtonSplitVersionsApart": "Razdvoji verzije",
     "ButtonPlayTrailer": "Trailer",
-    "LabelMissing": "Missing",
+    "LabelMissing": "Nedostaje",
-    "LabelOffline": "Offline",
+    "LabelOffline": "Nedostupno",
-    "PathSubstitutionHelp": "Path substitutions are used for mapping a path on the server to a path that clients are able to access. By allowing clients direct access to media on the server they may be able to play them directly over the network and avoid using server resources to stream and transcode them.",
+    "PathSubstitutionHelp": "Zamjenske putanje se koriste za mapiranje putanja na serveru na putanje kojima \u0107e kljenti mo\u0107i pristupiti. Dupu\u0161taju\u0107i kljentima direktan pristup medijima na serveru imaju mogu\u0107nost izvoditi sadr\u017eaj direktno preko mre\u017ee i tako ne iskori\u0161tavati resurse servera za koverziju i reprodukciju istih.",
-    "HeaderFrom": "From",
+    "HeaderFrom": "Od",
-    "HeaderTo": "To",
+    "HeaderTo": "Za",
-    "LabelFrom": "From:",
+    "LabelFrom": "Od:",
-    "LabelFromHelp": "Example: D:\\Movies (on the server)",
+    "LabelFromHelp": "Primjer: D:\\Filmovi (na serveru)",
-    "LabelTo": "To:",
+    "LabelTo": "Za:",
-    "LabelToHelp": "Example: \\\\MyServer\\Movies (a path clients can access)",
+    "LabelToHelp": "Primjer: \\\\MojServer\\Filmovi (putanja kojoj kljent mo\u017ee pristupiti)",
-    "ButtonAddPathSubstitution": "Add Substitution",
+    "ButtonAddPathSubstitution": "Dodaj zamjenu",
-    "OptionSpecialEpisode": "Specials",
+    "OptionSpecialEpisode": "Specijal",
-    "OptionMissingEpisode": "Missing Episodes",
+    "OptionMissingEpisode": "Epizode koje nedostaju",
-    "OptionUnairedEpisode": "Unaired Episodes",
+    "OptionUnairedEpisode": "Ne emitirane epizode",
-    "OptionEpisodeSortName": "Episode Sort Name",
+    "OptionEpisodeSortName": "Slo\u017ei epizode po",
-    "OptionSeriesSortName": "Series Name",
+    "OptionSeriesSortName": "Nazivu serijala",
-    "OptionTvdbRating": "Tvdb Rating",
+    "OptionTvdbRating": "Ocjeni Tvdb",
-    "HeaderTranscodingQualityPreference": "Transcoding Quality Preference:",
+    "HeaderTranscodingQualityPreference": "Postavke kvalitete konverzije:",
-    "OptionAutomaticTranscodingHelp": "The server will decide quality and speed",
+    "OptionAutomaticTranscodingHelp": "Server \u0107e odlu\u010diti o kvaliteti i brzini",
-    "OptionHighSpeedTranscodingHelp": "Lower quality, but faster encoding",
+    "OptionHighSpeedTranscodingHelp": "Slabija kvaliteta, ali br\u017ea konverzija",
-    "OptionHighQualityTranscodingHelp": "Higher quality, but slower encoding",
+    "OptionHighQualityTranscodingHelp": "Bolja kvaliteta, ali sporija konverzija",
-    "OptionMaxQualityTranscodingHelp": "Best quality with slower encoding and high CPU usage",
+    "OptionMaxQualityTranscodingHelp": "Najbolja kvaliteta sa sporom konverzijom i velikim optere\u0107enjem za procesor",
-    "OptionHighSpeedTranscoding": "Higher speed",
+    "OptionHighSpeedTranscoding": "Ve\u0107a brzina",
-    "OptionHighQualityTranscoding": "Higher quality",
+    "OptionHighQualityTranscoding": "Ve\u0107a kvaliteta",
-    "OptionMaxQualityTranscoding": "Max quality",
+    "OptionMaxQualityTranscoding": "Maksimalna kvaliteta",
-    "OptionEnableDebugTranscodingLogging": "Enable debug transcoding logging",
+    "OptionEnableDebugTranscodingLogging": "Omogu\u0107i logiranje pogre\u0161aka prilikom konverzije",
-    "OptionEnableDebugTranscodingLoggingHelp": "This will create very large log files and is only recommended as needed for troubleshooting purposes.",
+    "OptionEnableDebugTranscodingLoggingHelp": "Ovo \u0107e kreirati iznimno velike log datoteke i jedino se preporu\u010da koristiti u slu\u010daju problema sa konverzijom.",
-    "OptionUpscaling": "Allow clients to request upscaled video",
+    "OptionUpscaling": "Dopusti kljentima da zatra\u017ee pobolj\u0161anje video zapisa",
-    "OptionUpscalingHelp": "In some cases this will result in improved video quality but will increase CPU usage.",
+    "OptionUpscalingHelp": "U nekim slu\u010dajevima ovo \u0107e rezultirati pobolj\u0161anjem video zapisa ali \u0107e pove\u0107ati optere\u010denje procesora.",
-    "EditCollectionItemsHelp": "Add or remove any movies, series, albums, books or games you wish to group within this collection.",
+    "EditCollectionItemsHelp": "Dodaj ili ukloni bilo koje filmove, serije, albume, knjige ili igrice koje \u017eeli\u0161 grupirati u ovu kolekciju.",
-    "HeaderAddTitles": "Add Titles",
+    "HeaderAddTitles": "Dodaj naslove",
-    "LabelEnableDlnaPlayTo": "Enable DLNA Play To",
+    "LabelEnableDlnaPlayTo": "Omogu\u0107i DLNA izvo\u0111enje na",
-    "LabelEnableDlnaPlayToHelp": "Media Browser can detect devices within your network and offer the ability to remote control them.",
+    "LabelEnableDlnaPlayToHelp": "Media Browser mo\u017ee na\u0107i ure\u0111aje na va\u0161oj mre\u017ei i ponuditi vam da ih kontrolirate sa udaljene lokacije.",
-    "LabelEnableDlnaDebugLogging": "Enable DLNA debug logging",
+    "LabelEnableDlnaDebugLogging": "Omogu\u0107i DLNA logiranje gre\u0161aka.",
-    "LabelEnableDlnaDebugLoggingHelp": "This will create large log files and should only be used as needed for troubleshooting purposes.",
+    "LabelEnableDlnaDebugLoggingHelp": "Ovo \u0107e kreirati iznimno velike log datoteke i jedino se preporu\u010da koristiti u slu\u010daju problema.",
-    "LabelEnableDlnaClientDiscoveryInterval": "Client discovery interval (seconds)",
+    "LabelEnableDlnaClientDiscoveryInterval": "Interval za otkrivanje kljenata (sekunde)",
-    "LabelEnableDlnaClientDiscoveryIntervalHelp": "Determines the duration in seconds between SSDP searches performed by Media Browser.",
+    "LabelEnableDlnaClientDiscoveryIntervalHelp": "Odre\u0111uje trajanje u sekundama izme\u0111u SSDP pretraga pokrenutih od Media Browsera.",
-    "HeaderCustomDlnaProfiles": "Custom Profiles",
+    "HeaderCustomDlnaProfiles": "Prilago\u0111en profil",
-    "HeaderSystemDlnaProfiles": "System Profiles",
+    "HeaderSystemDlnaProfiles": "Sistemski profil",
-    "CustomDlnaProfilesHelp": "Create a custom profile to target a new device or override a system profile.",
+    "CustomDlnaProfilesHelp": "Kreiraj prilago\u0111eni profili za novi ure\u0111aj ili doradi neki od sistemskih profila.",
-    "SystemDlnaProfilesHelp": "System profiles are read-only. Changes to a system profile will be saved to a new custom profile.",
+    "SystemDlnaProfilesHelp": "Sistemski profili su samo za \u010ditanje. Bilo kakve izmjene na sistemskom profilu biti \u0107e snimljene kao novi prilago\u0111eni profil.",
-    "TitleDashboard": "Dashboard",
+    "TitleDashboard": "Nadzorna plo\u010da",
-    "TabHome": "Home",
+    "TabHome": "Po\u010detna",
     "TabInfo": "Info",
-    "HeaderLinks": "Links",
+    "HeaderLinks": "Poveznice",
-    "HeaderSystemPaths": "System Paths",
+    "HeaderSystemPaths": "Sistemska putanja",
-    "LinkCommunity": "Community",
+    "LinkCommunity": "Zajednica",
     "LinkGithub": "Github",
-    "LinkApiDocumentation": "Api Documentation",
+    "LinkApiDocumentation": "Api dokumentacija",
-    "LabelFriendlyServerName": "Friendly server name:",
+    "LabelFriendlyServerName": "Prijateljsko ime servera:",
-    "LabelFriendlyServerNameHelp": "This name will be used to identify this server. If left blank, the computer name will be used.",
+    "LabelFriendlyServerNameHelp": "Ovo ime \u0107e se koristiti za identifikaciju servera. Ako ostavite prazno, ime ra\u010dunala \u0107e se koristi kao identifikator.",
-    "LabelPreferredDisplayLanguage": "Preferred display language",
+    "LabelPreferredDisplayLanguage": "\u017deljeni jezik prikaza",
-    "LabelPreferredDisplayLanguageHelp": "Translating Media Browser is an ongoing project and is not yet complete.",
+    "LabelPreferredDisplayLanguageHelp": "Prevo\u0111enje Media Browsera je projekt u tjeku i nije jo\u0161 zavr\u0161en.",
-    "LabelReadHowYouCanContribute": "Read about how you can contribute.",
+    "LabelReadHowYouCanContribute": "Pro\u010ditajte kako mo\u017eete doprinjeti.",
-    "HeaderNewCollection": "New Collection",
+    "HeaderNewCollection": "Nova kolekcija",
     "HeaderAddToCollection": "Add to Collection",
     "ButtonSubmit": "Submit",
-    "NewCollectionNameExample": "Example: Star Wars Collection",
+    "NewCollectionNameExample": "Naprimjer: Star Wars Kolekcija",
-    "OptionSearchForInternetMetadata": "Search the internet for artwork and metadata",
+    "OptionSearchForInternetMetadata": "Potra\u017ei na internetu grafike i metadata",
-    "ButtonCreate": "Create",
+    "ButtonCreate": "Kreiraj",
-    "LabelHttpServerPortNumber": "Http server port number:",
+    "LabelHttpServerPortNumber": "Http port servera:",
-    "LabelWebSocketPortNumber": "Web socket port number:",
+    "LabelWebSocketPortNumber": "Port Web priklju\u010dka:",
-    "LabelEnableAutomaticPortHelp": "UPnP allows automated router configuration for remote access. This may not work with some router models.",
+    "LabelEnableAutomaticPortHelp": "UPnP omogu\u0107uje automatsku konfiguraciju usmjeriva\u010da (router \/ modem) za lak\u0161i pristup na daljinu. Ovo mo\u017eda ne\u0107e raditi sa nekim modelima usmjeriva\u010da.",
-    "LabelExternalDDNS": "External DDNS:",
+    "LabelExternalDDNS": "Vanjski DDNS:",
-    "LabelExternalDDNSHelp": "If you have a dynamic DNS enter it here. Media Browser apps will use it when connecting remotely.",
+    "LabelExternalDDNSHelp": "Ako imate dinami\u010dni DNS unesite ga ovdje. Media Browser aplikacije \u0107e ga koristiti kada se spajate sa udaljene lokacije.",
-    "TabResume": "Resume",
+    "TabResume": "Nastavi",
-    "TabWeather": "Weather",
+    "TabWeather": "Vrijeme",
-    "TitleAppSettings": "App Settings",
+    "TitleAppSettings": "Postavke aplikacije",
-    "LabelMinResumePercentage": "Min resume percentage:",
+    "LabelMinResumePercentage": "Minimalni postotak za nastavak:",
-    "LabelMaxResumePercentage": "Max resume percentage:",
+    "LabelMaxResumePercentage": "Maksimalni postotak za nastavak:",
-    "LabelMinResumeDuration": "Min resume duration (seconds):",
+    "LabelMinResumeDuration": "Minimalno trajanje za nastavak (sekunda):",
-    "LabelMinResumePercentageHelp": "Titles are assumed unplayed if stopped before this time",
+    "LabelMinResumePercentageHelp": "Naslovi \u0107e biti ozna\u010deni kao ne reproducirani ako se zaustave prije ovog vremena",
-    "LabelMaxResumePercentageHelp": "Titles are assumed fully played if stopped after this time",
+    "LabelMaxResumePercentageHelp": "Naslovi \u0107e biti ozna\u010deni kao pogledani ako budu zaustavljeni nakon ovog vremena",
-    "LabelMinResumeDurationHelp": "Titles shorter than this will not be resumable",
+    "LabelMinResumeDurationHelp": "Naslovi kra\u0107i od ovog ne\u0107e imati mogu\u0107nost nastavka",
-    "TitleAutoOrganize": "Auto-Organize",
+    "TitleAutoOrganize": "Auto-Organiziraj",
-    "TabActivityLog": "Activity Log",
+    "TabActivityLog": "Zapisnik aktivnosti",
-    "HeaderName": "Name",
+    "HeaderName": "Ime",
-    "HeaderDate": "Date",
+    "HeaderDate": "Datum",
-    "HeaderSource": "Source",
+    "HeaderSource": "Izvor",
-    "HeaderDestination": "Destination",
+    "HeaderDestination": "Cilj",
     "HeaderProgram": "Program",
-    "HeaderClients": "Clients",
+    "HeaderClients": "Kljenti",
-    "LabelCompleted": "Completed",
+    "LabelCompleted": "Zavr\u0161eno",
     "LabelFailed": "Failed",
-    "LabelSkipped": "Skipped",
+    "LabelSkipped": "Presko\u010deno",
-    "HeaderEpisodeOrganization": "Episode Organization",
+    "HeaderEpisodeOrganization": "Organizacija epizoda",
     "LabelSeries": "Series:",
-    "LabelSeasonNumber": "Season number:",
+    "LabelSeasonNumber": "Broj sezone:",
-    "LabelEpisodeNumber": "Episode number:",
+    "LabelEpisodeNumber": "Broj epizode:",
-    "LabelEndingEpisodeNumber": "Ending episode number:",
+    "LabelEndingEpisodeNumber": "Broj kraja epizode:",
-    "LabelEndingEpisodeNumberHelp": "Only required for multi-episode files",
+    "LabelEndingEpisodeNumberHelp": "Potrebno samo za datoteke sa vi\u0161e epizoda",
-    "HeaderSupportTheTeam": "Support the Media Browser Team",
+    "HeaderSupportTheTeam": "Podr\u017ei Media Browser tim",
-    "LabelSupportAmount": "Amount (USD)",
+    "LabelSupportAmount": "Iznos (USD)",
-    "HeaderSupportTheTeamHelp": "Help ensure the continued development of this project by donating. A portion of all donations will be contributed to other free tools we depend on.",
+    "HeaderSupportTheTeamHelp": "Pomozi donacijom i osiguraj daljnji razvoj ovog projekta. Dio donacija \u0107e biti preusmjereni za ostale besplatne alate o kojima ovisimo.",
-    "ButtonEnterSupporterKey": "Enter supporter key",
+    "ButtonEnterSupporterKey": "Unesi klju\u010d podr\u0161ke",
-    "DonationNextStep": "Once complete, please return and enter your supporter key, which you will receive by email.",
+    "DonationNextStep": "Nakon zavr\u0161etka molimo da se vratite i unesete klju\u010d podr\u0161ke koji \u0107e te primiti na email.",
-    "AutoOrganizeHelp": "Auto-organize monitors your download folders for new files and moves them to your media directories.",
+    "AutoOrganizeHelp": "Auto-Organizator nadgleda va\u0161u mapu za preuzimanja za nove datoteke i filmove te ih premje\u0161ta u mapu za medije.",
-    "AutoOrganizeTvHelp": "TV file organizing will only add episodes to existing series. It will not create new series folders.",
+    "AutoOrganizeTvHelp": "Organizator TV datoteka \u0107e samo dodati epizode za postoje\u0107e serije. Ne\u0107e napraviti mape za nove serije.",
-    "OptionEnableEpisodeOrganization": "Enable new episode organization",
+    "OptionEnableEpisodeOrganization": "Omogu\u0107i organizaciju novih epizoda",
-    "LabelWatchFolder": "Watch folder:",
+    "LabelWatchFolder": "Nadgledaj mapu:",
-    "LabelWatchFolderHelp": "The server will poll this folder during the 'Organize new media files' scheduled task.",
+    "LabelWatchFolderHelp": "Server \u0107e pregledati ovu mapu prilikom izvr\u0161avanja zakazanog zadatka 'Organizacije novih medijskih datoteka'.",
-    "ButtonViewScheduledTasks": "View scheduled tasks",
+    "ButtonViewScheduledTasks": "Pregledaj zakazane zadatke",
-    "LabelMinFileSizeForOrganize": "Minimum file size (MB):",
+    "LabelMinFileSizeForOrganize": "Minimalna veli\u010dina datoteke (MB):",
-    "LabelMinFileSizeForOrganizeHelp": "Files under this size will be ignored.",
+    "LabelMinFileSizeForOrganizeHelp": "Datoteke ispod ove veli\u010dine \u0107e biti ignorirane.",
-    "LabelSeasonFolderPattern": "Season folder pattern:",
+    "LabelSeasonFolderPattern": "Obrazac naziva mape - sezone:",
-    "LabelSeasonZeroFolderName": "Season zero folder name:",
+    "LabelSeasonZeroFolderName": "Obrazac naziva mape - Nulte sezone:",
-    "HeaderEpisodeFilePattern": "Episode file pattern",
+    "HeaderEpisodeFilePattern": "Obrazac naziva datoteke - Epizode",
-    "LabelEpisodePattern": "Episode pattern:",
+    "LabelEpisodePattern": "Obrazac epizode",
-    "LabelMultiEpisodePattern": "Multi-Episode pattern:",
+    "LabelMultiEpisodePattern": "Obrazac za vi\u0161e epizoda",
-    "HeaderSupportedPatterns": "Supported Patterns",
+    "HeaderSupportedPatterns": "Prihvatljivi obrasci",
-    "HeaderTerm": "Term",
+    "HeaderTerm": "Pojam",
-    "HeaderPattern": "Pattern",
+    "HeaderPattern": "Obrazac",
-    "HeaderResult": "Result",
+    "HeaderResult": "Rezultat",
-    "LabelDeleteEmptyFolders": "Delete empty folders after organizing",
+    "LabelDeleteEmptyFolders": "Izbri\u0161i prazne mape nakon organizacije",
-    "LabelDeleteEmptyFoldersHelp": "Enable this to keep the download directory clean.",
+    "LabelDeleteEmptyFoldersHelp": "Omogu\u0107i ovo kako bi mapa za preuzimanje bila '\u010dista'.",
-    "LabelDeleteLeftOverFiles": "Delete left over files with the following extensions:",
+    "LabelDeleteLeftOverFiles": "Izbri\u0161i zaostale datoteke sa sljede\u0107im ekstenzijama:",
-    "LabelDeleteLeftOverFilesHelp": "Separate with ;. For example: .nfo;.txt",
+    "LabelDeleteLeftOverFilesHelp": "Odvojite sa ;. Naprimjer: .nfo;.txt",
-    "OptionOverwriteExistingEpisodes": "Overwrite existing episodes",
+    "OptionOverwriteExistingEpisodes": "Presnimi preko postoje\u0107ih epizoda",
-    "LabelTransferMethod": "Transfer method",
+    "LabelTransferMethod": "Na\u010din prijenosa",
-    "OptionCopy": "Copy",
+    "OptionCopy": "Kopiraj",
-    "OptionMove": "Move",
+    "OptionMove": "Premjesti",
-    "LabelTransferMethodHelp": "Copy or move files from the watch folder",
+    "LabelTransferMethodHelp": "Kopiraj ili premjesti datoteke iz mape koju ste postavili da se nadzire",
-    "HeaderLatestNews": "Latest News",
+    "HeaderLatestNews": "Zadnje vijesti",
-    "HeaderHelpImproveMediaBrowser": "Help Improve Media Browser",
+    "HeaderHelpImproveMediaBrowser": "Pomozite nam pobolj\u0161ati Media Browser",
-    "HeaderRunningTasks": "Running Tasks",
+    "HeaderRunningTasks": "Zadatci koji se izvode",
-    "HeaderActiveDevices": "Active Devices",
+    "HeaderActiveDevices": "Aktivni ure\u0111aji",
-    "HeaderPendingInstallations": "Pending Installations",
+    "HeaderPendingInstallations": "Instalacije u toku",
-    "HeaerServerInformation": "Server Information",
+    "HeaerServerInformation": "Informacije servera",
-    "ButtonRestartNow": "Restart Now",
+    "ButtonRestartNow": "Ponovo pokreni sad",
-    "ButtonRestart": "Restart",
+    "ButtonRestart": "Ponovo pokreni",
-    "ButtonShutdown": "Shutdown",
+    "ButtonShutdown": "Ugasi",
-    "ButtonUpdateNow": "Update Now",
+    "ButtonUpdateNow": "A\u017euriraj sad",
-    "PleaseUpdateManually": "Please shutdown the server and update manually.",
+    "PleaseUpdateManually": "Molimo ugasite server i a\u017eurirati ru\u010dno",
-    "NewServerVersionAvailable": "A new version of Media Browser Server is available!",
+    "NewServerVersionAvailable": "Nova verzija Media Browser-a je dostupna!",
-    "ServerUpToDate": "Media Browser Server is up to date",
+    "ServerUpToDate": "Media Browser Server je ve\u0107 na trenutnoj verziji",
     "ErrorConnectingToMediaBrowserRepository": "There was an error connecting to the remote Media Browser repository.",
     "LabelComponentsUpdated": "The following components have been installed or updated:",
     "MessagePleaseRestartServerToFinishUpdating": "Please restart the server to finish applying updates.",
@@ -806,7 +811,7 @@
     "ButtonPageDown": "Page Down",
     "PageAbbreviation": "PG",
     "ButtonHome": "Home",
-    "ButtonSearch": "Search",
+    "ButtonSearch": "Tra\u017ei",
     "ButtonSettings": "Settings",
     "ButtonTakeScreenshot": "Capture Screenshot",
     "ButtonLetterUp": "Letter Up",

MediaBrowser.Server.Implementations/Localization/Server/it.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Tema video",
     "LabelEnableIntroParentalControlHelp": "Trailer: verr\u00e0 selezionata solo con un rating genitori uguale o inferiore al contenuto di essere osservato.",
     "TabMovies": "Film",
-    "LabelThisFeatureRequiresSupporterHelp": "Questa funzionalit\u00e0 richiede un abbonamento attivo sostenitore.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "Queste caratteristiche richiedono un abbonamento attivo sostenitore e l'installazione del plugin canale Trailer.",
     "TabStudios": "Studios",
     "OptionTrailersFromMyMoviesHelp": "Richiede l'installazione di trailer locali.",
     "TabTrailers": "Trailer",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separazione multipla utilizzando ;",
     "ValueSpecialEpisodeName": "Speciali - {0}",
     "HeaderLatestMovies": "Ultimi Film Aggiunti",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Ultimi Trailers Aggiunti",
+    "OptionUpcomingDvdMovies": "includi trailer nuovi e imminenti film su Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Caratteristiche speciali",
+    "OptionUpcomingStreamingMovies": "Includi trailer nuovi e imminenti film su Netflix",
     "OptionImdbRating": "Voto IMDB",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Visualizzare i rimorchi all'interno di suggerimenti di film",
     "OptionParentalRating": "Voto Genitori",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Richiede l'installazione del canale Trailer.",
     "OptionPremiereDate": "Premiere Date",
     "TabBasic": "Base",
     "TabAdvanced": "Avanzato",
@@ -1000,7 +1005,7 @@
     "MessageNoPlaylistItemsAvailable": "Questa playlist al momento \u00e8 vuota",
     "HeaderWelcomeToMediaBrowserWebClient": "Benvenuti nel Media Browser Web client",
     "ButtonDismiss": "Dismetti",
-    "ButtonTakeTheTour": "Take the tour",
+    "ButtonTakeTheTour": "Fai il tour",
     "ButtonEditOtherUserPreferences": "Modificare le preferenze personali di questo utente.",
     "LabelChannelStreamQuality": "Preferenziale qualit\u00e0 del flusso internet:",
     "LabelChannelStreamQualityHelp": "In un ambiente a bassa larghezza di banda, limitando la qualit\u00e0 pu\u00f2 contribuire a garantire un'esperienza di Smooth Streaming.",
@@ -1013,7 +1018,7 @@
     "LabelChannelDownloadAgeHelp": "Contenuti scaricati pi\u00f9 di questa et\u00e0 sar\u00e0 cancellato. Rimarr\u00e0 giocabile via internet in streaming.",
     "ChannelSettingsFormHelp": "Installare canali come trailer e Vimeo nel catalogo plugin.",
     "LabelSelectCollection": "Seleziona Collezione:",
-    "ButtonOptions": "Options",
+    "ButtonOptions": "Opzioni",
     "ViewTypeMovies": "Film",
     "ViewTypeTvShows": "Tv",
     "ViewTypeGames": "Giochi",

MediaBrowser.Server.Implementations/Localization/Server/kk.json

@@ -348,9 +348,9 @@
     "LabelVersion": "\u041d\u04b1\u0441\u049b\u0430:",
     "CinemaModeConfigurationHelp": "\u041a\u0438\u043d\u043e\u0442\u0435\u0430\u0442\u0440 \u0440\u0435\u0436\u0456\u043c\u0456 \u043a\u0438\u043d\u043e \u043a\u04e9\u0440\u0441\u0435\u0442\u0435\u0442\u0456\u043d \u0437\u0430\u043b \u04d9\u0441\u0435\u0440\u0456\u043d \u049b\u043e\u043d\u0430\u049b\u0436\u0430\u0439\u044b\u04a3\u044b\u0437\u0493\u0430 \u0442\u0456\u043a\u0435\u043b\u0435\u0439 \u0436\u0435\u0442\u043a\u0456\u0437\u0443\u04a3\u043c\u0435\u043d \u0431\u0456\u0440\u0433\u0435 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440\u0434\u0456 \u0436\u04d9\u043d\u0435 \u0442\u0435\u04a3\u0448\u0435\u043b\u0433\u0435\u043d \u043a\u04e9\u0440\u043d\u0435\u0443\u0434\u0456 \u0431\u0430\u0441\u0442\u044b \u049b\u0430\u0441\u0438\u0435\u0442\u0442\u0456\u04a3 \u0430\u043b\u0434\u044b\u043d\u0434\u0430 \u043e\u0439\u043d\u0430\u0442\u0430\u0434\u044b.",
     "LabelLastResult": "\u0421\u043e\u04a3\u0493\u044b \u043d\u04d9\u0442\u0438\u0436\u0435:",
-    "OptionTrailersFromMyMovies": "\u0422\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u0434\u0430\u0493\u044b \u0444\u0438\u043b\u044c\u043c\u0434\u0435\u0440\u0433\u0435 \u0430\u0440\u043d\u0430\u043b\u0493\u0430\u043d \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440\u0456\u043d \u049b\u043e\u0441\u0430 \u0430\u043b\u0493\u0430\u043d\u0434\u0430",
+    "OptionTrailersFromMyMovies": "\u0422\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430 \u0444\u0438\u043b\u044c\u043c\u0434\u0435\u0440\u0456\u043d\u0434\u0435\u0433\u0456 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440\u0456\u043d \u049b\u0430\u043c\u0442\u0443",
     "OptionHasSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u043b\u0435\u0440",
-    "OptionUpcomingMoviesInTheaters": "\u0416\u0430\u04a3\u0430 \u0436\u04d9\u043d\u0435 \u043a\u0435\u043b\u0435\u0448\u0435\u043a \u0444\u0438\u043b\u044c\u043c\u0434\u0435\u0440\u0433\u0435 \u0430\u0440\u043d\u0430\u043b\u0493\u0430\u043d \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440\u0456\u043d \u049b\u043e\u0441\u0430 \u0430\u043b\u0493\u0430\u043d\u0434\u0430",
+    "OptionUpcomingMoviesInTheaters": "\u0416\u0430\u04a3\u0430 \u0436\u04d9\u043d\u0435 \u043a\u04af\u0442\u0456\u043b\u0433\u0435\u043d \u0444\u0438\u043b\u044c\u043c\u0434\u0435\u0440\u0456\u043d\u0434\u0435\u0433\u0456 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440\u0456\u043d \u049b\u0430\u043c\u0442\u0443",
     "OptionHasTrailer": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440",
     "LabelLimitIntrosToUnwatchedContent": "\u0422\u0435\u043a \u049b\u0430\u043d\u0430 \u049b\u0430\u0440\u0430\u043b\u043c\u0430\u0493\u0430\u043d \u043c\u0430\u0437\u043c\u04b1\u043d\u0493\u0430 \u0430\u0440\u043d\u0430\u043b\u0493\u0430\u043d \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440\u0434\u0456 \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443",
     "OptionHasThemeSong": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0442\u044b\u049b \u04d9\u0443\u0435\u043d",
@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "\u0422\u0430\u049b\u044b\u0440\u044b\u043f\u0442\u044b\u049b \u0431\u0435\u0439\u043d\u0435",
     "LabelEnableIntroParentalControlHelp": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440 \u0436\u0430\u0441\u0442\u0430\u0441 \u0441\u0430\u043d\u0430\u0442\u044b \u0442\u0435\u043a \u049b\u0430\u043d\u0430 \u049b\u0430\u0440\u0430\u0443\u0493\u0430 \u0430\u0440\u043d\u0430\u043b\u0493\u0430\u043d \u043c\u0430\u0437\u043c\u04b1\u043d\u0493\u0430 \u0442\u0435\u04a3 \u043d\u0435\u043c\u0435\u0441\u0435 \u043a\u0435\u043c \u0431\u043e\u043b\u044b\u043f \u0442\u0430\u04a3\u0434\u0430\u043b\u0430\u0434\u044b.",
     "TabMovies": "\u0424\u0438\u043b\u044c\u043c\u0434\u0435\u0440",
-    "LabelThisFeatureRequiresSupporterHelp": "\u041e\u0441\u044b \u043c\u04af\u043c\u043a\u0456\u043d\u0434\u0456\u043a \u0431\u0435\u043b\u0441\u0435\u043d\u0434\u0456 \u049b\u043e\u043b\u0434\u0430\u0443\u0448\u044b \u043c\u04af\u0448\u0435\u043b\u0456\u0433\u0456 \u0431\u043e\u043b\u0493\u0430\u043d\u044b\u043d \u049b\u0430\u0436\u0435\u0442 \u0435\u0442\u0435\u0434\u0456",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "\u041e\u0441\u044b \u043c\u04d9\u043b\u0456\u043c\u0435\u0442\u0442\u0435\u0440 \u0431\u0435\u043b\u0441\u0435\u043d\u0434\u0456 \u049b\u043e\u043b\u0434\u0430\u0443\u0448\u044b \u043c\u04af\u0448\u0435\u043b\u0456\u0433\u0456\u043d \u0436\u04d9\u043d\u0435 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440 \u0430\u0440\u043d\u0430\u0441\u044b \u043f\u043b\u0430\u0433\u0438\u043d\u0456\u043d \u043e\u0440\u043d\u0430\u0442\u0443 \u049b\u0430\u0436\u0435\u0442 \u0435\u0442\u0435\u0434\u0456.",
     "TabStudios": "\u0421\u0442\u0443\u0434\u0438\u044f\u043b\u0430\u0440",
     "OptionTrailersFromMyMoviesHelp": "\u0416\u0435\u0440\u0433\u0456\u043b\u0456\u043a\u0442\u0456 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440 \u043e\u0440\u043d\u0430\u0442\u0443\u044b\u043d \u0436\u04d9\u043d\u0435 \u0442\u0435\u04a3\u0448\u0435\u0443\u0456\u043d \u049b\u0430\u0436\u0435\u0442 \u0435\u0442\u0435\u0434\u0456.",
     "TabTrailers": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "\u0411\u0456\u0440\u043d\u0435\u0448\u0443\u0456\u043d (;) \u0430\u0440\u049b\u044b\u043b\u044b \u0431\u04e9\u043b\u0456\u04a3\u0456\u0437",
     "ValueSpecialEpisodeName": "\u0410\u0440\u043d\u0430\u0439\u044b - {0}",
     "HeaderLatestMovies": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456 \u0444\u0438\u043b\u044c\u043c\u0434\u0435\u0440",
+    "LabelSelectInternetTrailersForCinemaMode": "\u0418\u0418\u043d\u0442\u0435\u0440\u043d\u0435\u0442 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440\u0456:",
     "HeaderLatestTrailers": "\u0415\u04a3 \u043a\u0435\u0439\u0456\u043d\u0433\u0456 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440",
+    "OptionUpcomingDvdMovies": "\u0416\u04d9\u04a3\u0430 \u0436\u04d9\u043d\u0435 \u043a\u04af\u0442\u0456\u043b\u0433\u0435\u043d DVD \u0436\u04d9\u043d\u0435 BluRay \u0444\u0438\u043b\u044c\u043c\u0434\u0435\u0440\u0456\u043d\u0434\u0435\u0433\u0456 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440\u0456\u043d \u049b\u0430\u043c\u0442\u0443",
     "OptionHasSpecialFeatures": "\u041c\u04d9\u043b\u0456\u043c\u0435\u0442\u0442\u0435\u0440",
+    "OptionUpcomingStreamingMovies": "\u0416\u04d9\u04a3\u0430 \u0436\u04d9\u043d\u0435 \u043a\u04af\u0442\u0456\u043b\u0433\u0435\u043d Netflix \u0444\u0438\u043b\u044c\u043c\u0434\u0435\u0440\u0456\u043d\u0434\u0435\u0433\u0456 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440\u0456\u043d \u049b\u0430\u043c\u0442\u0443",
     "OptionImdbRating": "IMDb \u0431\u0430\u0493\u0430\u043b\u0430\u0443\u044b",
+    "LabelDisplayTrailersWithinMovieSuggestions": "\u0424\u0438\u043b\u044c\u043c \u04b1\u0441\u044b\u043d\u044b\u0441\u0442\u0430\u0440\u044b \u0430\u0440\u0430\u0441\u044b\u043d\u0434\u0430 \u0442\u0440\u0435\u043b\u0435\u0440\u043b\u0435\u0440\u0434\u0456 \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0443",
     "OptionParentalRating": "\u0416\u0430\u0441\u0442\u0430\u0441 \u0441\u0430\u043d\u0430\u0442",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u043b\u0435\u0440 \u0430\u0440\u043d\u0430\u0441\u044b\u043d \u043e\u0440\u043d\u0430\u0442\u0443 \u049b\u0430\u0436\u0435\u0442 \u0435\u0442\u0435\u0434\u0456.",
     "OptionPremiereDate": "\u0422\u04b1\u0441\u0430\u0443\u043a\u0435\u0441\u0435\u0440 \u043a\u04af\u043d-\u0430\u0439\u044b",
     "TabBasic": "\u041d\u0435\u0433\u0456\u0437\u0433\u0456\u043b\u0435\u0440",
     "TabAdvanced": "\u049a\u043e\u0441\u044b\u043c\u0448\u0430",

MediaBrowser.Server.Implementations/Localization/Server/ko.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Theme Video",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Movies",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Studios",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Latest Movies",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Latest Trailers",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Special Features",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "IMDb Rating",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Parental Rating",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Premiere Date",
     "TabBasic": "Basic",
     "TabAdvanced": "Advanced",

MediaBrowser.Server.Implementations/Localization/Server/ms.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Theme Video",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Movies",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Studios",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Latest Movies",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Latest Trailers",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Special Features",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "IMDb Rating",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Parental Rating",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Premiere Date",
     "TabBasic": "Basic",
     "TabAdvanced": "Advanced",

MediaBrowser.Server.Implementations/Localization/Server/nb.json

@@ -111,7 +111,7 @@
     "OptionLocalRefreshOnly": "Kun lokal oppfrsikining",
     "TabImages": "Bilder",
     "HeaderRefreshMetadata": "Oppfrisk Metadata",
-    "TabNotifications": "Varsliner",
+    "TabNotifications": "Varslinger",
     "HeaderPersonInfo": "Person Info",
     "TabCollectionTitles": "Titler",
     "HeaderIdentifyItem": "Identifiser Element",
@@ -123,9 +123,9 @@
     "LabelFollowingFileWillBeDeleted": "F\u00f8lgende fil vil bli slettet:",
     "HeaderPlaybackSettings": "Avspillings Innstillinger",
     "LabelIfYouWishToContinueWithDeletion": "Hvis du \u00f8nsker \u00e5 fortsette, venligst bekreft med verdien av:",
-    "LabelAudioLanguagePreference": "\u00d8nsket spr\u00e5k for lydspor:",
+    "LabelAudioLanguagePreference": "Foretrukket lydspor:",
     "ButtonIdentify": "Identifiser",
-    "LabelSubtitleLanguagePreference": "\u00d8nsket spr\u00e5k for undertekster:",
+    "LabelSubtitleLanguagePreference": "Foretrukket undertekst:",
     "LabelAlbumArtist": "Album Artist",
     "OptionDefaultSubtitles": "Standard",
     "LabelAlbum": "Album:",
@@ -139,7 +139,7 @@
     "LabelCriticRating": "Kritiker anmeldelse:",
     "OptionOnlyForcedSubtitlesHelp": "Kun undertekster marker som tvunget vil bli lastet.",
     "LabelCriticRatingSummary": "Kritiker anmeldelse sammendrag:",
-    "OptionAlwaysPlaySubtitlesHelp": "Undertekster som matcher spr\u00e5kets innstillinger vil bli lastet uavhengig lydens spr\u00e5k.",
+    "OptionAlwaysPlaySubtitlesHelp": "Undertekster som samsvarer med foretrukket spr\u00e5k vil bli lastet uavhengig lydens spr\u00e5k.",
     "LabelAwardSummary": "Pris sammendrag:",
     "OptionNoSubtitlesHelp": "Undertekster vil ikke bli lastet som standard.",
     "LabelWebsite": "Nettsted:",
@@ -227,13 +227,13 @@
     "OptionOneTimeDescription": "Dette er en ekstra donasjon til teamet for \u00e5 vise din st\u00f8tte. Det har ikke noen ekstra fordeler, og vil ikke produsere en supporter tasten.",
     "OptionProducers": "Produsent",
     "OptionLifeTimeSupporterMembership": "Livstids supporter medlemskap",
-    "HeaderResume": "Fortsett",
+    "HeaderResume": "Fortsette",
     "OptionYearlySupporterMembership": "\u00c5rlig supporter medlemskap",
     "HeaderNextUp": "Neste",
     "OptionMonthlySupporterMembership": "M\u00e5nedlig supporter medlemskap",
     "NoNextUpItemsMessage": "Ingen funnet. Begyn \u00e5 se det du har",
     "HeaderSupporterBenefit": "Et supporter medlemskap gir flere fordeler som tilgang til premium programtillegg, internett kanalinnhold, og mer.",
-    "HeaderLatestEpisodes": "Nye episoder",
+    "HeaderLatestEpisodes": "Siste episoder",
     "OptionNoTrailer": "Ingen trailer",
     "HeaderPersonTypes": "Person Typer:",
     "OptionNoThemeSong": "Ingen temasang",
@@ -260,7 +260,7 @@
     "OptionAscending": "Oppover",
     "HeaderMediaInfo": "Media informasjon",
     "OptionDescending": "Nedover",
-    "HeaderPhotoInfo": "Photo Info",
+    "HeaderPhotoInfo": "Bildeinformasjon",
     "OptionRuntime": "Spilletid",
     "HeaderInstall": "Installer",
     "OptionReleaseDate": "Uttgitt dato",
@@ -290,7 +290,7 @@
     "OptionRevenue": "Inntjening",
     "XmlDocumentAttributeListHelp": "These attributes are applied to the root element of every xml response.",
     "OptionPoster": "Plakat",
-    "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
+    "OptionSaveMetadataAsHidden": "Lagre metadata og bilder som skjulte filer",
     "OptionBackdrop": "Backdrop",
     "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTimeline": "Tidslinje",
@@ -335,10 +335,10 @@
     "TabPlayback": "Spill av",
     "OptionDvd": "Dvd",
     "HeaderTrailersAndExtras": "Trailers & Extras",
-    "OptionIso": "iso",
+    "OptionIso": "ISO",
     "OptionFindTrailers": "Finn trailere fra internett automatisk",
     "Option3D": "3d",
-    "HeaderLanguagePreferences": "Language Preferences",
+    "HeaderLanguagePreferences": "Spr\u00e5kpreferanser",
     "LabelFeatures": "Funksjoner:",
     "TabCinemaMode": "Cinema Mode",
     "LabelService": "Service:",
@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Temavideo",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Filmer",
-    "LabelThisFeatureRequiresSupporterHelp": "Dette funksjonen krever et aktivt supporter medlemskap.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Studio",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Trailere",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Siste Filmer",
+    "LabelSelectInternetTrailersForCinemaMode": "Internett trailere:",
     "HeaderLatestTrailers": "Siste Trailers",
+    "OptionUpcomingDvdMovies": "Inkluder trailere fra nye og kommende filmer p\u00e5 DVD & Blu-ray",
     "OptionHasSpecialFeatures": "Spesial Funksjoner",
+    "OptionUpcomingStreamingMovies": "Inkluder trailere fra nye og kommende filmer p\u00e5 Netflix",
     "OptionImdbRating": "IMDB Rangering",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Foreldresensur",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Krever installasjon av trailer kanalen.",
     "OptionPremiereDate": "premieredato",
     "TabBasic": "Basic",
     "TabAdvanced": "Avansert",
@@ -651,7 +656,7 @@
     "LabelEnableAutomaticPortHelp": "UPnP tillater automatiserte routere konfigurering for ekstern tilgang. Dette fungerer n\u00f8dvendigvis ikke p\u00e5 alle modeller.",
     "LabelExternalDDNS": "Ekstern DDNS:",
     "LabelExternalDDNSHelp": "Hvis du har en dynamisk DNS, skriv den her. Media Browser applikasjoner vil bruke denne n\u00e5r ekstern forbindelse opprettes.",
-    "TabResume": "Forsett",
+    "TabResume": "Forsette",
     "TabWeather": "V\u00e6r",
     "TitleAppSettings": "App Innstillinger",
     "LabelMinResumePercentage": "Minimum fortsettelses prosent:",
@@ -979,7 +984,7 @@
     "OptionMyViewsButtons": "Mitt syn (knapper)",
     "OptionMyViews": "Mitt syn",
     "OptionMyViewsSmall": "Mitt Syn (liten)",
-    "OptionResumablemedia": "Fortsett",
+    "OptionResumablemedia": "Fortsette",
     "OptionLatestMedia": "Siste media",
     "OptionLatestChannelMedia": "Siste kanal elementer",
     "HeaderLatestChannelItems": "Siste Kanal Elementer",
@@ -1027,14 +1032,14 @@
     "ViewTypeGameFavorites": "Favoritter",
     "ViewTypeGameSystems": "Spillsystemer",
     "ViewTypeGameGenres": "Sjangere",
-    "ViewTypeTvResume": "Resume",
+    "ViewTypeTvResume": "Fortsette",
     "ViewTypeTvNextUp": "Neste",
     "ViewTypeTvLatest": "Siste",
     "ViewTypeTvShowSeries": "Serier",
     "ViewTypeTvGenres": "Sjangere",
     "ViewTypeTvFavoriteSeries": "Favoritt serier",
     "ViewTypeTvFavoriteEpisodes": "Favoritt episoder",
-    "ViewTypeMovieResume": "Fortsett",
+    "ViewTypeMovieResume": "Fortsette",
     "ViewTypeMovieLatest": "Siste",
     "ViewTypeMovieMovies": "Filmer",
     "ViewTypeMovieCollections": "Samlinger",
@@ -1059,13 +1064,13 @@
     "LabelProtocolInfo": "Protokoll info:",
     "LabelProtocolInfoHelp": "Verdien som blir brukt for \u00e5 gi respons til GetProtocolInfo foresp\u00f8rsler fra enheten.",
     "TabKodiMetadata": "Kodi",
-    "HeaderKodiMetadataHelp": "Media Browser includes native support for Kodi Nfo metadata and images. To enable or disable Kodi metadata, use the Advanced tab to configure options for your media types.",
+    "HeaderKodiMetadataHelp": "Media Browser inkluderer innebygd st\u00f8tte for Kodi Nfo metadata og bilder. For \u00e5 aktivere eller deaktivere Kodi metadata, bruker du fanen Avansert for \u00e5 konfigurere alternativer for medietyper.",
     "LabelKodiMetadataUser": "Add user watch data to nfo's for:",
     "LabelKodiMetadataUserHelp": "Enable this to keep watch data in sync between Media Browser and Kodi.",
     "LabelKodiMetadataDateFormat": "Utgivelsesdato format:",
     "LabelKodiMetadataDateFormatHelp": "All dates within nfo's will be read and written to using this format.",
     "LabelKodiMetadataSaveImagePaths": "Save image paths within nfo files",
-    "LabelKodiMetadataSaveImagePathsHelp": "This is recommended if you have image file names that don't conform to Kodi guidelines.",
+    "LabelKodiMetadataSaveImagePathsHelp": "Dette anbefales hvis du har bilde filnavn som ikke f\u00f8lger Kodi retningslinjer.",
     "LabelKodiMetadataEnablePathSubstitution": "Aktiver sti erstatter",
     "LabelKodiMetadataEnablePathSubstitutionHelp": "Aktiverer sti erstatning av bilde stier ved hjelp av serverens sti erstatter innstillinger.",
     "LabelKodiMetadataEnablePathSubstitutionHelp2": "Vis sti erstatter",

MediaBrowser.Server.Implementations/Localization/Server/nl.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Thema Video",
     "LabelEnableIntroParentalControlHelp": "Trailers worden alleen geselecteerd als de ouderlijke toezicht lager of gelijk is aan de film die gekeken wordt.",
     "TabMovies": "Films",
-    "LabelThisFeatureRequiresSupporterHelp": "Deze functie vereist een actief supporter lidmaatschap",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "Deze functies vereisen een actieve ondersteuners lidmaatschap en installatie van de Trailer-kanaal plugin.",
     "TabStudios": "Studio's",
     "OptionTrailersFromMyMoviesHelp": "Vereist instellingen voor lokale trailers.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Scheidt meerdere met een ;",
     "ValueSpecialEpisodeName": "Speciaal - {0}",
     "HeaderLatestMovies": "Nieuwste Films",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Nieuwste Trailers",
+    "OptionUpcomingDvdMovies": "Inclusief trailers van nieuwe en aankomende films op Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Extra's",
+    "OptionUpcomingStreamingMovies": "Inclusief trailers van nieuwe en aankomende films op Netflix",
     "OptionImdbRating": "IMDb Waardering",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Toon trailers binnen film suggesties",
     "OptionParentalRating": "Kijkwijzer classificatie",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Vereist installatie van het Trailer-kanaal.",
     "OptionPremiereDate": "Premi\u00e8re Datum",
     "TabBasic": "Basis",
     "TabAdvanced": "Geavanceerd",

MediaBrowser.Server.Implementations/Localization/Server/pl.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Theme Video",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Filmy",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Studia",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Zwiastuny",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Ostatnie filmy",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Ostatnie zwiastuny",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Special Features",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "Ocena IMDb",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Ocena rodzicielska",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Data premiery",
     "TabBasic": "Podstawowe",
     "TabAdvanced": "Zaawansowane",

MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "V\u00eddeo-Tema",
     "LabelEnableIntroParentalControlHelp": "Os trailers s\u00f3 ser\u00e3o selecionados se sua classifica\u00e7\u00e3o parental for igual ou menor que o conte\u00fado que est\u00e1 sendo assistido.",
     "TabMovies": "Filmes",
-    "LabelThisFeatureRequiresSupporterHelp": "Este recurso necessita uma ades\u00e3o ativa de colaborador.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "Estes recursos requerem uma ades\u00e3o ativa de colaborador e a instala\u00e7\u00e3o do plugin de canal de Trailers",
     "TabStudios": "Est\u00fadios",
     "OptionTrailersFromMyMoviesHelp": "\u00c9 necess\u00e1rio o ajuste dos trailers locais.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separar m\u00faltiplos usando ;",
     "ValueSpecialEpisodeName": "Especial -  {0}",
     "HeaderLatestMovies": "Filmes Recentes",
+    "LabelSelectInternetTrailersForCinemaMode": "Trailers da Internet:",
     "HeaderLatestTrailers": "Trailers Recentes",
+    "OptionUpcomingDvdMovies": "Incluir trailers de filmes novos e por estrear em Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Funcionalidades Especiais",
+    "OptionUpcomingStreamingMovies": "Incluir trailers de filmes novos e por estrear no Netflix",
     "OptionImdbRating": "Avalia\u00e7\u00e3o IMDb",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Exibir trailers dentro das sugest\u00f5es de filmes",
     "OptionParentalRating": "Classifica\u00e7\u00e3o Parental",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requer a instala\u00e7\u00e3o do canal de Trailers",
     "OptionPremiereDate": "Data da Estr\u00e9ia",
     "TabBasic": "B\u00e1sico",
     "TabAdvanced": "Avan\u00e7ado",

MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "V\u00eddeo de Tema",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Filmes",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "Est\u00fadios",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "\u00daltimos Filmes",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "\u00daltimos Trailers",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Extras",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "Classifica\u00e7\u00e3o no IMDb",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Classifica\u00e7\u00e3o Parental",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Data de Estreia",
     "TabBasic": "B\u00e1sico",
     "TabAdvanced": "Avan\u00e7ado",

MediaBrowser.Server.Implementations/Localization/Server/ru.json

@@ -350,7 +350,7 @@
     "LabelLastResult": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0439 \u0440\u0435\u0437\u0443\u043b\u044c\u0442\u0430\u0442:",
     "OptionTrailersFromMyMovies": "\u041e\u0445\u0432\u0430\u0442\u044b\u0432\u0430\u0442\u044c \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u044b \u043a \u0444\u0438\u043b\u044c\u043c\u0430\u043c \u0432 \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0435",
     "OptionHasSubtitles": "\u0421\u0443\u0431\u0442\u0438\u0442\u0440\u044b",
-    "OptionUpcomingMoviesInTheaters": "\u041e\u0445\u0432\u0430\u0442\u044b\u0432\u0430\u0442\u044c \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u044b \u043a \u043d\u043e\u0432\u044b\u043c \u0438 \u043f\u0440\u0435\u0434\u0441\u0442\u043e\u044f\u0449\u0438\u043c \u0444\u0438\u043b\u044c\u043c\u0430\u043c",
+    "OptionUpcomingMoviesInTheaters": "\u041e\u0445\u0432\u0430\u0442\u044b\u0432\u0430\u0442\u044c \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u044b \u043a \u043d\u043e\u0432\u044b\u043c \u0438 \u043e\u0436\u0438\u0434\u0430\u0435\u043c\u044b\u043c \u0444\u0438\u043b\u044c\u043c\u0430\u043c",
     "OptionHasTrailer": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440",
     "LabelLimitIntrosToUnwatchedContent": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u044b \u0442\u043e\u043b\u044c\u043a\u043e \u043a \u043d\u0435\u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u043d\u043d\u043e\u043c\u0443 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044e",
     "OptionHasThemeSong": "\u0422\u0435\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0430\u044f \u043c\u0435\u043b\u043e\u0434\u0438\u044f",
@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "\u0422\u0435\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0435 \u0432\u0438\u0434\u0435\u043e",
     "LabelEnableIntroParentalControlHelp": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u044b \u0431\u0443\u0434\u0443\u0442 \u0432\u044b\u0431\u0438\u0440\u0430\u0442\u044c\u0441\u044f \u0441 \u0432\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u043e\u0439 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0435\u0439 \u0440\u0430\u0432\u043d\u043e\u0439 \u0438\u043b\u0438 \u043c\u0435\u043d\u044c\u0448\u0435\u0439, \u0447\u0435\u043c \u043f\u0440\u043e\u0441\u043c\u0430\u0442\u0440\u0438\u0432\u0430\u0435\u043c\u043e\u0435 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u0435.",
     "TabMovies": "\u0424\u0438\u043b\u044c\u043c\u044b",
-    "LabelThisFeatureRequiresSupporterHelp": "\u0414\u0430\u043d\u043d\u043e\u0439 \u0444\u0443\u043d\u043a\u0446\u0438\u0438 \u043f\u043e\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0447\u043b\u0435\u043d\u0441\u0442\u0432\u043e \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "\u0414\u0430\u043d\u043d\u044b\u043c \u0444\u0443\u043d\u043a\u0446\u0438\u044f\u043c \u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0447\u043b\u0435\u043d\u0441\u0442\u0432\u043e \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0430 \u0438 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u043f\u043b\u0430\u0433\u0438\u043d\u0430 \u043a\u0430\u043d\u0430\u043b\u0430 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043e\u0432.",
     "TabStudios": "\u0421\u0442\u0443\u0434\u0438\u0438",
     "OptionTrailersFromMyMoviesHelp": "\u041f\u043e\u0442\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0445 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043e\u0432.",
     "TabTrailers": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u044b",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "\u0420\u0430\u0437\u0434\u0435\u043b\u044f\u0439\u0442\u0435, \u043a\u043e\u0433\u0434\u0430 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e, \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u00ab;\u00bb",
     "ValueSpecialEpisodeName": "\u0421\u043f\u0435\u0446\u044d\u043f\u0438\u0437\u043e\u0434 - {0}",
     "HeaderLatestMovies": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0435 \u0444\u0438\u043b\u044c\u043c\u044b",
+    "LabelSelectInternetTrailersForCinemaMode": "\u0418\u043d\u0442\u0435\u0440\u043d\u0435\u0442-\u0442\u0440\u0435\u0439\u043b\u0435\u0440\u044b:",
     "HeaderLatestTrailers": "\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0435 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u044b",
+    "OptionUpcomingDvdMovies": "\u041e\u0445\u0432\u0430\u0442\u044b\u0432\u0430\u0442\u044c \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u044b \u043a \u043d\u043e\u0432\u044b\u043c \u0438 \u043e\u0436\u0438\u0434\u0430\u0435\u043c\u044b\u043c \u0444\u0438\u043b\u044c\u043c\u0430\u043c \u043d\u0430 DVD \u0438 BluRay",
     "OptionHasSpecialFeatures": "\u0414\u043e\u043f. \u043c\u0430\u0442\u0435\u0440\u0438\u0430\u043b\u044b",
+    "OptionUpcomingStreamingMovies": "\u041e\u0445\u0432\u0430\u0442\u044b\u0432\u0430\u0442\u044c \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u044b \u043a \u043d\u043e\u0432\u044b\u043c \u0438 \u043e\u0436\u0438\u0434\u0430\u0435\u043c\u044b\u043c \u0444\u0438\u043b\u044c\u043c\u0430\u043c \u043d\u0430 Netflix",
     "OptionImdbRating": "\u041e\u0446\u0435\u043d\u043a\u0430 IMDb",
+    "LabelDisplayTrailersWithinMovieSuggestions": "\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0442\u044c \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u044b \u0441\u0440\u0435\u0434\u0438 \u043f\u0440\u0435\u0434\u043b\u0430\u0433\u0430\u0435\u043c\u044b\u0445 \u0444\u0438\u043b\u044c\u043c\u043e\u0432",
     "OptionParentalRating": "\u0412\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u0430\u044f \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u044f",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u043a\u0430\u043d\u0430\u043b\u0430 \u0442\u0440\u0435\u0439\u043b\u0435\u0440\u043e\u0432",
     "OptionPremiereDate": "\u0414\u0430\u0442\u0430 \u043f\u0440\u0435\u043c\u044c\u0435\u0440\u044b",
     "TabBasic": "\u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0435",
     "TabAdvanced": "\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e",
@@ -1059,7 +1064,7 @@
     "LabelProtocolInfo": "\u0421\u0432\u0435\u0434\u0435\u043d\u0438\u044f \u043e \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b\u0435:",
     "LabelProtocolInfoHelp": "\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435, \u043a\u043e\u0442\u043e\u0440\u043e\u0435 \u0431\u0443\u0434\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u043f\u0440\u0438 \u043e\u0442\u043a\u043b\u0438\u043a\u0435 \u043d\u0430 \u0437\u0430\u043f\u0440\u043e\u0441\u044b GetProtocolInfo \u043e\u0442 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430.",
     "TabKodiMetadata": "Kodi",
-    "HeaderKodiMetadataHelp": "\u0412 Media Browser \u0438\u043c\u0435\u0435\u0442\u0441\u044f \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u0430\u044f \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043b\u044f Kodi-\u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0432 NFO-\u0444\u0430\u0439\u043b\u0430\u0445 \u0438 \u0434\u043b\u044f \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432. \u0427\u0442\u043e\u0431\u044b \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0438\u043b\u0438 \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c XBMC-\u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0432\u043a\u043b\u0430\u0434\u043a\u0443 \u00ab\u0421\u043b\u0443\u0436\u0431\u044b\u00bb, \u0447\u0442\u043e\u0431\u044b \u0434\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u0438 \u043f\u043e \u0442\u0438\u043f\u0430\u043c \u043c\u0435\u0434\u0438\u0430\u0434\u0430\u043d\u043d\u044b\u0445.",
+    "HeaderKodiMetadataHelp": "\u0412 Media Browser \u0438\u043c\u0435\u0435\u0442\u0441\u044f \u0432\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u0430\u044f \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430 \u0434\u043b\u044f Kodi-\u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445 \u0432 NFO-\u0444\u0430\u0439\u043b\u0430\u0445 \u0438 \u0434\u043b\u044f \u0440\u0438\u0441\u0443\u043d\u043a\u043e\u0432. \u0414\u043b\u044f \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u0438\u043b\u0438 \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f Kodi-\u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0445, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u0432\u043a\u043b\u0430\u0434\u043a\u0443 \u00ab\u0421\u043b\u0443\u0436\u0431\u044b\u00bb, \u0447\u0442\u043e\u0431\u044b \u0434\u043b\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u0438 \u043f\u043e \u0442\u0438\u043f\u0430\u043c \u043c\u0435\u0434\u0438\u0430\u0434\u0430\u043d\u043d\u044b\u0445.",
     "LabelKodiMetadataUser": "\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0434\u0430\u043d\u043d\u044b\u0445 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u043e \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435 \u0432 NFO-\u0444\u0430\u0439\u043b\u044b \u0434\u043b\u044f:",
     "LabelKodiMetadataUserHelp": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u0435, \u0447\u0442\u043e\u0431\u044b \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0442\u044c \u0441\u0438\u043d\u0445\u0440\u043e\u043d\u0438\u0437\u0430\u0446\u0438\u044e \u0434\u0430\u043d\u043d\u044b\u0445 \u043e \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u043d\u043d\u043e\u043c \u043c\u0435\u0436\u0434\u0443 Media Browser \u0438 Kodi.",
     "LabelKodiMetadataDateFormat": "\u0424\u043e\u0440\u043c\u0430\u0442 \u0434\u0430\u0442\u044b \u0432\u044b\u043f\u0443\u0441\u043a\u0430:",

MediaBrowser.Server.Implementations/Localization/Server/server.json

@@ -1203,5 +1203,8 @@
     "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
-    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel."
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
+    "CinemaModeConfigurationHelp2": "Individual users will have the ability to disable cinema mode within their own preferences.",
+    "LabelEnableCinemaMode": "Enable cinema mode",
+    "HeaderCinemaMode": "Cinema Mode"
 }

MediaBrowser.Server.Implementations/Localization/Server/sv.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Temavideo",
     "LabelEnableIntroParentalControlHelp": "Enbart trailers med samma eller l\u00e4gre \u00e5ldersgr\u00e4ns som huvudmaterialet kommer att visas.",
     "TabMovies": "Filmer",
-    "LabelThisFeatureRequiresSupporterHelp": "Denna plugin kr\u00e4ver ett akivt supportermedlemskap.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "Dessa funktioner kr\u00e4ver ett akivt supportermedlemskap och installation av till\u00e4gget \"Trailer Channels\".",
     "TabStudios": "Studior",
     "OptionTrailersFromMyMoviesHelp": "Kr\u00e4ver att lokala trailers konfigurerats.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separera med ; vid flera",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Nytillkomna filmer",
+    "LabelSelectInternetTrailersForCinemaMode": "Trailers fr\u00e5n Internet",
     "HeaderLatestTrailers": "Nytillkomna trailers",
+    "OptionUpcomingDvdMovies": "Inkludera trailers f\u00f6r nya och kommande filmer p\u00e5 DVD och Blu-ray",
     "OptionHasSpecialFeatures": "Extramaterial:",
+    "OptionUpcomingStreamingMovies": "Inkludera trailers f\u00f6r nya och kommande filmer p\u00e5 Netflix",
     "OptionImdbRating": "Betyg p\u00e5 IMDB",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Visa trailers tillsammans med f\u00f6reslagna filmer",
     "OptionParentalRating": "F\u00f6r\u00e4ldraklassning",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Kr\u00e4ver installation av Trailer-kanalen.",
     "OptionPremiereDate": "Premi\u00e4rdatum",
     "TabBasic": "Grunderna",
     "TabAdvanced": "Avancerat",

MediaBrowser.Server.Implementations/Localization/Server/tr.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "Tema Videosu",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "Filmler",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "St\u00fcdyo",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Fragmanlar",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Son filmler",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Son fragmanlar",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Special Features",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "\u0130MDb Reyting",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Parental Rating",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Premiere Date",
     "TabBasic": "Basit",
     "TabAdvanced": "Geli\u015fmi\u015f",

MediaBrowser.Server.Implementations/Localization/Server/vi.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "H\u00ecnh n\u1ec1n Video",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "C\u00e1c phim",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "H\u00e3ng phim",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "Trailers",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "Phim m\u1edbi nh\u1ea5t",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "Latest Trailers",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "T\u00ednh n\u0103ng \u0111\u1eb7c bi\u1ec7t",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "\u0110\u00e1nh gi\u00e1 IMDb",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "Parental Rating",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "Premiere Date",
     "TabBasic": "C\u01a1 b\u1ea3n",
     "TabAdvanced": "Advanced",

MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json

@@ -358,7 +358,7 @@
     "OptionHasThemeVideo": "\u4e3b\u984c\u8996\u983b",
     "LabelEnableIntroParentalControlHelp": "Trailers will only be selected with a parental rating equal to or less than the content being watched.",
     "TabMovies": "\u96fb\u5f71",
-    "LabelThisFeatureRequiresSupporterHelp": "This feature requires an active supporter membership.",
+    "LabelTheseFeaturesRequireSupporterHelpAndTrailers": "These features require an active supporter membership and installation of the Trailer channel plugin.",
     "TabStudios": "\u5de5\u4f5c\u5ba4",
     "OptionTrailersFromMyMoviesHelp": "Requires setup of local trailers.",
     "TabTrailers": "\u9810\u544a",
@@ -368,10 +368,15 @@
     "LabelArtistsHelp": "Separate multiple using ;",
     "ValueSpecialEpisodeName": "Special - {0}",
     "HeaderLatestMovies": "\u6700\u65b0\u96fb\u5f71",
+    "LabelSelectInternetTrailersForCinemaMode": "Internet trailers:",
     "HeaderLatestTrailers": "\u6700\u65b0\u9810\u544a",
+    "OptionUpcomingDvdMovies": "Include trailers from new and upcoming movies on Dvd & Blu-ray",
     "OptionHasSpecialFeatures": "Special Features",
+    "OptionUpcomingStreamingMovies": "Include trailers from new and upcoming movies on Netflix",
     "OptionImdbRating": "IMDB\u8a55\u5206",
+    "LabelDisplayTrailersWithinMovieSuggestions": "Display trailers within movie suggestions",
     "OptionParentalRating": "\u5bb6\u9577\u8a55\u7d1a",
+    "LabelDisplayTrailersWithinMovieSuggestionsHelp": "Requires installation of the Trailer channel.",
     "OptionPremiereDate": "\u9996\u6620\u65e5\u671f",
     "TabBasic": "\u57fa\u672c",
     "TabAdvanced": "\u9032\u968e",

MediaBrowser.Server.Mono/Imazen.WebP.dll.config

@@ -2,4 +2,5 @@
   <dllmap dll="libwebp" target="./libwebp/linux/lib/libwebp.so" os="linux" wordsize="32"/>
   <dllmap dll="libwebp" target="./libwebp/linux/lib64/libwebp.so" os="linux" wordsize="64"/>
   <dllmap dll="libwebp" target="./libwebp/osx/libwebp.5.dylib" os="osx"/>
+  <dllmap dll="libwebp" target="libwebp.so" os="linux"/>
 </configuration>

MediaBrowser.Server.Mono/MediaBrowser.MediaInfo.dll.config

@@ -2,4 +2,5 @@
   <dllmap dll="MediaInfo" target="./MediaInfo/linux/lib/libmediainfo.so" os="linux" wordsize="32"/>
   <dllmap dll="MediaInfo" target="./MediaInfo/linux/lib64/libmediainfo.so" os="linux" wordsize="64"/>
   <dllmap dll="MediaInfo" target="./MediaInfo/osx/libmediainfo.dylib" os="osx"/>
+  <dllmap dll="MediaInfo" target="libmediainfo.so" os="linux"/>
 </configuration>

MediaBrowser.Server.Mono/Program.cs

@@ -124,6 +124,11 @@ namespace MediaBrowser.Server.Mono
 			ServicePointManager.ServerCertificateValidationCallback = _ignoreCertificates;
 
 			_appHost = new ApplicationHost(appPaths, logManager, false, false, options, "MBServer.Mono");
+			
+			if (options.ContainsOption("-v")) {
+				Console.WriteLine (_appHost.ApplicationVersion.ToString());
+				return;
+			}
 
 			Console.WriteLine ("appHost.Init");
 

MediaBrowser.Server.Mono/System.Data.SQLite.dll.config

@@ -2,4 +2,5 @@
   <dllmap dll="sqlite3" target="./sqlite3/linux/lib/libsqlite3.so.0.8.6" os="linux" wordsize="32"/>
   <dllmap dll="sqlite3" target="./sqlite3/linux/lib64/libsqlite3.so.0.8.6" os="linux" wordsize="64"/>
   <dllmap dll="sqlite3" target="./sqlite3/mac/libsqlite3.0.dylib" os="osx"/>
+  <dllmap dll="sqlite3" target="libsqlite3.so.0.8.6" os="linux"/>
 </configuration>

MediaBrowser.ServerApplication/ApplicationHost.cs

@@ -517,7 +517,7 @@ namespace MediaBrowser.ServerApplication
 
             var activityLogRepo = await GetActivityLogRepository().ConfigureAwait(false);
             RegisterSingleInstance(activityLogRepo);
-            RegisterSingleInstance<IActivityManager>(new ActivityManager(LogManager.GetLogger("ActivityManager"), activityLogRepo));
+            RegisterSingleInstance<IActivityManager>(new ActivityManager(LogManager.GetLogger("ActivityManager"), activityLogRepo, UserManager));
 
             var authContext = new AuthorizationContext();
             RegisterSingleInstance<IAuthorizationContext>(authContext);

MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj

@@ -57,9 +57,9 @@
     <Reference Include="ServiceStack.Interfaces">
       <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll</HintPath>
     </Reference>
-    <Reference Include="WebMarkupMin.Core, Version=0.9.3.0, Culture=neutral, PublicKeyToken=99472178d266584b, processorArchitecture=MSIL">
+    <Reference Include="WebMarkupMin.Core">
-      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\packages\WebMarkupMin.Core.0.9.6\lib\net40\WebMarkupMin.Core.dll</HintPath>
-      <HintPath>..\packages\WebMarkupMin.Core.0.9.3\lib\net40\WebMarkupMin.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>

MediaBrowser.WebDashboard/app.config

@@ -8,6 +8,7 @@
   
   
   
+  
 <webMarkupMin xmlns="http://tempuri.org/WebMarkupMin.Configuration.xsd">
 		<core>
 			<css>

MediaBrowser.WebDashboard/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="MediaBrowser.ApiClient.Javascript" version="3.0.249" targetFramework="net45" />
-  <package id="WebMarkupMin.Core" version="0.9.3" targetFramework="net45" />
+  <package id="WebMarkupMin.Core" version="0.9.6" targetFramework="net45" />
 </packages>

MediaBrowser.XbmcMetadata/Providers/MovieNfoProvider.cs

@@ -20,13 +20,6 @@ namespace MediaBrowser.XbmcMetadata.Providers
         }
     }
 
-    public class AdultVideoNfoProvider : BaseVideoNfoProvider<AdultVideo>
-    {
-        public AdultVideoNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config) : base(fileSystem, logger, config)
-        {
-        }
-    }
-
     public class VideoNfoProvider : BaseVideoNfoProvider<Video>
     {
         public VideoNfoProvider(IFileSystem fileSystem, ILogger logger, IConfigurationManager config) : base(fileSystem, logger, config)

Nuget/MediaBrowser.Common.Internal.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.449</version>
+        <version>3.0.450</version>
         <title>MediaBrowser.Common.Internal</title>
         <authors>Luke</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains common components shared by Media Browser Theater and Media Browser Server. Not intended for plugin developer consumption.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.449" />
+            <dependency id="MediaBrowser.Common" version="3.0.450" />
             <dependency id="NLog" version="3.1.0.0" />
             <dependency id="SimpleInjector" version="2.5.2" />
             <dependency id="sharpcompress" version="0.10.2" />

Nuget/MediaBrowser.Common.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Common</id>
-        <version>3.0.449</version>
+        <version>3.0.450</version>
         <title>MediaBrowser.Common</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>

Nuget/MediaBrowser.Model.Signed.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Model.Signed</id>
-        <version>3.0.449</version>
+        <version>3.0.450</version>
         <title>MediaBrowser.Model - Signed Edition</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>

Nuget/MediaBrowser.Server.Core.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>MediaBrowser.Server.Core</id>
-        <version>3.0.449</version>
+        <version>3.0.450</version>
         <title>Media Browser.Server.Core</title>
         <authors>Media Browser Team</authors>
         <owners>ebr,Luke,scottisafool</owners>
@@ -12,7 +12,7 @@
         <description>Contains core components required to build plugins for Media Browser Server.</description>
         <copyright>Copyright © Media Browser 2013</copyright>
         <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.449" />
+            <dependency id="MediaBrowser.Common" version="3.0.450" />
         </dependencies>
     </metadata>
     <files>