diff --git a/MediaBrowser.Controller/Providers/IHasChangeMonitor.cs b/MediaBrowser.Controller/Providers/IHasChangeMonitor.cs
index aa0b0e3c97..d914abf618 100644
--- a/MediaBrowser.Controller/Providers/IHasChangeMonitor.cs
+++ b/MediaBrowser.Controller/Providers/IHasChangeMonitor.cs
@@ -14,4 +14,16 @@ namespace MediaBrowser.Controller.Providers
         /// <returns><c>true</c> if the specified item has changed; otherwise, <c>false</c>.</returns>
         bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date);
     }
+
+    public interface IHasItemChangeMonitor
+    {
+        /// <summary>
+        /// Determines whether the specified item has changed.
+        /// </summary>
+        /// <param name="item">The item.</param>
+        /// <param name="status">The status.</param>
+        /// <param name="directoryService">The directory service.</param>
+        /// <returns><c>true</c> if the specified item has changed; otherwise, <c>false</c>.</returns>
+        bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService);
+    }
 }
diff --git a/MediaBrowser.Controller/Providers/MetadataStatus.cs b/MediaBrowser.Controller/Providers/MetadataStatus.cs
index 1e84e58802..12844c3c4d 100644
--- a/MediaBrowser.Controller/Providers/MetadataStatus.cs
+++ b/MediaBrowser.Controller/Providers/MetadataStatus.cs
@@ -61,6 +61,8 @@ namespace MediaBrowser.Controller.Providers
         public List<Guid> MetadataProvidersRefreshed { get; set; }
         public List<Guid> ImageProvidersRefreshed { get; set; }
 
+        public DateTime? ItemDateModified { get; set; }
+
         public void AddStatus(ProviderRefreshStatus status, string errorMessage)
         {
             if (LastStatus != status)
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index ab618dc5a2..0fdb8f7cc3 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -159,8 +159,6 @@ namespace MediaBrowser.Model.Configuration
 
         public bool EnableAutomaticRestart { get; set; }
 
-        public TvFileOrganizationOptions TvFileOrganizationOptions { get; set; }
-
         public bool EnableRealtimeMonitor { get; set; }
         public PathSubstitution[] PathSubstitutions { get; set; }
 
diff --git a/MediaBrowser.Providers/FolderImages/DefaultImageProvider.cs b/MediaBrowser.Providers/FolderImages/DefaultImageProvider.cs
index aaedc96842..c2e4939e94 100644
--- a/MediaBrowser.Providers/FolderImages/DefaultImageProvider.cs
+++ b/MediaBrowser.Providers/FolderImages/DefaultImageProvider.cs
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Providers.FolderImages
 {
-    public class DefaultImageProvider : IRemoteImageProvider, IHasChangeMonitor
+    public class DefaultImageProvider : IRemoteImageProvider, IHasItemChangeMonitor
     {
         private readonly IHttpClient _httpClient;
 
@@ -132,7 +132,7 @@ namespace MediaBrowser.Providers.FolderImages
             });
         }
 
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
+        public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService)
         {
             return GetSupportedImages(item).Any(i => !item.HasImage(i));
         }
diff --git a/MediaBrowser.Providers/Manager/MetadataService.cs b/MediaBrowser.Providers/Manager/MetadataService.cs
index eee8b59e24..92df1c86e6 100644
--- a/MediaBrowser.Providers/Manager/MetadataService.cs
+++ b/MediaBrowser.Providers/Manager/MetadataService.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Extensions;
+using System.IO;
+using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Controller.Configuration;
 using MediaBrowser.Controller.Entities;
@@ -38,8 +39,9 @@ namespace MediaBrowser.Providers.Manager
         /// </summary>
         /// <param name="item">The item.</param>
         /// <param name="result">The result.</param>
+        /// <param name="directoryService">The directory service.</param>
         /// <returns>Task.</returns>
-        protected Task SaveProviderResult(TItemType item, MetadataStatus result)
+        protected Task SaveProviderResult(TItemType item, MetadataStatus result, IDirectoryService directoryService)
         {
             result.ItemId = item.Id;
             result.ItemName = item.Name;
@@ -49,6 +51,23 @@ namespace MediaBrowser.Providers.Manager
 
             result.SeriesName = series == null ? null : series.SeriesName;
 
+            //var locationType = item.LocationType;
+
+            //if (locationType == LocationType.FileSystem || locationType == LocationType.Offline)
+            //{
+            //    if (!string.IsNullOrWhiteSpace(item.Path))
+            //    {
+            //        var file = directoryService.GetFile(item.Path);
+
+            //        if ((file.Attributes & FileAttributes.Directory) != FileAttributes.Directory && file.Exists)
+            //        {
+            //            result.ItemDateModified = FileSystem.GetLastWriteTimeUtc(file);
+            //        }
+            //    }
+            //}
+
+            result.ItemDateModified = item.DateModified;
+
             return ProviderRepo.SaveMetadataStatus(result, CancellationToken.None);
         }
 
@@ -106,7 +125,7 @@ namespace MediaBrowser.Providers.Manager
             // Next run metadata providers
             if (refreshOptions.MetadataRefreshMode != MetadataRefreshMode.None)
             {
-                var providers = GetProviders(item, refreshResult.DateLastMetadataRefresh.HasValue, refreshOptions)
+                var providers = GetProviders(item, refreshResult, refreshOptions)
                     .ToList();
 
                 if (providers.Count > 0 || !refreshResult.DateLastMetadataRefresh.HasValue)
@@ -135,7 +154,7 @@ namespace MediaBrowser.Providers.Manager
             // Next run remote image providers, but only if local image providers didn't throw an exception
             if (!localImagesFailed && refreshOptions.ImageRefreshMode != ImageRefreshMode.ValidationOnly)
             {
-                var providers = GetNonLocalImageProviders(item, allImageProviders, refreshResult.DateLastImagesRefresh, refreshOptions).ToList();
+                var providers = GetNonLocalImageProviders(item, allImageProviders, refreshResult, refreshOptions).ToList();
 
                 if (providers.Count > 0)
                 {
@@ -161,7 +180,7 @@ namespace MediaBrowser.Providers.Manager
 
             if (providersHadChanges || refreshResult.IsDirty)
             {
-                await SaveProviderResult(itemOfType, refreshResult).ConfigureAwait(false);
+                await SaveProviderResult(itemOfType, refreshResult, refreshOptions.DirectoryService).ConfigureAwait(false);
             }
         }
 
@@ -188,25 +207,39 @@ namespace MediaBrowser.Providers.Manager
         /// Gets the providers.
         /// </summary>
         /// <param name="item">The item.</param>
-        /// <param name="hasRefreshedMetadata">if set to <c>true</c> [has refreshed metadata].</param>
+        /// <param name="status">The status.</param>
         /// <param name="options">The options.</param>
         /// <returns>IEnumerable{`0}.</returns>
-        protected virtual IEnumerable<IMetadataProvider> GetProviders(IHasMetadata item, bool hasRefreshedMetadata, MetadataRefreshOptions options)
+        protected IEnumerable<IMetadataProvider> GetProviders(IHasMetadata item, MetadataStatus status, MetadataRefreshOptions options)
         {
             // Get providers to refresh
             var providers = ((ProviderManager)ProviderManager).GetMetadataProviders<TItemType>(item).ToList();
 
             // Run all if either of these flags are true
-            var runAllProviders = options.ReplaceAllMetadata || options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh || !hasRefreshedMetadata;
+            var runAllProviders = options.ReplaceAllMetadata || options.MetadataRefreshMode == MetadataRefreshMode.FullRefresh || !status.DateLastMetadataRefresh.HasValue;
 
             if (!runAllProviders)
             {
                 // Avoid implicitly captured closure
                 var currentItem = item;
 
-                var providersWithChanges = providers.OfType<IHasChangeMonitor>()
-                    .Where(i => HasChanged(currentItem, i, currentItem.DateLastSaved, options.DirectoryService))
-                    .Cast<IMetadataProvider<TItemType>>()
+                var providersWithChanges = providers
+                    .Where(i =>
+                    {
+                        var hasChangeMonitor = i as IHasChangeMonitor;
+                        if (hasChangeMonitor != null)
+                        {
+                            return HasChanged(item, hasChangeMonitor, currentItem.DateLastSaved, options.DirectoryService);
+                        }
+
+                        var hasFileChangeMonitor = i as IHasItemChangeMonitor;
+                        if (hasFileChangeMonitor != null)
+                        {
+                            return HasChanged(item, hasFileChangeMonitor, status, options.DirectoryService);
+                        }
+
+                        return false;
+                    })
                     .ToList();
 
                 if (providersWithChanges.Count == 0)
@@ -242,19 +275,33 @@ namespace MediaBrowser.Providers.Manager
             return providers;
         }
 
-        protected virtual IEnumerable<IImageProvider> GetNonLocalImageProviders(IHasMetadata item, IEnumerable<IImageProvider> allImageProviders, DateTime? dateLastImageRefresh, ImageRefreshOptions options)
+        protected virtual IEnumerable<IImageProvider> GetNonLocalImageProviders(IHasMetadata item, IEnumerable<IImageProvider> allImageProviders, MetadataStatus status, ImageRefreshOptions options)
         {
             // Get providers to refresh
             var providers = allImageProviders.Where(i => !(i is ILocalImageProvider)).ToList();
 
             // Run all if either of these flags are true
-            var runAllProviders = options.ImageRefreshMode == ImageRefreshMode.FullRefresh || !dateLastImageRefresh.HasValue;
+            var runAllProviders = options.ImageRefreshMode == ImageRefreshMode.FullRefresh || !status.DateLastImagesRefresh.HasValue;
 
             if (!runAllProviders)
             {
-                providers = providers.OfType<IHasChangeMonitor>()
-                    .Where(i => HasChanged(item, i, dateLastImageRefresh.Value, options.DirectoryService))
-                    .Cast<IImageProvider>()
+                providers = providers
+                    .Where(i =>
+                    {
+                        var hasChangeMonitor = i as IHasChangeMonitor;
+                        if (hasChangeMonitor != null)
+                        {
+                            return HasChanged(item, hasChangeMonitor, status.DateLastImagesRefresh.Value, options.DirectoryService);
+                        }
+
+                        var hasFileChangeMonitor = i as IHasItemChangeMonitor;
+                        if (hasFileChangeMonitor != null)
+                        {
+                            return HasChanged(item, hasFileChangeMonitor, status, options.DirectoryService);
+                        }
+                        
+                        return false;
+                    })
                     .ToList();
             }
 
@@ -520,6 +567,19 @@ namespace MediaBrowser.Providers.Manager
             }
         }
 
+        private bool HasChanged(IHasMetadata item, IHasItemChangeMonitor changeMonitor, MetadataStatus status, IDirectoryService directoryService)
+        {
+            try
+            {
+                return changeMonitor.HasChanged(item, status, directoryService);
+            }
+            catch (Exception ex)
+            {
+                Logger.ErrorException("Error in {0}.HasChanged", ex, changeMonitor.GetType().Name);
+                return false;
+            }
+        }
+
         private bool HasChanged(IHasMetadata item, IHasChangeMonitor changeMonitor, DateTime date, IDirectoryService directoryService)
         {
             try
diff --git a/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs b/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
index 9188a22814..b0c1b10e4c 100644
--- a/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
@@ -19,7 +19,7 @@ namespace MediaBrowser.Providers.MediaInfo
     /// <summary>
     /// Uses ffmpeg to create video images
     /// </summary>
-    public class AudioImageProvider : IDynamicImageProvider, IHasChangeMonitor
+    public class AudioImageProvider : IDynamicImageProvider, IHasItemChangeMonitor
     {
         private readonly ConcurrentDictionary<string, SemaphoreSlim> _locks = new ConcurrentDictionary<string, SemaphoreSlim>();
 
@@ -135,9 +135,17 @@ namespace MediaBrowser.Providers.MediaInfo
             return item is Audio;
         }
 
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
+        public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService)
         {
-            return item.DateModified > date;
+            if (status.ItemDateModified.HasValue)
+            {
+                if (status.ItemDateModified.Value != item.DateModified)
+                {
+                    return true;
+                }
+            }
+
+            return false;
         }
     }
 }
diff --git a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
index e3324fe827..cf0c4bbc29 100644
--- a/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/FFProbeProvider.cs
@@ -34,7 +34,7 @@ namespace MediaBrowser.Providers.MediaInfo
         ICustomMetadataProvider<Trailer>,
         ICustomMetadataProvider<Video>,
         ICustomMetadataProvider<Audio>,
-        IHasChangeMonitor,
+        IHasItemChangeMonitor,
         IHasOrder,
         IForcedProvider
     {
@@ -161,17 +161,11 @@ namespace MediaBrowser.Providers.MediaInfo
             return prober.Probe(item, cancellationToken);
         }
 
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
+        public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService)
         {
-            if (item.DateModified > date)
+            if (status.ItemDateModified.HasValue)
             {
-                return true;
-            }
-
-            if (item is Audio)
-            {
-                // Moved to plural AlbumArtists
-                if (date < new DateTime(2014, 8, 28))
+                if (status.ItemDateModified.Value != item.DateModified)
                 {
                     return true;
                 }
diff --git a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
index 82ccdc4ac6..7d0677ae1c 100644
--- a/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
+++ b/MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
@@ -13,7 +13,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Providers.MediaInfo
 {
-    public class VideoImageProvider : IDynamicImageProvider, IHasChangeMonitor, IHasOrder
+    public class VideoImageProvider : IDynamicImageProvider, IHasItemChangeMonitor, IHasOrder
     {
         private readonly IIsoManager _isoManager;
         private readonly IMediaEncoder _mediaEncoder;
@@ -124,11 +124,6 @@ namespace MediaBrowser.Providers.MediaInfo
             return item.LocationType == LocationType.FileSystem && item is Video;
         }
 
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
-        {
-            return item.DateModified > date;
-        }
-
         public int Order
         {
             get
@@ -137,5 +132,18 @@ namespace MediaBrowser.Providers.MediaInfo
                 return 100;
             }
         }
+
+        public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService)
+        {
+            if (status.ItemDateModified.HasValue)
+            {
+                if (status.ItemDateModified.Value != item.DateModified)
+                {
+                    return true;
+                }
+            }
+
+            return false;
+        }
     }
 }
diff --git a/MediaBrowser.Providers/Photos/PhotoProvider.cs b/MediaBrowser.Providers/Photos/PhotoProvider.cs
index b298c62e74..74c26fdd81 100644
--- a/MediaBrowser.Providers/Photos/PhotoProvider.cs
+++ b/MediaBrowser.Providers/Photos/PhotoProvider.cs
@@ -15,7 +15,7 @@ using TagLib.IFD.Tags;
 
 namespace MediaBrowser.Providers.Photos
 {
-    public class PhotoProvider : ICustomMetadataProvider<Photo>, IHasChangeMonitor
+    public class PhotoProvider : ICustomMetadataProvider<Photo>, IHasItemChangeMonitor
     {
         private readonly ILogger _logger;
         private readonly IImageProcessor _imageProcessor;
@@ -155,16 +155,14 @@ namespace MediaBrowser.Providers.Photos
             get { return "Embedded Information"; }
         }
 
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
+        public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService)
         {
-            // Moved to plural AlbumArtists
-            if (date < new DateTime(2014, 8, 29))
+            if (status.ItemDateModified.HasValue)
             {
-                // Revamped vaptured metadata
-                return true;
+                return status.ItemDateModified.Value != item.DateModified;
             }
-            
-            return item.DateModified > date;
+
+            return false;
         }
     }
 }
diff --git a/MediaBrowser.Providers/TV/TvdbSeriesImageProvider.cs b/MediaBrowser.Providers/TV/TvdbSeriesImageProvider.cs
index d07ee7f730..9cc09c40c9 100644
--- a/MediaBrowser.Providers/TV/TvdbSeriesImageProvider.cs
+++ b/MediaBrowser.Providers/TV/TvdbSeriesImageProvider.cs
@@ -20,7 +20,7 @@ using System.Xml;
 
 namespace MediaBrowser.Providers.TV
 {
-    public class TvdbSeriesImageProvider : IRemoteImageProvider, IHasOrder, IHasChangeMonitor
+    public class TvdbSeriesImageProvider : IRemoteImageProvider, IHasOrder, IHasItemChangeMonitor
     {
         private readonly IServerConfigurationManager _config;
         private readonly IHttpClient _httpClient;
@@ -334,7 +334,7 @@ namespace MediaBrowser.Providers.TV
             });
         }
 
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
+        public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService)
         {
             if (!_config.Configuration.EnableTvDbUpdates)
             {
@@ -350,7 +350,7 @@ namespace MediaBrowser.Providers.TV
 
                 var fileInfo = new FileInfo(imagesXmlPath);
 
-                return fileInfo.Exists && _fileSystem.GetLastWriteTimeUtc(fileInfo) > date;
+                return fileInfo.Exists && _fileSystem.GetLastWriteTimeUtc(fileInfo) > (status.DateLastMetadataRefresh ?? DateTime.MinValue);
             }
 
             return false;
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/Channels/ChannelImageProvider.cs
index 627de32357..5c033e6bdc 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelImageProvider.cs
@@ -10,7 +10,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Implementations.Channels
 {
-    public class ChannelImageProvider : IDynamicImageProvider, IHasChangeMonitor
+    public class ChannelImageProvider : IDynamicImageProvider, IHasItemChangeMonitor
     {
         private readonly IChannelManager _channelManager;
 
@@ -41,16 +41,16 @@ namespace MediaBrowser.Server.Implementations.Channels
             return item is Channel;
         }
 
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
-        {
-            return GetSupportedImages(item).Any(i => !item.HasImage(i));
-        }
-
         private IChannel GetChannel(IHasImages item)
         {
             var channel = (Channel)item;
 
             return ((ChannelManager)_channelManager).GetChannelProvider(channel);
         }
+
+        public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService)
+        {
+            return GetSupportedImages(item).Any(i => !item.HasImage(i));
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Channels/ChannelItemImageProvider.cs b/MediaBrowser.Server.Implementations/Channels/ChannelItemImageProvider.cs
index 94cd8c4536..042beb7e56 100644
--- a/MediaBrowser.Server.Implementations/Channels/ChannelItemImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/Channels/ChannelItemImageProvider.cs
@@ -11,7 +11,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Implementations.Channels
 {
-    public class ChannelItemImageProvider : IDynamicImageProvider, IHasChangeMonitor
+    public class ChannelItemImageProvider : IDynamicImageProvider, IHasItemChangeMonitor
     {
         private readonly IHttpClient _httpClient;
         private readonly ILogger _logger;
@@ -68,7 +68,7 @@ namespace MediaBrowser.Server.Implementations.Channels
             return item is IChannelItem;
         }
 
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
+        public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService)
         {
             var channelItem = item as IChannelItem;
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
index 564fa1a0b7..4dd9f756dd 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/ChannelImageProvider.cs
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Implementations.LiveTv
 {
-    public class ChannelImageProvider : IDynamicImageProvider, IHasChangeMonitor
+    public class ChannelImageProvider : IDynamicImageProvider, IHasItemChangeMonitor
     {
         private readonly ILiveTvManager _liveTvManager;
         private readonly IHttpClient _httpClient;
@@ -103,7 +103,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             get { return 0; }
         }
 
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
+        public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService)
         {
             var liveTvItem = item as LiveTvChannel;
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs
index 06210e03b2..d29b67a8a9 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/ProgramImageProvider.cs
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Implementations.LiveTv
 {
-    public class ProgramImageProvider : IDynamicImageProvider, IHasChangeMonitor
+    public class ProgramImageProvider : IDynamicImageProvider, IHasItemChangeMonitor
     {
         private readonly ILiveTvManager _liveTvManager;
         private readonly IHttpClient _httpClient;
@@ -103,7 +103,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             get { return 0; }
         }
 
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
+        public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService)
         {
             var liveTvItem = item as LiveTvProgram;
 
diff --git a/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs b/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs
index e615305dc1..710247da7d 100644
--- a/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs
+++ b/MediaBrowser.Server.Implementations/LiveTv/RecordingImageProvider.cs
@@ -12,7 +12,7 @@ using System.Threading.Tasks;
 
 namespace MediaBrowser.Server.Implementations.LiveTv
 {
-    public class RecordingImageProvider : IDynamicImageProvider, IHasChangeMonitor
+    public class RecordingImageProvider : IDynamicImageProvider, IHasItemChangeMonitor
     {
         private readonly ILiveTvManager _liveTvManager;
         private readonly IHttpClient _httpClient;
@@ -103,7 +103,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv
             get { return 0; }
         }
 
-        public bool HasChanged(IHasMetadata item, IDirectoryService directoryService, DateTime date)
+        public bool HasChanged(IHasMetadata item, MetadataStatus status, IDirectoryService directoryService)
         {
             var liveTvItem = item as ILiveTvRecording;
 
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
index 84f1d5aaa4..8fac5f56e4 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ar.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
index 8bec53c5fd..ef5e3232e5 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ca.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
index f2219933fc..907b4025d2 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/cs.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
index 7d7492e64a..462d2ddf83 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/da.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
index dfec090ee5..13172927d1 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/de.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "Die Testzeitraum f\u00fcr diese Funktion in ausgelaufen",
     "MessageTrialWillExpireIn": "Der Testzeitraum f\u00fcr diese Funktion wird in {0} Tag(en) auslaufen",
     "MessageInstallPluginFromApp": "Dieses Plugin muss von der App aus installiert werden, mit der du es benutzen willst.",
-    "ValuePriceUSD": "Preis: {0} (USD)"
+    "ValuePriceUSD": "Preis: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
index 3d57ae21f5..d6865210d6 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/el.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
index 9db725ec73..309ecc3d65 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_GB.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
index b740506ae5..2abbc72774 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/en_US.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
index 3d736ba36f..a3459e22cc 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
index 14671bc972..d6437f773b 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/es_MX.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "El periodo de prueba de esta caracter\u00edstica ya ha expirado.",
     "MessageTrialWillExpireIn": "El periodo de prueba de esta caracter\u00edstica expirar\u00e1 en {0} d\u00eda(s).",
     "MessageInstallPluginFromApp": "El complemento debe estar instalado desde la aplicaci\u00f3n en la que va a utilizarlo.",
-    "ValuePriceUSD": "Precio: {0} (USD)"
+    "ValuePriceUSD": "Precio: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
index 028b5ea8ee..b4fc08cbb2 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/fr.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
index aaff70b693..b274072497 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/he.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
index 5ded6e80ba..edd4c1fbd5 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/it.json
@@ -352,73 +352,73 @@
     "HeaderTrack": "Traccia",
     "HeaderDisc": "Disco",
     "OptionMovies": "Film",
-    "OptionCollections": "Collections",
-    "OptionSeries": "Series",
-    "OptionSeasons": "Seasons",
+    "OptionCollections": "Collezioni",
+    "OptionSeries": "Serie",
+    "OptionSeasons": "Stagioni",
     "OptionEpisodes": "Episodi",
-    "OptionGames": "Games",
-    "OptionGameSystems": "Game systems",
-    "OptionMusicArtists": "Music artists",
-    "OptionMusicAlbums": "Music albums",
-    "OptionMusicVideos": "Music videos",
-    "OptionSongs": "Songs",
-    "OptionHomeVideos": "Home videos",
-    "OptionBooks": "Books",
-    "OptionAdultVideos": "Adult videos",
-    "ButtonUp": "Up",
-    "ButtonDown": "Down",
+    "OptionGames": "Giochi",
+    "OptionGameSystems": "Configurazione gioco",
+    "OptionMusicArtists": "Artisti",
+    "OptionMusicAlbums": "Album",
+    "OptionMusicVideos": "Video",
+    "OptionSongs": "Canzoni",
+    "OptionHomeVideos": "Video personali",
+    "OptionBooks": "Libri",
+    "OptionAdultVideos": "Video per adulti",
+    "ButtonUp": "Su",
+    "ButtonDown": "Giu",
     "LabelMetadataReaders": "Metadata readers:",
-    "LabelMetadataReadersHelp": "Rank your preferred local metadata sources in order of priority. The first file found will be read.",
+    "LabelMetadataReadersHelp": "Classificare le origini metadati locali preferite in ordine di priorit\u00e0. Il primo file trovato verr\u00e0 letto.",
     "LabelMetadataDownloaders": "Metadata downloaders:",
-    "LabelMetadataDownloadersHelp": "Enable and rank your preferred metadata downloaders in order of priority. Lower priority downloaders will only be used to fill in missing information.",
+    "LabelMetadataDownloadersHelp": "Abilitare e classificare i tuoi downloader metadati preferite in ordine di priorit\u00e0. Downloader di priorit\u00e0 inferiori saranno utilizzati solo per riempire le informazioni mancanti.",
     "LabelMetadataSavers": "Metadata savers:",
-    "LabelMetadataSaversHelp": "Choose the file formats to save your metadata to.",
-    "LabelImageFetchers": "Image fetchers:",
-    "LabelImageFetchersHelp": "Enable and rank your preferred image fetchers in order of priority.",
-    "ButtonQueueAllFromHere": "Queue all from here",
-    "ButtonPlayAllFromHere": "Play all from here",
+    "LabelMetadataSaversHelp": "Scegliere i formati di file per salvare i metadati",
+    "LabelImageFetchers": "Immagini compatibili:",
+    "LabelImageFetchersHelp": "Abilitare e classificare i tuoi Fetchers immagini preferite in ordine di priorit\u00e0.",
+    "ButtonQueueAllFromHere": "Coda tutto da qui",
+    "ButtonPlayAllFromHere": "play tutto da qui",
     "LabelDynamicExternalId": "{0} Id:",
-    "HeaderIdentify": "Identify Item",
-    "PersonTypePerson": "Person",
-    "LabelTitleDisplayOrder": "Title display order:",
-    "OptionSortName": "Sort name",
-    "OptionReleaseDate": "Release date",
-    "LabelSeasonNumber": "Numero Stagione",
-    "LabelDiscNumber": "Disc number",
-    "LabelParentNumber": "Parent number",
-    "LabelEpisodeNumber": "Numero Episodio",
-    "LabelTrackNumber": "Track number:",
-    "LabelNumber": "Number:",
-    "LabelReleaseDate": "Release date:",
-    "LabelEndDate": "End date:",
-    "LabelYear": "Year:",
-    "LabelDateOfBirth": "Date of birth:",
-    "LabelBirthYear": "Birth year:",
-    "LabelDeathDate": "Death date:",
-    "HeaderRemoveMediaLocation": "Remove Media Location",
-    "MessageConfirmRemoveMediaLocation": "Are you sure you wish to remove this location?",
-    "HeaderRenameMediaFolder": "Rename Media Folder",
-    "LabelNewName": "New name:",
-    "HeaderAddMediaFolder": "Add Media Folder",
-    "HeaderAddMediaFolderHelp": "Name (Movies, Music, TV, etc):",
-    "HeaderRemoveMediaFolder": "Remove Media Folder",
-    "MessageTheFollowingLocationWillBeRemovedFromLibrary": "The following media locations will be removed from your library:",
-    "MessageAreYouSureYouWishToRemoveMediaFolder": "Are you sure you wish to remove this media folder?",
-    "ButtonRename": "Rename",
-    "ButtonChangeType": "Change type",
-    "HeaderMediaLocations": "Media Locations",
-    "LabelFolderTypeValue": "Folder type: {0}",
-    "LabelPathSubstitutionHelp": "Optional: Path substitution can map server paths to network shares that clients can access for direct playback.",
-    "FolderTypeMixed": "Mixed movies & tv",
-    "FolderTypeMovies": "Movies",
-    "FolderTypeMusic": "Music",
-    "FolderTypeAdultVideos": "Adult videos",
-    "FolderTypePhotos": "Photos",
-    "FolderTypeMusicVideos": "Music videos",
-    "FolderTypeHomeVideos": "Home videos",
-    "FolderTypeGames": "Games",
-    "FolderTypeBooks": "Books",
-    "FolderTypeTvShows": "TV shows",
+    "HeaderIdentify": "Identificare Elemento",
+    "PersonTypePerson": "Persona",
+    "LabelTitleDisplayOrder": "Titolo mostrato in ordine:",
+    "OptionSortName": "Nome ordinato",
+    "OptionReleaseDate": "data di rilascio",
+    "LabelSeasonNumber": "Numero Stagione:",
+    "LabelDiscNumber": "Disco numero",
+    "LabelParentNumber": "Numero superiore",
+    "LabelEpisodeNumber": "Numero Episodio :",
+    "LabelTrackNumber": "Traccia numero:",
+    "LabelNumber": "Numero:",
+    "LabelReleaseDate": "Data di rilascio:",
+    "LabelEndDate": "Fine data:",
+    "LabelYear": "Anno:",
+    "LabelDateOfBirth": "Data nascita:",
+    "LabelBirthYear": "Anno nascita:",
+    "LabelDeathDate": "Anno morte:",
+    "HeaderRemoveMediaLocation": "Rimuovi percorso media",
+    "MessageConfirmRemoveMediaLocation": "Sei sicuro di voler rimuovere questa posizione?",
+    "HeaderRenameMediaFolder": "Rinomina cartella",
+    "LabelNewName": "Nuovo nome:",
+    "HeaderAddMediaFolder": "Aggiungi cartella",
+    "HeaderAddMediaFolderHelp": "Nome (film,musica,tv etc ):",
+    "HeaderRemoveMediaFolder": "Rimuovi cartella",
+    "MessageTheFollowingLocationWillBeRemovedFromLibrary": "I seguenti percorsi multimediali saranno rimossi dalla libreria:",
+    "MessageAreYouSureYouWishToRemoveMediaFolder": "Sei sicuro di voler rimuovere questa posizione?",
+    "ButtonRename": "Rinomina",
+    "ButtonChangeType": "Cambia tipo",
+    "HeaderMediaLocations": "Posizioni Media",
+    "LabelFolderTypeValue": "Tipo cartella: {0}",
+    "LabelPathSubstitutionHelp": "Opzionale: cambio Path pu\u00f2 mappare i percorsi del server a condivisioni di rete che i clienti possono accedere per la riproduzione diretta.",
+    "FolderTypeMixed": "Misto Film & Tv",
+    "FolderTypeMovies": "Film",
+    "FolderTypeMusic": "Musica",
+    "FolderTypeAdultVideos": "Video per adulti",
+    "FolderTypePhotos": "Foto",
+    "FolderTypeMusicVideos": "Video musicali",
+    "FolderTypeHomeVideos": "Video personali",
+    "FolderTypeGames": "Giochi",
+    "FolderTypeBooks": "Libri",
+    "FolderTypeTvShows": "Serie TV",
     "TabMovies": "Film",
     "TabSeries": "Serie TV",
     "TabEpisodes": "Episodi",
@@ -427,16 +427,17 @@
     "TabAlbums": "Albums",
     "TabSongs": "Canzoni",
     "TabMusicVideos": "Video Musicali",
-    "BirthPlaceValue": "Birth place: {0}",
-    "DeathDateValue": "Died: {0}",
-    "BirthDateValue": "Born: {0}",
-    "HeaderLatestReviews": "Latest Reviews",
-    "HeaderPluginInstallation": "Plugin Installation",
-    "MessageAlreadyInstalled": "This version is already installed.",
-    "ValueReviewCount": "{0} Reviews",
-    "MessageYouHaveVersionInstalled": "You currently have version {0} installed.",
-    "MessageTrialExpired": "The trial period for this feature has expired",
-    "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
+    "BirthPlaceValue": "Luogo di nascita: {0}",
+    "DeathDateValue": "Morto: {0}",
+    "BirthDateValue": "Nato: {0}",
+    "HeaderLatestReviews": "Ultime recensioni",
+    "HeaderPluginInstallation": "Installazione Plugin",
+    "MessageAlreadyInstalled": "Questa versione \u00e8 gi\u00e0 installata.",
+    "ValueReviewCount": "{0} recensioni",
+    "MessageYouHaveVersionInstalled": "Attualmente hai la versione {0} installato.",
+    "MessageTrialExpired": "Il periodo di prova per questa funzione \u00e8 scaduto.",
+    "MessageTrialWillExpireIn": "Il periodo di prova per questa funzione scadr\u00e0 in {0} giorni",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Prezzo: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "Siete registrati per questa funzione, e sarete in grado di continuare ad usarlo con un abbonamento attivo sostenitore."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
index 0448e8f3f2..c1d4a42c92 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
@@ -446,5 +446,9 @@
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
     "ValuePriceUSD": "Price: {0} (USD)",
-    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership.",
+    "MessageChangeRecurringPlanConfirm": "After completing this transaction you will need to cancel your previous recurring donation from within your PayPal account. Thank you for supporting Media Browser.",
+    "MessageSupporterMembershipExpiredOn": "Your supporter membership expired on {0}.",
+    "MessageYouHaveALifetimeMembership": "You have a lifetime supporter membership. You can provide additional donations on a one-time or recurring basis using the options below. Thank you for supporting Media Browser.",
+    "MessageYouHaveAnActiveRecurringMembership": "You have an active {0} membership. You can upgrade your plan using the options below."
 }
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
index b90b6692a7..c51eb83459 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/kk.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "\u041e\u0441\u044b \u043c\u04af\u043c\u043a\u0456\u043d\u0434\u0456\u043a \u04af\u0448\u0456\u043d \u0442\u0430\u043d\u044b\u0441\u0442\u044b\u0440\u0443 \u043a\u0435\u0437\u0435\u04a3\u0456\u043d\u0456\u04a3 \u043c\u0435\u0440\u0437\u0456\u043c\u0456 \u04e9\u0442\u0442\u0456",
     "MessageTrialWillExpireIn": "\u041e\u0441\u044b \u043c\u04af\u043c\u043a\u0456\u043d\u0434\u0456\u043a \u04af\u0448\u0456\u043d \u0442\u0430\u043d\u044b\u0441\u0442\u044b\u0440\u0443 \u043a\u0435\u0437\u0435\u04a3\u0456\u043d\u0456\u04a3 \u043c\u0435\u0440\u0437\u0456\u043c\u0456 {0} \u043a\u04af\u043d\u0434\u0435 \u04e9\u0442\u0435\u0434\u0456",
     "MessageInstallPluginFromApp": "\u0411\u04b1\u043b \u043f\u043b\u0430\u0433\u0438\u043d \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0493\u0430 \u043c\u0430\u049b\u0441\u0430\u0442\u0442\u0430\u043b\u0493\u0430\u043d \u049b\u043e\u043b\u0434\u0430\u043d\u0431\u0430 \u0431\u0430\u0440 \u0431\u043e\u043b\u0493\u0430\u043d\u0434\u0430 \u043e\u0440\u043d\u0430\u0442\u044b\u043b\u0443\u044b \u0442\u0438\u0456\u0441\u0442\u0456.",
-    "ValuePriceUSD": "\u0411\u0430\u0493\u0430\u0441\u044b: {0} USD"
+    "ValuePriceUSD": "\u0411\u0430\u0493\u0430\u0441\u044b: {0} USD",
+    "MessageFeatureIncludedWithSupporter": "\u041e\u0441\u044b \u043c\u04af\u043c\u043a\u0456\u043d\u0434\u0456\u043a \u04af\u0448\u0456\u043d \u0442\u0456\u0440\u043a\u0435\u043b\u0433\u0435\u043d\u0441\u0456\u0437, \u0436\u04d9\u043d\u0435 \u043e\u043d\u044b \u0431\u0435\u043b\u0441\u0435\u043d\u0434\u0456 \u049b\u043e\u043b\u0434\u0430\u0443\u0448\u044b \u043c\u04af\u0448\u0435\u043b\u0456\u0433\u0456 \u0430\u0440\u049b\u044b\u043b\u044b \u043f\u0430\u0439\u0434\u0430\u043b\u0430\u043d\u0443\u0434\u044b \u0436\u0430\u043b\u0493\u0430\u0441\u0442\u044b\u0440\u0430 \u0430\u043b\u0430\u0441\u044b\u0437."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
index 6aff55b44e..8ad8d572c4 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ms.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
index 13a031937b..e9979c75d0 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nb.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
index 0f73e98146..0d22512b47 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/nl.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "De proef periode voor deze feature is verlopen",
     "MessageTrialWillExpireIn": "De proef periode voor deze feature zal in {0} dag(en) verlopen",
     "MessageInstallPluginFromApp": "Deze plugin moet ge\u00efnstalleerd worden vanuit de app waarin je het wil gebruiken.",
-    "ValuePriceUSD": "Prijs {0} (USD)"
+    "ValuePriceUSD": "Prijs {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "U bent geregistreerd voor deze functie, en zal deze kunnen blijven gebruiken met uw actieve supporter lidmaatschap."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
index be23009ba5..20d24d4fad 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pl.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
index b3577bea6c..5ce0cdcbd3 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_BR.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "O per\u00edodo de testes terminou",
     "MessageTrialWillExpireIn": "O per\u00edodo de testes expirar\u00e1 em {0} dia(s)",
     "MessageInstallPluginFromApp": "Este plugin deve ser instalado de dentro da app em que deseja us\u00e1-lo.",
-    "ValuePriceUSD": "Pre\u00e7o: {0} (USD)"
+    "ValuePriceUSD": "Pre\u00e7o: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "Voc\u00ea est\u00e1 registrado para este recurso e poder\u00e1 continuar usando-o com uma filia\u00e7\u00e3o ativa de colaborador."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
index 00ed7f6220..dd435d6278 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/pt_PT.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
index d3b69c8cd8..913aa874c2 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/ru.json
@@ -219,7 +219,7 @@
     "ButtonStart": "\u0417\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c",
     "HeaderChannels": "\u041a\u0430\u043d\u0430\u043b\u044b",
     "HeaderMediaFolders": "\u041c\u0435\u0434\u0438\u0430\u043f\u0430\u043f\u043a\u0438",
-    "HeaderBlockItemsWithNoRating": "\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u044b \u0431\u0435\u0437 \u0432\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u043e\u0439 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438:",
+    "HeaderBlockItemsWithNoRating": "\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432 \u0431\u0435\u0437 \u0432\u043e\u0437\u0440\u0430\u0441\u0442\u043d\u043e\u0439 \u043a\u0430\u0442\u0435\u0433\u043e\u0440\u0438\u0438:",
     "OptionBlockOthers": "\u0414\u0440\u0443\u0433\u0438\u0435",
     "OptionBlockTvShows": "\u0422\u0412 \u0446\u0438\u043a\u043b\u044b",
     "OptionBlockTrailers": "\u0422\u0440\u0435\u0439\u043b\u0435\u0440\u044b",
@@ -408,7 +408,7 @@
     "ButtonChangeType": "\u0421\u043c\u0435\u043d\u0438\u0442\u044c \u0442\u0438\u043f",
     "HeaderMediaLocations": "\u0420\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u043c\u0435\u0434\u0438\u0430\u0434\u0430\u043d\u043d\u044b\u0445",
     "LabelFolderTypeValue": "\u0422\u0438\u043f \u043f\u0430\u043f\u043a\u0438: {0}",
-    "LabelPathSubstitutionHelp": "\u041d\u0435\u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e: \u041f\u0440\u0438 \u043f\u043e\u0434\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0435 \u043f\u0443\u0442\u0435\u0439 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u0441\u043e\u043f\u043e\u0441\u0442\u0430\u0432\u0438\u0442\u044c \u0441\u0435\u0440\u0432\u0435\u0440\u043d\u044b\u0435 \u043f\u0443\u0442\u0438 \u0441 \u0441\u0435\u0442\u0435\u0432\u044b\u043c\u0438 \u043e\u0431\u0449\u0438\u043c\u0438 \u0440\u0435\u0441\u0443\u0440\u0441\u0430\u043c\u0438, \u043a \u043a\u043e\u0442\u043e\u0440\u044b\u043c \u043a\u043b\u0438\u0435\u043d\u0442\u044b \u0441\u043c\u043e\u0433\u0443\u0442 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f \u0434\u043b\u044f \u043f\u0440\u044f\u043c\u043e\u0433\u043e \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f.",
+    "LabelPathSubstitutionHelp": "\u041d\u0435\u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e: \u041f\u043e\u0434\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u043f\u0443\u0442\u0435\u0439 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0441\u043e\u043f\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u043d\u044b\u0445 \u043f\u0443\u0442\u0435\u0439 \u0441 \u0441\u0435\u0442\u0435\u0432\u044b\u043c\u0438 \u043e\u0431\u0449\u0438\u043c\u0438 \u0440\u0435\u0441\u0443\u0440\u0441\u0430\u043c\u0438, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0441\u043c\u043e\u0433\u0443\u0442 \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u043a\u043b\u0438\u0435\u043d\u0442\u0430\u043c \u0434\u043b\u044f \u043f\u0440\u044f\u043c\u043e\u0433\u043e \u0432\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u044f.",
     "FolderTypeMixed": "\u0421\u043c\u0435\u0448\u0430\u043d\u043d\u044b\u0439 (\u0444\u0438\u043b\u044c\u043c\u044b \u0438 \u0422\u0412)",
     "FolderTypeMovies": "\u0424\u0438\u043b\u044c\u043c\u044b",
     "FolderTypeMusic": "\u041c\u0443\u0437\u044b\u043a\u0430",
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "\u041f\u0440\u043e\u0431\u043d\u044b\u0439 \u043f\u0435\u0440\u0438\u043e\u0434 \u0434\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0439 \u0444\u0443\u043d\u043a\u0446\u0438\u0438 \u0438\u0441\u0442\u0451\u043a",
     "MessageTrialWillExpireIn": "\u041f\u0440\u043e\u0431\u043d\u044b\u0439 \u043f\u0435\u0440\u0438\u043e\u0434 \u0434\u043b\u044f \u0434\u0430\u043d\u043d\u043e\u0439 \u0444\u0443\u043d\u043a\u0446\u0438\u0438 \u0438\u0441\u0442\u0435\u0447\u0451\u0442 \u0447\u0435\u0440\u0435\u0437 {0} \u0434\u043d\u0435\u0439",
     "MessageInstallPluginFromApp": "\u0414\u0430\u043d\u043d\u044b\u0439 \u043f\u043b\u0430\u0433\u0438\u043d \u0434\u043e\u043b\u0436\u0435\u043d \u0443\u0441\u0442\u0430\u043d\u0430\u0432\u043b\u0438\u0432\u0430\u0442\u044c\u0441\u044f \u043f\u0440\u0438 \u043d\u0430\u043b\u0438\u0447\u0438\u0438 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f, \u043d\u0430\u043c\u0435\u0447\u0435\u043d\u043d\u043e\u0433\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0441 \u043d\u0438\u043c.",
-    "ValuePriceUSD": "\u0426\u0435\u043d\u0430: {0} USD"
+    "ValuePriceUSD": "\u0426\u0435\u043d\u0430: {0} USD",
+    "MessageFeatureIncludedWithSupporter": "\u0412\u044b \u0437\u0430\u0440\u0435\u0433\u0438\u0441\u0442\u0440\u0438\u0440\u043e\u0432\u0430\u043b\u0438\u0441\u044c \u0434\u043b\u044f \u044d\u0442\u043e\u0439 \u0444\u0443\u043d\u043a\u0446\u0438\u0438, \u0438 \u0441\u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0435\u0451 \u0441 \u043f\u043e\u043c\u043e\u0449\u044c\u044e \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0441\u043f\u043e\u043d\u0441\u043e\u0440\u0441\u043a\u043e\u0433\u043e \u0447\u043b\u0435\u043d\u0441\u0442\u0432\u0430."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
index f6c2313e55..a32bac77a6 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/sv.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/tr.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/tr.json
index c6c2b44911..a5ba30707e 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/tr.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/tr.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
index b63fb262f4..3dd08e2083 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/vi.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
index 1b7217efb2..e3dc996830 100644
--- a/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/JavaScript/zh_TW.json
@@ -438,5 +438,6 @@
     "MessageTrialExpired": "The trial period for this feature has expired",
     "MessageTrialWillExpireIn": "The trial period for this feature will expire in {0} day(s)",
     "MessageInstallPluginFromApp": "This plugin must be installed from with in the app you intend to use it in.",
-    "ValuePriceUSD": "Price: {0} (USD)"
+    "ValuePriceUSD": "Price: {0} (USD)",
+    "MessageFeatureIncludedWithSupporter": "You are registered for this feature, and will be able to continue using it with an active supporter membership."
 }
\ No newline at end of file
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ar.json b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
index 43ee3b73b9..07b7984857 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ar.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ar.json
@@ -272,7 +272,9 @@
     "OptionArtist": "\u0641\u0646\u0627\u0646",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "\u0627\u0644\u0628\u0648\u0645",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "\u0627\u0633\u0645 \u0627\u0644\u0627\u063a\u0646\u064a\u0629",
+    "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.",
     "OptionCommunityRating": "\u062a\u0635\u0646\u064a\u0641 \u0627\u0644\u0645\u062c\u062a\u0645\u0639",
     "OptionNameSort": "\u0627\u0633\u0645",
     "OptionFolderSort": "Folders",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ca.json b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
index 1e629595d2..28a5f8fb53 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ca.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ca.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artist",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Track Name",
+    "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.",
     "OptionCommunityRating": "Community Rating",
     "OptionNameSort": "Name",
     "OptionFolderSort": "Folders",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/cs.json b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
index feb5d5882f..f2974c0fff 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/cs.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/cs.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Um\u011blec",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "N\u00e1zev skladby",
+    "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.",
     "OptionCommunityRating": "Hodnocen\u00ed komunity",
     "OptionNameSort": "N\u00e1zev",
     "OptionFolderSort": "Slo\u017eky",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/da.json b/MediaBrowser.Server.Implementations/Localization/Server/da.json
index f3e54798bb..a3bd0fe590 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/da.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/da.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artist",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Nummerets Navn",
+    "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.",
     "OptionCommunityRating": "Community Rating",
     "OptionNameSort": "Navn",
     "OptionFolderSort": "Mapper",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/de.json b/MediaBrowser.Server.Implementations/Localization/Server/de.json
index b4f62ad0cf..55e36e1fec 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/de.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/de.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Interpret",
     "OptionSaveMetadataAsHidden": "Speichere Metadaten und Bilder als versteckte Dateien",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Track Name",
+    "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.",
     "OptionCommunityRating": "Community Bewertung",
     "OptionNameSort": "Name",
     "OptionFolderSort": "Verzeichnisse",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/el.json b/MediaBrowser.Server.Implementations/Localization/Server/el.json
index 5c9cefe672..14552d229b 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/el.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/el.json
@@ -272,7 +272,9 @@
     "OptionArtist": " \u039a\u03b1\u03bb\u03bb\u03b9\u03c4\u03ad\u03c7\u03bd\u03b5\u03c2",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "\u03ac\u03bb\u03bc\u03c0\u03bf\u03c5\u03bc",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Track Name",
+    "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.",
     "OptionCommunityRating": "Community Rating",
     "OptionNameSort": "Name",
     "OptionFolderSort": "Folders",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
index decf70b097..45ba6eaedc 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_GB.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artist",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Track Name",
+    "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.",
     "OptionCommunityRating": "Community Rating",
     "OptionNameSort": "Name",
     "OptionFolderSort": "Folders",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
index 0dbd655f9b..9ab81e4549 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/en_US.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artist",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Track Name",
+    "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.",
     "OptionCommunityRating": "Community Rating",
     "OptionNameSort": "Name",
     "OptionFolderSort": "Folders",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es.json b/MediaBrowser.Server.Implementations/Localization/Server/es.json
index 80270bb278..ac0d6253ed 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artista",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Nombre de pista",
+    "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.",
     "OptionCommunityRating": "Valoraci\u00f3n comunidad",
     "OptionNameSort": "Nombre",
     "OptionFolderSort": "Carpetas",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
index e3798212b7..2c4217a718 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/es_MX.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artista",
     "OptionSaveMetadataAsHidden": "Guardar metadatos e im\u00e1genes como archivos ocultos",
     "OptionAlbum": "\u00c1lbum",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Nombre de la Pista",
+    "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.",
     "OptionCommunityRating": "Calificaci\u00f3n de la Comunidad",
     "OptionNameSort": "Nombre",
     "OptionFolderSort": "Carpetas",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/fr.json b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
index 5047f63a39..2bff3f4c15 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/fr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/fr.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artiste",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Nom du morceau",
+    "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.",
     "OptionCommunityRating": "Note de la communaut\u00e9",
     "OptionNameSort": "Nom",
     "OptionFolderSort": "R\u00e9pertoires",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/he.json b/MediaBrowser.Server.Implementations/Localization/Server/he.json
index f2a7898f60..70b570b00d 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/he.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/he.json
@@ -272,7 +272,9 @@
     "OptionArtist": "\u05d0\u05de\u05df",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "\u05d0\u05dc\u05d1\u05d5\u05dd",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "\u05e9\u05dd \u05d4\u05e9\u05d9\u05e8",
+    "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.",
     "OptionCommunityRating": "\u05d3\u05d9\u05e8\u05d5\u05d2 \u05d4\u05e7\u05d4\u05d9\u05dc\u05d4",
     "OptionNameSort": "\u05e9\u05dd",
     "OptionFolderSort": "\u05ea\u05d9\u05e7\u05d9\u05d5\u05ea",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/it.json b/MediaBrowser.Server.Implementations/Localization/Server/it.json
index 84014e3f3b..de6ee37834 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/it.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/it.json
@@ -72,195 +72,195 @@
     "ButtonCancel": "Annulla",
     "HeaderLocalAccess": "Accesso locale",
     "ButtonNew": "Nuovo",
-    "HeaderViewOrder": "View Order",
+    "HeaderViewOrder": "Visualizza ordine",
     "HeaderSetupLibrary": "Configura la tua libreria",
-    "LabelSelectUserViewOrder": "Choose the order your views will be displayed in within Media Browser apps",
+    "LabelSelectUserViewOrder": "Scegliere l'ordine vostre opinioni verranno visualizzati in applicazioni all'interno del browser media",
     "ButtonAddMediaFolder": "Aggiungi cartella",
-    "LabelMetadataRefreshMode": "Metadata refresh mode:",
+    "LabelMetadataRefreshMode": "Metadata (modo Aggiornamento)",
     "LabelFolderType": "Tipo cartella",
-    "LabelImageRefreshMode": "Image refresh mode:",
+    "LabelImageRefreshMode": "Immagine (modo Aggiornamento)",
     "MediaFolderHelpPluginRequired": "* Richiede l'uso di un plugin, ad esempio GameBrowser o MB Bookshelf.",
-    "OptionDownloadMissingImages": "Download missing images",
+    "OptionDownloadMissingImages": "Immagini mancanti",
     "ReferToMediaLibraryWiki": "Fare riferimento alla wiki libreria multimediale.",
-    "OptionReplaceExistingImages": "Replace existing images",
+    "OptionReplaceExistingImages": "Sovrascrivi immagini esistenti",
     "LabelCountry": "Nazione:",
-    "OptionRefreshAllData": "Refresh all data",
+    "OptionRefreshAllData": "Aggiorna tutti i dati",
     "LabelLanguage": "lingua:",
-    "OptionAddMissingDataOnly": "Add missing data only",
+    "OptionAddMissingDataOnly": "Aggiungi solo dati mancanti",
     "HeaderPreferredMetadataLanguage": "Lingua dei metadati preferita:",
-    "OptionLocalRefreshOnly": "Local refresh only",
+    "OptionLocalRefreshOnly": "Aggiorna solo locale",
     "LabelSaveLocalMetadata": "Salva immagini e metadati nelle cartelle multimediali",
-    "HeaderRefreshMetadata": "Refresh Metadata",
+    "HeaderRefreshMetadata": "Aggiorna metadati",
     "LabelSaveLocalMetadataHelp": "Il salvataggio di immagini e dei metadati direttamente nelle cartelle multimediali verranno messe in un posto dove possono essere facilmente modificate.",
-    "HeaderPersonInfo": "Person Info",
+    "HeaderPersonInfo": "Persona Info",
     "LabelDownloadInternetMetadata": "Scarica immagini e dei metadati da internet",
-    "HeaderIdentifyItem": "Identify Item",
+    "HeaderIdentifyItem": "Identifica elemento",
     "LabelDownloadInternetMetadataHelp": "Media Browser pu\u00f2 scaricare informazioni sui vostri media per consentire presentazioni migliori.",
-    "HeaderIdentifyItemHelp": "Enter one or more search criteria. Remove criteria to increase search results.",
+    "HeaderIdentifyItemHelp": "Inserisci uno o pi\u00f9 criteri di ricerca. Rimuovi criteri di aumentare i risultati di ricerca.",
     "TabPreferences": "Preferenze",
     "HeaderConfirmDeletion": "Conferma Cancellazione",
     "TabPassword": "Password",
-    "LabelFollowingFileWillBeDeleted": "The following file will be deleted:",
+    "LabelFollowingFileWillBeDeleted": "Il seguente file verr\u00e0 eliminato:",
     "TabLibraryAccess": "Accesso libreria",
-    "LabelIfYouWishToContinueWithDeletion": "If you wish to continue, please confirm by entering the value of:",
+    "LabelIfYouWishToContinueWithDeletion": "Se si desidera continuare, si prega di confermare inserendo il valore di:",
     "TabImage": "Immagine",
-    "ButtonIdentify": "Identify",
+    "ButtonIdentify": "Identifica",
     "TabProfile": "Profilo",
-    "LabelAlbumArtist": "Album artist:",
+    "LabelAlbumArtist": "Artista Album",
     "TabMetadata": "Metadata",
     "LabelAlbum": "Album:",
     "TabImages": "Immagini",
-    "LabelCommunityRating": "Community rating:",
+    "LabelCommunityRating": "Voto Comunit\u00e0:",
     "TabNotifications": "Notifiche",
-    "LabelVoteCount": "Vote count:",
+    "LabelVoteCount": "Totale Voti:",
     "TabCollectionTitles": "Titolo",
-    "LabelMetascore": "Metascore:",
+    "LabelMetascore": "Punteggio:",
     "LabelDisplayMissingEpisodesWithinSeasons": "Visualizza gli episodi mancanti  nelle stagioni",
-    "LabelCriticRating": "Critic rating:",
+    "LabelCriticRating": "Voto dei critici:",
     "LabelUnairedMissingEpisodesWithinSeasons": "Visualizzare episodi mai andati in onda all'interno stagioni",
-    "LabelCriticRatingSummary": "Critic rating summary:",
+    "LabelCriticRatingSummary": "Critico sintesi valutazione:",
     "HeaderVideoPlaybackSettings": "Impostazioni di riproduzione video",
-    "LabelAwardSummary": "Award summary:",
+    "LabelAwardSummary": "Sintesi Premio:",
     "HeaderPlaybackSettings": "Impostazioni di riproduzione",
-    "LabelWebsite": "Website:",
+    "LabelWebsite": "Sito web:",
     "LabelAudioLanguagePreference": "Audio preferenze di lingua:",
-    "LabelTagline": "Tagline:",
+    "LabelTagline": "Messaggio pers:",
     "LabelSubtitleLanguagePreference": "Sottotitoli preferenze di lingua:",
-    "LabelOverview": "Overview:",
+    "LabelOverview": "Trama:",
     "OptionDefaultSubtitles": "Predefinito",
-    "LabelShortOverview": "Short overview:",
+    "LabelShortOverview": "Trama breve:",
     "OptionOnlyForcedSubtitles": "Solo i sottotitoli forzati",
-    "LabelReleaseDate": "Release date:",
+    "LabelReleaseDate": "Data di rilascio:",
     "OptionAlwaysPlaySubtitles": "Visualizza sempre i sottotitoli",
-    "LabelYear": "Year:",
+    "LabelYear": "Anno:",
     "OptionNoSubtitles": "Nessun Sottotitolo",
-    "LabelPlaceOfBirth": "Place of birth:",
+    "LabelPlaceOfBirth": "Luogo di nascita:",
     "OptionDefaultSubtitlesHelp": "Sottotitoli corrispondenti alla lingua di preferenza saranno caricati quando l'audio \u00e8 in una lingua straniera.",
-    "LabelEndDate": "End date:",
+    "LabelEndDate": "Fine data:",
     "OptionOnlyForcedSubtitlesHelp": "Solo sottotitoli contrassegnati come forzati saranno caricati.",
-    "LabelAirDate": "Air days:",
+    "LabelAirDate": "In onda da (gg):",
     "OptionAlwaysPlaySubtitlesHelp": "Sottotitoli corrispondenti alla lingua di preferenza saranno caricati a prescindere dalla lingua audio.",
-    "LabelAirTime:": "Air time:",
+    "LabelAirTime:": "In onda da:",
     "OptionNoSubtitlesHelp": "I sottotitoli non verranno caricati di default.",
-    "LabelRuntimeMinutes": "Run time (minutes):",
+    "LabelRuntimeMinutes": "Durata ( minuti):",
     "TabProfiles": "Profili",
-    "LabelParentalRating": "Parental rating:",
+    "LabelParentalRating": "Voto genitori:",
     "TabSecurity": "Sicurezza",
-    "LabelCustomRating": "Custom rating:",
+    "LabelCustomRating": "Voto personalizzato:",
     "ButtonAddUser": "Aggiungi Utente",
     "LabelBudget": "Budget",
     "ButtonSave": "Salva",
-    "LabelRevenue": "Revenue ($):",
+    "LabelRevenue": "Fatturato ($):",
     "ButtonResetPassword": "Reset Password",
-    "LabelOriginalAspectRatio": "Original aspect ratio:",
+    "LabelOriginalAspectRatio": "Aspetto originale:",
     "LabelNewPassword": "Nuova Password:",
-    "LabelPlayers": "Players:",
+    "LabelPlayers": "Giocatore:",
     "LabelNewPasswordConfirm": "Nuova Password Conferma:",
-    "Label3DFormat": "3D format:",
+    "Label3DFormat": "Formato 3D:",
     "HeaderCreatePassword": "Crea Password",
-    "HeaderAlternateEpisodeNumbers": "Alternate Episode Numbers",
+    "HeaderAlternateEpisodeNumbers": "Numeri Episode alternativi",
     "LabelCurrentPassword": "Password Corrente:",
-    "HeaderSpecialEpisodeInfo": "Special Episode Info",
+    "HeaderSpecialEpisodeInfo": "Episodio Speciale Info",
     "LabelMaxParentalRating": "Massima valutazione dei genitori consentita:",
-    "HeaderExternalIds": "External Id's:",
+    "HeaderExternalIds": "Esterno Id di :",
     "MaxParentalRatingHelp": "Contento di un punteggio pi\u00f9 elevato sar\u00e0 nascosto da questo utente.",
-    "LabelDvdSeasonNumber": "Dvd season number:",
+    "LabelDvdSeasonNumber": "Dvd stagione:",
     "LibraryAccessHelp": "Selezionare le cartelle multimediali da condividere con questo utente. Gli amministratori saranno in grado di modificare tutte le cartelle utilizzando il gestore dei metadati.",
-    "LabelDvdEpisodeNumber": "Dvd episode number:",
+    "LabelDvdEpisodeNumber": "Numero episodio Dvd:",
     "ChannelAccessHelp": "Selezionare i canali da condividere con questo utente. Gli amministratori saranno in grado di modificare tutti i canali usando il gestore dei metadati",
-    "LabelAbsoluteEpisodeNumber": "Absolute episode number:",
+    "LabelAbsoluteEpisodeNumber": "Absolute Numero episodio:",
     "ButtonDeleteImage": "Elimina immagine",
-    "LabelAirsBeforeSeason": "Airs before season:",
+    "LabelAirsBeforeSeason": "tempo prima della stagione:",
     "LabelSelectUsers": "Seleziona Utenti:",
-    "LabelAirsAfterSeason": "Airs after season:",
+    "LabelAirsAfterSeason": "tempo dopo della stagione:",
     "ButtonUpload": "Carica",
-    "LabelAirsBeforeEpisode": "Airs before episode:",
+    "LabelAirsBeforeEpisode": "tempo prima episodio:",
     "HeaderUploadNewImage": "Carica nuova immagine",
-    "LabelTreatImageAs": "Treat image as:",
+    "LabelTreatImageAs": "Trattare come immagine:",
     "LabelDropImageHere": "Trascina l'immagine qui",
-    "LabelDisplayOrder": "Display order:",
+    "LabelDisplayOrder": "Ordine visualizzazione:",
     "ImageUploadAspectRatioHelp": "1:1 Aspect Ratio Recommended. JPG\/PNG only.",
     "LabelDisplaySpecialsWithinSeasons": "Display specials within seasons they aired in",
     "MessageNothingHere": "Niente qui.",
-    "HeaderCountries": "Countries",
+    "HeaderCountries": "Paesi",
     "MessagePleaseEnsureInternetMetadata": "Assicurarsi che download di metadati internet \u00e8 abilitata.",
-    "HeaderGenres": "Genres",
+    "HeaderGenres": "Generi",
     "TabSuggested": "Suggeriti",
-    "HeaderPlotKeywords": "Plot Keywords",
+    "HeaderPlotKeywords": "Trama",
     "TabLatest": "Novit\u00e0",
     "HeaderStudios": "Studios",
     "TabUpcoming": "IN ONDA A BREVE",
     "HeaderTags": "Tags",
     "TabShows": "Serie",
-    "HeaderMetadataSettings": "Metadata Settings",
+    "HeaderMetadataSettings": "Impostazioni metadati",
     "TabEpisodes": "Episodi",
-    "LabelLockItemToPreventChanges": "Lock this item to prevent future changes",
+    "LabelLockItemToPreventChanges": "Bloccare questa voce per impedire modifiche future",
     "TabGenres": "Generi",
-    "MessageLeaveEmptyToInherit": "Leave empty to inherit settings from a parent item, or the global default value.",
+    "MessageLeaveEmptyToInherit": "Lasciare vuoto per ereditare le impostazioni da un elemento principale, o il valore predefinito globale.",
     "TabPeople": "Attori",
-    "TabDonate": "Donate",
+    "TabDonate": "Dona",
     "TabNetworks": "Internet",
-    "HeaderDonationType": "Donation type:",
+    "HeaderDonationType": "Tipo di donazione:",
     "HeaderUsers": "Utenti",
-    "OptionMakeOneTimeDonation": "Make a separate donation",
+    "OptionMakeOneTimeDonation": "Fai una donazione separata",
     "HeaderFilters": "Filtri",
-    "OptionOneTimeDescription": "This is an additional donation to the team to show your support. It does not have any additional benefits.",
+    "OptionOneTimeDescription": "Si tratta di una donazione aggiuntiva alla squadra per mostrare il vostro sostegno. Non ha alcun beneficio aggiuntivo.",
     "ButtonFilter": "Filtro",
-    "OptionLifeTimeSupporterMembership": "Lifetime supporter membership",
+    "OptionLifeTimeSupporterMembership": "Appartenenza supporter Lifetime",
     "OptionFavorite": "Preferiti",
-    "OptionYearlySupporterMembership": "Yearly supporter membership",
+    "OptionYearlySupporterMembership": "Appartenenza supporter annuale",
     "OptionLikes": "Belli",
-    "OptionMonthlySupporterMembership": "Monthly supporter membership",
+    "OptionMonthlySupporterMembership": "Appartenenza supporter mensile",
     "OptionDislikes": "Brutti",
-    "HeaderSupporterBenefit": "A supporter membership provides additional benefits such as access to premium plugins, internet channel content, and more.",
+    "HeaderSupporterBenefit": "Un abbonamento sostenitore offre vantaggi aggiuntivi, come l'accesso ai plugin premium, i contenuti del canale internet, e altro ancora.",
     "OptionActors": "Attori",
     "OptionNoTrailer": "No Trailer",
     "OptionGuestStars": "Guest Stars",
-    "OptionNoThemeSong": "No Theme Song",
+    "OptionNoThemeSong": "No Temi canzone",
     "OptionDirectors": "Registra",
-    "OptionNoThemeVideo": "No Theme Video",
+    "OptionNoThemeVideo": "No tema video",
     "OptionWriters": "Scrittore",
-    "LabelOneTimeDonationAmount": "Donation amount:",
+    "LabelOneTimeDonationAmount": "Importo della donazione:",
     "OptionProducers": "Produttore",
-    "OptionActor": "Actor",
+    "OptionActor": "Attore",
     "HeaderResume": "Riprendi",
-    "OptionComposer": "Composer",
+    "OptionComposer": "Compositore",
     "HeaderNextUp": "Da vedere",
-    "OptionDirector": "Director",
+    "OptionDirector": "Regista",
     "NoNextUpItemsMessage": "Trovato nessuno.Inizia a guardare i tuoi programmi!",
     "OptionGuestStar": "Guest star",
     "HeaderLatestEpisodes": "Ultimi Episodi Aggiunti",
-    "OptionProducer": "Producer",
+    "OptionProducer": "Produttore",
     "HeaderPersonTypes": "Tipo Persone:",
-    "OptionWriter": "Writer",
+    "OptionWriter": "Scrittore",
     "TabSongs": "Canzoni",
-    "LabelAirDays": "Air days:",
+    "LabelAirDays": "In onda da (gg):",
     "TabAlbums": "Albums",
-    "LabelAirTime": "Air time:",
+    "LabelAirTime": "In onda da:",
     "TabArtists": "Artisti",
     "HeaderMediaInfo": "Media Info",
     "TabAlbumArtists": "Album Artisti",
-    "HeaderPhotoInfo": "Photo Info",
+    "HeaderPhotoInfo": "Foto info",
     "TabMusicVideos": "Video Musicali",
-    "HeaderInstall": "Install",
+    "HeaderInstall": "Installa",
     "ButtonSort": "Ordina",
-    "LabelSelectVersionToInstall": "Select version to install:",
+    "LabelSelectVersionToInstall": "Selezionare la versione da installare:",
     "HeaderSortBy": "Ordina per:",
-    "LinkSupporterMembership": "Learn about the Supporter Membership",
+    "LinkSupporterMembership": "Ulteriori informazioni Supporter Membership",
     "HeaderSortOrder": "Ordinato per:",
-    "MessageSupporterPluginRequiresMembership": "This plugin will require an active supporter membership after the 14 day free trial.",
+    "MessageSupporterPluginRequiresMembership": "Questo plugin richiede un abbonamento sostenitore attivo dopo la prova gratuita di 14 giorni.",
     "OptionPlayed": "Visto",
-    "MessagePremiumPluginRequiresMembership": "This plugin will require an active supporter membership in order to purchase after the 14 day free trial.",
+    "MessagePremiumPluginRequiresMembership": "Questo plugin richiede un abbonamento sostenitore attivo al fine di acquistare dopo la prova gratuita di 14 giorni.",
     "OptionUnplayed": "Non visto",
-    "HeaderReviews": "Reviews",
+    "HeaderReviews": "Recensioni",
     "OptionAscending": "Ascendente",
-    "HeaderDeveloperInfo": "Developer Info",
+    "HeaderDeveloperInfo": "Info sviluppatore",
     "OptionDescending": "Discentente",
-    "HeaderRevisionHistory": "Revision History",
+    "HeaderRevisionHistory": "Cronologia delle revisioni",
     "OptionRuntime": "Durata",
-    "ButtonViewWebsite": "View website",
-    "OptionReleaseDate": "Release Date",
-    "LabelRecurringDonationCanBeCancelledHelp": "Recurring donations can be cancelled at any time from within your PayPal account.",
+    "ButtonViewWebsite": "Visualizza sito web",
+    "OptionReleaseDate": "Data di rilascio",
+    "LabelRecurringDonationCanBeCancelledHelp": "Donazioni ricorrenti possono essere cancellati in qualsiasi momento dal tuo conto PayPal.",
     "OptionPlayCount": "Visto N\u00b0",
     "HeaderXmlSettings": "Xml Settings",
     "OptionDatePlayed": "Visto il",
@@ -268,11 +268,13 @@
     "OptionDateAdded": "Aggiunto il",
     "HeaderXmlDocumentAttribute": "Xml Document Attribute",
     "OptionAlbumArtist": "Album Artista",
-    "XmlDocumentAttributeListHelp": "These attributes are applied to the root element of every xml response.",
+    "XmlDocumentAttributeListHelp": "Questi attributi vengono applicati all'elemento radice di ogni risposta XML.",
     "OptionArtist": "Artista",
-    "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
+    "OptionSaveMetadataAsHidden": "Salvare i metadati e le immagini come file nascosti",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Estrarre immagini capitolo durante la scansione biblioteca",
     "OptionTrackName": "Nome Brano",
+    "LabelExtractChaptersDuringLibraryScanHelp": "Se abilitata, le immagini capitolo verranno estratti quando i video vengono importati durante la scansione della libreria. Se disabilitata verranno estratti durante le immagini dei capitoli programmati compito, permettendo la scansione biblioteca regolare per completare pi\u00f9 velocemente.",
     "OptionCommunityRating": "Voto del pubblico",
     "OptionNameSort": "Nome",
     "OptionFolderSort": "Cartelle",
@@ -315,8 +317,8 @@
     "TabMovies": "Film",
     "TabStudios": "Studios",
     "TabTrailers": "Trailer",
-    "LabelArtists": "Artists:",
-    "LabelArtistsHelp": "Separate multiple using ;",
+    "LabelArtists": "Cantanti",
+    "LabelArtistsHelp": "Separazione multipla utilizzando ;",
     "HeaderLatestMovies": "Ultimi Film Aggiunti",
     "HeaderLatestTrailers": "Ultimi Trailers Aggiunti",
     "OptionHasSpecialFeatures": "Caratteristiche speciali",
@@ -452,7 +454,7 @@
     "TabSettings": "Impostazioni",
     "ButtonRefreshGuideData": "Aggiorna la guida",
     "ButtonRefresh": "Aggiorna",
-    "ButtonAdvancedRefresh": "Advanced Refresh",
+    "ButtonAdvancedRefresh": "Aggiornamento (avanzato)",
     "OptionPriority": "Priorit\u00e0",
     "OptionRecordOnAllChannels": "Registra su tutti i canali",
     "OptionRecordAnytime": "Registra a qualsiasi ora",
@@ -623,9 +625,9 @@
     "LabelSkipped": "Saltato",
     "HeaderEpisodeOrganization": "Organizzazione Episodi",
     "LabelSeries": "Serie:",
-    "LabelSeasonNumber": "Numero Stagione",
-    "LabelEpisodeNumber": "Numero Episodio",
-    "LabelEndingEpisodeNumber": "Ultimo Episodio Numero",
+    "LabelSeasonNumber": "Numero Stagione:",
+    "LabelEpisodeNumber": "Numero Episodio :",
+    "LabelEndingEpisodeNumber": "Ultimo Episodio Numero:",
     "LabelEndingEpisodeNumberHelp": "\u00e8 richiesto solo se ci sono pi\u00f9 file per espisodio",
     "HeaderSupportTheTeam": "Team di supporto di Media Browser",
     "LabelSupportAmount": "Ammontare (Dollari)",
@@ -787,8 +789,8 @@
     "LabelProfileContainersHelp": "Separati da virgola. Questo pu\u00f2 essere lasciato vuoto da applicare a tutti i contenitori.",
     "HeaderResponseProfile": "Risposta Profilo",
     "LabelType": "Tipo:",
-    "LabelPersonRole": "Role:",
-    "LabelPersonRoleHelp": "Role is generally only applicable to actors.",
+    "LabelPersonRole": "Ruolo:",
+    "LabelPersonRoleHelp": "Ruolo \u00e8 generalmente applicabile solo agli attori.",
     "LabelProfileContainer": "Contenitore:",
     "LabelProfileVideoCodecs": "Video codecs:",
     "LabelProfileAudioCodecs": "Audio codecs:",
@@ -894,15 +896,15 @@
     "LabelDisplayPluginsFor": "Mostra plugin per:",
     "PluginTabMediaBrowserClassic": "MB Classic",
     "PluginTabMediaBrowserTheater": "MB Theater",
-    "LabelEpisodeNamePlain": "Episode name",
-    "LabelSeriesNamePlain": "Series name",
+    "LabelEpisodeNamePlain": "Nome Episodio",
+    "LabelSeriesNamePlain": "Nome Serie",
     "ValueSeriesNamePeriod": "Nome Serie",
     "ValueSeriesNameUnderscore": "Nome Serie",
     "ValueEpisodeNamePeriod": "Nome Episodio",
     "ValueEpisodeNameUnderscore": "Nome Episodio",
-    "LabelSeasonNumberPlain": "Season number",
-    "LabelEpisodeNumberPlain": "Episode number",
-    "LabelEndingEpisodeNumberPlain": "Ending episode number",
+    "LabelSeasonNumberPlain": "Stagione numero",
+    "LabelEpisodeNumberPlain": "Episodio numero",
+    "LabelEndingEpisodeNumberPlain": "Numero ultimo episodio",
     "HeaderTypeText": "Inserisci il testo",
     "LabelTypeText": "Testo",
     "HeaderSearchForSubtitles": "Ricerca per sottotitoli",
@@ -967,30 +969,30 @@
     "ViewTypeBoxSets": "Collezioni",
     "ViewTypeChannels": "Canali",
     "ViewTypeLiveTV": "Tv diretta",
-    "ViewTypeLiveTvNowPlaying": "Now Airing",
-    "ViewTypeLatestGames": "Latest Games",
-    "ViewTypeRecentlyPlayedGames": "Recently Played",
-    "ViewTypeGameFavorites": "Favorites",
-    "ViewTypeGameSystems": "Game Systems",
-    "ViewTypeGameGenres": "Genres",
-    "ViewTypeTvResume": "Resume",
-    "ViewTypeTvNextUp": "Next Up",
-    "ViewTypeTvLatest": "Latest",
-    "ViewTypeTvShowSeries": "Series",
-    "ViewTypeTvGenres": "Genres",
-    "ViewTypeTvFavoriteSeries": "Favorite Series",
-    "ViewTypeTvFavoriteEpisodes": "Favorite Episodes",
-    "ViewTypeMovieResume": "Resume",
-    "ViewTypeMovieLatest": "Latest",
-    "ViewTypeMovieMovies": "Movies",
-    "ViewTypeMovieCollections": "Collections",
-    "ViewTypeMovieFavorites": "Favorites",
-    "ViewTypeMovieGenres": "Genres",
-    "ViewTypeMusicLatest": "Latest",
-    "ViewTypeMusicAlbums": "Albums",
-    "ViewTypeMusicAlbumArtists": "Album Artists",
+    "ViewTypeLiveTvNowPlaying": "Ora in onda",
+    "ViewTypeLatestGames": "Ultimi Giorchi",
+    "ViewTypeRecentlyPlayedGames": "Guardato di recente",
+    "ViewTypeGameFavorites": "Preferiti",
+    "ViewTypeGameSystems": "Configurazione gioco",
+    "ViewTypeGameGenres": "Generi",
+    "ViewTypeTvResume": "Riprendi",
+    "ViewTypeTvNextUp": "Prossimi",
+    "ViewTypeTvLatest": "Ultimi",
+    "ViewTypeTvShowSeries": "Serie",
+    "ViewTypeTvGenres": "Generi",
+    "ViewTypeTvFavoriteSeries": "Serie Preferite",
+    "ViewTypeTvFavoriteEpisodes": "Episodi Preferiti",
+    "ViewTypeMovieResume": "Riprendi",
+    "ViewTypeMovieLatest": "Ultimi",
+    "ViewTypeMovieMovies": "Film",
+    "ViewTypeMovieCollections": "Collezioni",
+    "ViewTypeMovieFavorites": "Preferiti",
+    "ViewTypeMovieGenres": "Generi",
+    "ViewTypeMusicLatest": "Ultimi",
+    "ViewTypeMusicAlbums": "Album",
+    "ViewTypeMusicAlbumArtists": "Album Artisti",
     "HeaderOtherDisplaySettings": "Impostazioni Video",
-    "ViewTypeMusicSongs": "Songs",
+    "ViewTypeMusicSongs": "Canzoni",
     "HeaderMyViews": "Mie viste",
     "LabelSelectFolderGroups": "Automaticamente i contenuti del gruppo dalle seguenti cartelle nella vista come film, musica e TV:",
     "LabelSelectFolderGroupsHelp": "Le cartelle che siano deselezionate verranno visualizzati da soli nel loro punto di vista.",
@@ -1023,7 +1025,7 @@
     "HeaderBrandingHelp": "Personalizzare l'aspetto del browser media per soddisfare le esigenze del vostro gruppo o organizzazione.",
     "LabelLoginDisclaimer": "Login disclaimer:",
     "LabelLoginDisclaimerHelp": "Questo verr\u00e0 visualizzato nella parte inferiore della pagina di accesso.",
-    "LabelAutomaticallyDonate": "Donare automaticamente questo importo ogni sei mesi",
+    "LabelAutomaticallyDonate": "Donare automaticamente questo importo ogni mese",
     "LabelAutomaticallyDonateHelp": "\u00c8 possibile annullare in qualsiasi momento tramite il vostro conto PayPal.",
     "OptionList": "Lista",
     "TabDashboard": "Pannello Controllo",
@@ -1059,11 +1061,11 @@
     "TabFilter": "Filtra",
     "ButtonView": "Vista",
     "LabelPageSize": "Limite articolo:",
-    "LabelPath": "Path:",
+    "LabelPath": "Percorso:",
     "LabelView": "Vista:",
     "TabUsers": "Utenti",
-    "LabelSortName": "Sort name:",
-    "LabelDateAdded": "Date added:",
+    "LabelSortName": "Nome ordinato:",
+    "LabelDateAdded": "Aggiunto il",
     "HeaderFeatures": "Caratteristiche",
     "HeaderAdvanced": "Avanzato",
     "ButtonSync": "Sinc.",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/kk.json b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
index 3800195619..b3c3a13f45 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/kk.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/kk.json
@@ -248,9 +248,9 @@
     "HeaderSortBy": "\u0421\u04b1\u0440\u044b\u043f\u0442\u0430\u0443 \u0442\u04d9\u0441\u0456\u043b\u0456:",
     "LinkSupporterMembership": "\u049a\u043e\u043b\u0434\u0430\u0443\u0448\u044b \u043c\u04af\u0448\u0435\u043b\u0456\u0433\u0456 \u0442\u0443\u0440\u0430\u043b\u044b \u0442\u0430\u043d\u044b\u0441\u044b\u04a3\u044b\u0437",
     "HeaderSortOrder": "\u0421\u04b1\u0440\u044b\u043f\u0442\u0430\u0443 \u0440\u0435\u0442\u0456:",
-    "MessageSupporterPluginRequiresMembership": "\u0411\u04b1\u043b \u043f\u043b\u0430\u0433\u0438\u043d\u0433\u0435 14 \u043a\u04af\u043d\u0434\u0456\u043a \u0442\u0430\u043d\u044b\u0441\u0442\u044b\u0440\u0443 \u043a\u0435\u0437\u0435\u04a3\u0456\u043d\u0435\u043d \u043a\u0435\u0439\u0456\u043d \u049b\u043e\u043b\u0434\u0430\u0443\u0448\u044b \u043c\u04af\u0448\u0435\u043b\u0456\u0433\u0456 \u0431\u0435\u043b\u0441\u0435\u043d\u0434\u0456 \u0431\u043e\u043b\u0493\u0430\u043d\u044b \u049b\u0430\u0436\u0435\u0442 \u0431\u043e\u043b\u0430\u0434\u044b.",
+    "MessageSupporterPluginRequiresMembership": "\u0411\u04b1\u043b \u043f\u043b\u0430\u0433\u0438\u043d\u0433\u0435 14 \u043a\u04af\u043d\u0434\u0456\u043a \u0442\u0430\u043d\u044b\u0441\u0442\u044b\u0440\u0443 \u043a\u0435\u0437\u0435\u04a3\u0456\u043d\u0435\u043d \u043a\u0435\u0439\u0456\u043d \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 \u049b\u0430\u0436\u0435\u0442 \u0435\u0442\u0435\u0434\u0456.",
     "OptionPlayed": "\u041e\u0439\u043d\u0430\u0442\u044b\u043b\u0493\u0430\u043d",
-    "MessagePremiumPluginRequiresMembership": "\u0411\u04b1\u043b \u043f\u043b\u0430\u0433\u0438\u043d\u0434\u0456 \u0441\u0430\u0442\u044b\u043f \u0430\u043b\u0443 \u04af\u0448\u0456\u043d 14 \u043a\u04af\u043d\u0434\u0456\u043a \u0442\u0430\u043d\u044b\u0441\u0442\u044b\u0440\u0443 \u043a\u0435\u0437\u0435\u04a3\u0456\u043d\u0435\u043d \u043a\u0435\u0439\u0456\u043d \u049b\u043e\u043b\u0434\u0430\u0443\u0448\u044b \u043c\u04af\u0448\u0435\u043b\u0456\u0433\u0456 \u0431\u0435\u043b\u0441\u0435\u043d\u0434\u0456 \u0431\u043e\u043b\u0493\u0430\u043d\u044b \u049b\u0430\u0436\u0435\u0442 \u0431\u043e\u043b\u0430\u0434\u044b.",
+    "MessagePremiumPluginRequiresMembership": "\u0411\u04b1\u043b \u043f\u043b\u0430\u0433\u0438\u043d\u0434\u0456 \u0441\u0430\u0442\u044b\u043f \u0430\u043b\u0443 \u04af\u0448\u0456\u043d 14 \u043a\u04af\u043d\u0434\u0456\u043a \u0442\u0430\u043d\u044b\u0441\u0442\u044b\u0440\u0443 \u043a\u0435\u0437\u0435\u04a3\u0456\u043d\u0435\u043d \u043a\u0435\u0439\u0456\u043d \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 \u049b\u0430\u0436\u0435\u0442 \u0435\u0442\u0435\u0434\u0456.",
     "OptionUnplayed": "\u041e\u0439\u043d\u0430\u0442\u044b\u043b\u043c\u0430\u0493\u0430\u043d",
     "HeaderReviews": "\u041f\u0456\u043a\u0456\u0440\u043b\u0435\u0440",
     "OptionAscending": "\u0410\u0440\u0442\u0443\u044b \u0431\u043e\u0439\u044b\u043d\u0448\u0430",
@@ -270,9 +270,11 @@
     "OptionAlbumArtist": "\u0410\u043b\u044c\u0431\u043e\u043c \u043e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b\u0441\u044b",
     "XmlDocumentAttributeListHelp": "\u041e\u0441\u044b \u0442\u04e9\u043b\u0441\u0438\u043f\u0430\u0442\u0442\u0430\u0440 \u04d9\u0440\u0431\u0456\u0440 XML \u04af\u043d \u049b\u0430\u0442\u0443\u043b\u0430\u0440\u0434\u044b\u04a3 \u0442\u04af\u0431\u0456\u0440 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0456 \u04af\u0448\u0456\u043d \u049b\u043e\u043b\u0434\u0430\u043d\u044b\u043b\u0430\u0434\u044b.",
     "OptionArtist": "\u041e\u0440\u044b\u043d\u0434\u0430\u0443\u0448\u044b",
-    "OptionSaveMetadataAsHidden": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440 \u043c\u0435\u043d \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0434\u0456 \u0436\u0430\u0441\u044b\u0440\u044b\u043d \u0444\u0439\u043b\u0434\u0430\u0440 \u0440\u0435\u0442\u0456\u043d\u0434\u0435 \u0441\u0430\u049b\u0442\u0430\u0443",
+    "OptionSaveMetadataAsHidden": "\u041c\u0435\u0442\u0430\u0434\u0435\u0440\u0435\u043a\u0442\u0435\u0440 \u043c\u0435\u043d \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0434\u0456 \u0436\u0430\u0441\u044b\u0440\u044b\u043d \u0444\u0430\u0439\u043b\u0434\u0430\u0440 \u0440\u0435\u0442\u0456\u043d\u0434\u0435 \u0441\u0430\u049b\u0442\u0430\u0443",
     "OptionAlbum": "\u0410\u043b\u044c\u0431\u043e\u043c",
+    "LabelExtractChaptersDuringLibraryScan": "\u0421\u0430\u0445\u043d\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456\u043d \u0442\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u043d\u044b \u0441\u043a\u0430\u043d\u0435\u0440\u043b\u0435\u0443 \u043c\u0435\u0437\u0433\u0456\u043b\u0456\u043d\u0434\u0435 \u0448\u044b\u0493\u0430\u0440\u044b\u043f \u0430\u043b\u0443",
     "OptionTrackName": "\u0416\u043e\u043b\u0448\u044b\u049b \u0430\u0442\u044b",
+    "LabelExtractChaptersDuringLibraryScanHelp": "\u049a\u043e\u0441\u044b\u043b\u0493\u0430\u043d\u0434\u0430, \u0441\u0430\u0445\u043d\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456 \u0442\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u043d\u044b \u0441\u043a\u0430\u043d\u0435\u0440\u043b\u0435\u0443 \u043c\u0435\u0437\u0433\u0456\u043b\u0456\u043d\u0434\u0435, \u0431\u0435\u0439\u043d\u0435\u043b\u0435\u0440 \u0441\u044b\u0440\u0442\u0442\u0430\u043d \u0430\u043b\u044b\u043d\u0493\u0430\u043d\u0434\u0430, \u0448\u044b\u0493\u0430\u0440\u044b\u043f \u0430\u043b\u044b\u043d\u0430\u0434\u044b. \u0410\u0436\u044b\u0440\u0430\u0442\u044b\u043b\u0493\u0430\u043d\u0434\u0430, \u0431\u04b1\u043b\u0430\u0440 \u0441\u0430\u0445\u043d\u0430 \u0441\u0443\u0440\u0435\u0442\u0442\u0435\u0440\u0456\u043d\u0435 \u0436\u043e\u0441\u043f\u0430\u0440\u043b\u0430\u0493\u0430\u043d \u0442\u0430\u043f\u0441\u044b\u0440\u043c\u0430\u0441\u044b \u043c\u0435\u0437\u0433\u0456\u043b\u0456\u043d\u0434\u0435, \u0442\u04b1\u0440\u0430\u049b\u0442\u044b \u0442\u0430\u0441\u0443\u0448\u044b\u0445\u0430\u043d\u0430\u043d\u044b \u0441\u043a\u0430\u043d\u0435\u0440\u043b\u0435\u0443\u0456\u043d \u0436\u044b\u043b\u0434\u0430\u043c\u044b\u0440\u0430\u049b \u0430\u044f\u049b\u0442\u0430\u043b\u0443\u044b \u04b1\u0448\u0456\u043d \u0440\u04b1\u049b\u0441\u0430\u0442 \u0435\u0442\u0456\u043f, \u0448\u044b\u0493\u0430\u0440\u044b\u043f \u0430\u043b\u044b\u043d\u0430\u0434\u044b.",
     "OptionCommunityRating": "\u049a\u0430\u0443\u044b\u043c\u0434\u0430\u0441\u0442\u044b\u049b \u0431\u0430\u0493\u0430\u043b\u0430\u0443\u044b",
     "OptionNameSort": "\u0410\u0442\u044b",
     "OptionFolderSort": "\u049a\u0430\u043b\u0442\u0430\u043b\u0430\u0440",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ko.json b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
index ee192e9af9..b5a94619ae 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ko.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ko.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artist",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Track Name",
+    "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.",
     "OptionCommunityRating": "Community Rating",
     "OptionNameSort": "Name",
     "OptionFolderSort": "Folders",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ms.json b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
index 98d155e9d8..88c8b0bdfc 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ms.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ms.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artist",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Track Name",
+    "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.",
     "OptionCommunityRating": "Community Rating",
     "OptionNameSort": "Name",
     "OptionFolderSort": "Folders",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nb.json b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
index 04c6e58913..4b6a0046fd 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nb.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nb.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artist",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "L\u00e5navn",
+    "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.",
     "OptionCommunityRating": "Community Rangering",
     "OptionNameSort": "Navn",
     "OptionFolderSort": "Mapper",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/nl.json b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
index f017ba5955..b58b84eae7 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/nl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/nl.json
@@ -55,13 +55,13 @@
     "WizardCompleted": "Dit is alles wat we nodig hebben voor nu. Media Browser is begonnen met het verzamelen van informatie over uw mediabibliotheek. Bekijk enkele van onze apps, en klik vervolgens op <b>Voltooien<\/b> om het <b>Dashboard te bekijken<\/b>.",
     "LabelConfigureSettings": "Configureer instellingen",
     "HeaderDownloadPeopleMetadataForHelp": "Het inschakelen van extra opties zal meer informatie op het scherm bieden, maar resulteert in tragere bibliotheek scan.",
-    "LabelEnableVideoImageExtraction": "Videobeeld extractie inschakelen",
+    "LabelEnableVideoImageExtraction": "Videobeeld uitpakken inschakelen",
     "ViewTypeFolders": "Mappen",
     "VideoImageExtractionHelp": "Voor video's die nog geen afbeeldingen hebben, en waarvoor geen afbeeldingen op Internet te vinden zijn. Dit voegt extra tijd toe aan de oorspronkelijke bibliotheek scan, maar resulteert in een mooiere weergave.",
     "LabelDisplayFoldersView": "Toon een mappenweergave als u gewoon Mediamappen wilt weergeven",
-    "LabelEnableChapterImageExtractionForMovies": "Extraheer hoofdstuk afbeeldingen voor Films",
+    "LabelEnableChapterImageExtractionForMovies": "Hoofdstuk afbeeldingen uitpakken voor Films",
     "ViewTypeLiveTvRecordingGroups": "Opnamen",
-    "LabelChapterImageExtractionForMoviesHelp": "Extraheren van hoofdstuk afbeeldingen geeft de Cli\u00ebnt de mogelijkheid om grafische scene selectie menu's te tonen. Het proces kan traag en cpu-intensief zijn en kan enkele gigabytes aan ruimte vereisen. Het word uitgevoerd als nachtelijke taak om 4:00, maar dit is instelbaar via de geplande taken. Het wordt niet aanbevolen om deze taak uit te voeren tijdens de piekuren.",
+    "LabelChapterImageExtractionForMoviesHelp": "Uitpakken van hoofdstuk afbeeldingen geeft de Cli\u00ebnt de mogelijkheid om grafische scene selectie menu's te tonen. Het proces kan traag en cpu-intensief zijn en kan enkele gigabytes aan ruimte vereisen. Het word uitgevoerd als nachtelijke taak om 4:00, maar dit is instelbaar via de geplande taken. Het wordt niet aanbevolen om deze taak uit te voeren tijdens de piekuren.",
     "ViewTypeLiveTvChannels": "Kanalen",
     "LabelEnableAutomaticPortMapping": "Automatische poorttoewijzing inschakelen",
     "LabelAllowLocalAccessWithoutPassword": "Lokale toegang toestaan zonder wachtwoord",
@@ -272,7 +272,9 @@
     "OptionArtist": "Artiest",
     "OptionSaveMetadataAsHidden": "Metagegevens en afbeeldingen opslaan als verborgen bestanden",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Hoofdstuk afbeeldingen uitpakken tijdens het scannen van de bibliotheek",
     "OptionTrackName": "Naam van Nummer",
+    "LabelExtractChaptersDuringLibraryScanHelp": "Wanneer ingeschakeld dan worden hoofdstuk afbeeldingen uitgepakt wanneer video's zijn ge\u00efmporteerd tijdens het scannen van de bibliotheek. Wanneer uitgeschakeld dan worden de hoofdstuk afbeeldingen uitgepakt tijdens de geplande taak \"Hoofdstukken uitpakken\", waardoor de standaard bibliotheek scan sneller voltooid is.",
     "OptionCommunityRating": "Gemeenschaps Waardering",
     "OptionNameSort": "Naam",
     "OptionFolderSort": "Mappen",
@@ -406,7 +408,7 @@
     "TabGames": "Games",
     "TabMusic": "Muziek",
     "TabOthers": "Overig",
-    "HeaderExtractChapterImagesFor": "Extract hoofdstuk afbeeldingen voor:",
+    "HeaderExtractChapterImagesFor": "Hoofdstuk afbeeldingen uitpakken voor:",
     "OptionMovies": "Films",
     "OptionEpisodes": "Afleveringen",
     "OptionOtherVideos": "Overige Video's",
@@ -417,7 +419,7 @@
     "LabelAutomaticUpdatesFanartHelp": "Indien ingeschakeld, worden nieuwe afbeeldingen automatisch gedownload wanneer ze zijn toegevoegd aan fanart.tv. Bestaande afbeeldingen zullen niet worden vervangen.",
     "LabelAutomaticUpdatesTmdbHelp": "Indien ingeschakeld, worden nieuwe afbeeldingen automatisch gedownload wanneer ze zijn toegevoegd aan TheMovieDB.org. Bestaande afbeeldingen zullen niet worden vervangen.",
     "LabelAutomaticUpdatesTvdbHelp": "Indien ingeschakeld, worden nieuwe afbeeldingen automatisch gedownload wanneer ze zijn toegevoegd aan TheTVDB.com. Bestaande afbeeldingen zullen niet worden vervangen.",
-    "ExtractChapterImagesHelp": "Extraheren van hoofdstuk afbeeldingen geeft de cli\u00ebnt de mogelijkheid om grafische scene selectie menu's te tonen. Het proces kan traag en cpu-intensief zijn en kan enkele gigabytes aan ruimte vereisen. Het word uitgevoerd als nachtelijke taak om 4:00. Deze taak is in te stellen via de geplande taken. Het wordt niet aanbevolen om deze taak uit te voeren tijdens de piekuren.",
+    "ExtractChapterImagesHelp": "Uitpakken van hoofdstuk afbeeldingen geeft de cli\u00ebnt de mogelijkheid om grafische scene selectie menu's te tonen. Het proces kan traag en cpu-intensief zijn en kan enkele gigabytes aan ruimte vereisen. Het word uitgevoerd als nachtelijke taak om 4:00. Deze taak is in te stellen via de geplande taken. Het wordt niet aanbevolen om deze taak uit te voeren tijdens de piekuren.",
     "LabelMetadataDownloadLanguage": "Voorkeurs taal:",
     "ButtonAutoScroll": "Auto-scroll",
     "LabelImageSavingConvention": "Afbeelding opslag conventie:",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pl.json b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
index 4203ea9c23..4d6dac7baa 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pl.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pl.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artysta",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Nazwa utworu",
+    "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.",
     "OptionCommunityRating": "Ocena spo\u0142eczno\u015bci",
     "OptionNameSort": "Nazwa",
     "OptionFolderSort": "Folders",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
index 01bbaf5861..19593bdc9b 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_BR.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artista",
     "OptionSaveMetadataAsHidden": "Salvar metadados e imagens como arquivos ocultos",
     "OptionAlbum": "\u00c1lbum",
+    "LabelExtractChaptersDuringLibraryScan": "Extrair imagens dos cap\u00edtulos durante o rastreamento da biblioteca",
     "OptionTrackName": "Nome da Faixa",
+    "LabelExtractChaptersDuringLibraryScanHelp": "Se ativado, as imagens dos cap\u00edtulos ser\u00e3o extra\u00eddas quando os v\u00eddeos forem importados durante o rastreamento da biblioteca. Se desativado, elas ser\u00e3o extra\u00eddas durante a tarefa agendada de imagens dos cap\u00edtulos, permitindo que a tarefa de rastreamento da biblioteca seja mais r\u00e1pida.",
     "OptionCommunityRating": "Avalia\u00e7\u00e3o da Comunidade",
     "OptionNameSort": "Nome",
     "OptionFolderSort": "Pastas",
@@ -297,13 +299,13 @@
     "HeaderLatestSongs": "M\u00fasicas Recentes",
     "HeaderRecentlyPlayed": "Reprodu\u00e7\u00f5es Recentes",
     "HeaderFrequentlyPlayed": "Reprodu\u00e7\u00f5es Frequentes",
-    "DevBuildWarning": "Vers\u00f5es Dev s\u00e3o as mais atuais. Lan\u00e7adas frequentemente, estas vers\u00f5es n\u00e3o foram testadas. A aplica\u00e7\u00e3o pode falhar e v\u00e1rias caracter\u00edsticas podem n\u00e3o funcionar",
+    "DevBuildWarning": "Vers\u00f5es Dev s\u00e3o as mais atuais. Lan\u00e7adas frequentemente, estas vers\u00f5es n\u00e3o foram testadas. A aplica\u00e7\u00e3o pode falhar e v\u00e1rios recurso podem n\u00e3o funcionar.",
     "LabelVideoType": "Tipo de V\u00eddeo:",
     "OptionBluray": "Bluray",
     "OptionDvd": "Dvd",
     "OptionIso": "Iso",
     "Option3D": "3D",
-    "LabelFeatures": "Caracter\u00edsticas:",
+    "LabelFeatures": "Recursos:",
     "LabelService": "Servi\u00e7o:",
     "LabelStatus": "Status:",
     "LabelVersion": "Vers\u00e3o:",
@@ -360,7 +362,7 @@
     "HeaderAdvancedControl": "Controle Avan\u00e7ado",
     "LabelName": "Nome:",
     "OptionAllowUserToManageServer": "Permitir a este usu\u00e1rio administrar o servidor",
-    "HeaderFeatureAccess": "Acesso a Caracter\u00edsticas",
+    "HeaderFeatureAccess": "Acesso aos Recursos",
     "OptionAllowMediaPlayback": "Permitir reprodu\u00e7\u00e3o de m\u00eddia",
     "OptionAllowBrowsingLiveTv": "Permitir navega\u00e7\u00e3o na tv ao vivo",
     "OptionAllowDeleteLibraryContent": "Permitir a este usu\u00e1rio apagar conte\u00fado da biblioteca",
@@ -532,7 +534,7 @@
     "HeaderAwardsAndReviews": "Pr\u00eamios e Cr\u00edticas",
     "HeaderSoundtracks": "Trilhas Sonoras",
     "HeaderMusicVideos": "V\u00eddeos Musicais",
-    "HeaderSpecialFeatures": "Caracter\u00edsticas Especiais",
+    "HeaderSpecialFeatures": "Recursos Especiais",
     "HeaderCastCrew": "Elenco & Equipe",
     "HeaderAdditionalParts": "Partes Adicionais",
     "ButtonSplitVersionsApart": "Separar Vers\u00f5es",
@@ -781,7 +783,7 @@
     "ButtonVolumeDown": "Diminuir volume",
     "ButtonMute": "Mudo",
     "HeaderLatestMedia": "M\u00eddias Recentes",
-    "OptionSpecialFeatures": "Caracter\u00edsticas Especiais",
+    "OptionSpecialFeatures": "Recursos Especiais",
     "HeaderCollections": "Cole\u00e7\u00f5es",
     "LabelProfileCodecsHelp": "Separados por v\u00edrgula. Pode ser deixado em branco para usar com todos os codecs.",
     "LabelProfileContainersHelp": "Separados por v\u00edrgula. Pode ser deixado em branco para usar com todos os containers.",
@@ -1064,7 +1066,7 @@
     "TabUsers": "Usu\u00e1rios",
     "LabelSortName": "Nome para ordena\u00e7\u00e3o:",
     "LabelDateAdded": "Data de adi\u00e7\u00e3o:",
-    "HeaderFeatures": "Caracter\u00edsticas",
+    "HeaderFeatures": "Recursos",
     "HeaderAdvanced": "Avan\u00e7ado",
     "ButtonSync": "Sincronizar",
     "TabScheduledTasks": "Tarefas Agendadas",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
index 9d252521d0..15c36d7cda 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/pt_PT.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artista",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "\u00c1lbum",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Nome da pista",
+    "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.",
     "OptionCommunityRating": "Classifica\u00e7\u00e3o da Comunidade",
     "OptionNameSort": "Nome",
     "OptionFolderSort": "Pastas",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/ru.json b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
index de8f448cdb..cfb0cb151d 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/ru.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/ru.json
@@ -14,11 +14,11 @@
     "LabelBrowseLibrary": "\u041e\u0431\u0437\u043e\u0440 \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
     "LabelIpAddressValue": "IP \u0430\u0434\u0440\u0435\u0441: {0}",
     "LabelConfigureMediaBrowser": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 Media Browser",
-    "UserConfigurationUpdatedWithName": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f {0} \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
+    "UserConfigurationUpdatedWithName": "\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f \u043f\u043e\u043b\u044c\u0437-\u043b\u044f {0} \u0431\u044b\u043b\u0430 \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0430",
     "LabelOpenLibraryViewer": "\u0421\u0440\u0435\u0434\u0441\u0442\u0432\u043e \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0430 \u041c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
     "UserCreatedWithName": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c {0} \u0431\u044b\u043b \u0441\u043e\u0437\u0434\u0430\u043d",
     "LabelRestartServer": "\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0430",
-    "UserPasswordChangedWithName": "\u041f\u0430\u0440\u043e\u043b\u044c \u0434\u043b\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f {0} \u0431\u044b\u043b \u0438\u0437\u043c\u0435\u043d\u0451\u043d",
+    "UserPasswordChangedWithName": "\u041f\u0430\u0440\u043e\u043b\u044c \u043f\u043e\u043b\u044c\u0437-\u043b\u044f {0} \u0431\u044b\u043b \u0438\u0437\u043c\u0435\u043d\u0451\u043d",
     "LabelShowLogWindow": "\u041e\u0442\u043a\u0440\u044b\u0442\u0438\u0435 \u0416\u0443\u0440\u043d\u0430\u043b\u0430 \u0432 \u043e\u043a\u043d\u0435",
     "UserDeletedWithName": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c {0} \u0431\u044b\u043b \u0443\u0434\u0430\u043b\u0451\u043d",
     "LabelPrevious": "\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0435\u0435",
@@ -220,7 +220,7 @@
     "OptionDirectors": "\u0420\u0435\u0436\u0438\u0441\u0441\u0451\u0440\u044b",
     "OptionNoThemeVideo": "\u0411\u0435\u0437 \u0442\u0435\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0445 \u0432\u0438\u0434\u0435\u043e",
     "OptionWriters": "\u0421\u0446\u0435\u043d\u0430\u0440\u0438\u0441\u0442\u044b",
-    "LabelOneTimeDonationAmount": "\u0421\u0443\u043c\u043c\u0430 \u043f\u043e\u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u043d\u0438\u044f",
+    "LabelOneTimeDonationAmount": "\u0421\u0443\u043c\u043c\u0430 \u043f\u043e\u0436\u0435\u0440\u0442\u0432\u043e\u0432\u0430\u043d\u0438\u044f:",
     "OptionProducers": "\u041f\u0440\u043e\u0434\u044e\u0441\u0435\u0440\u044b",
     "OptionActor": "\u0410\u043a\u0442\u0451\u0440",
     "HeaderResume": "\u0412\u043e\u0437\u043e\u0431\u043d\u043e\u0432\u0438\u043c\u044b\u0435",
@@ -272,7 +272,9 @@
     "OptionArtist": "\u0418\u0441\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c",
     "OptionSaveMetadataAsHidden": "\u0421\u043e\u0445\u0440\u0430\u043d\u044f\u0442\u044c \u043c\u0435\u0442\u0430\u0434\u0430\u043d\u043d\u044b\u0435 \u0438 \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u043a\u0430\u043a \u0441\u043a\u0440\u044b\u0442\u044b\u0435 \u0444\u0430\u0439\u043b\u044b",
     "OptionAlbum": "\u0410\u043b\u044c\u0431\u043e\u043c",
+    "LabelExtractChaptersDuringLibraryScan": "\u0418\u0437\u0432\u043b\u0435\u043a\u0430\u0442\u044c \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0441\u0446\u0435\u043d \u0432\u043e \u0432\u0440\u0435\u043c\u044f \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438",
     "OptionTrackName": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435 \u0434\u043e\u0440\u043e\u0436\u043a\u0438",
+    "LabelExtractChaptersDuringLibraryScanHelp": "\u041f\u0440\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u0440\u0438\u0441\u0443\u043d\u043a\u0438 \u0441\u0446\u0435\u043d \u0431\u0443\u0434\u0443\u0442 \u0438\u0437\u0432\u043b\u0435\u043a\u0430\u0442\u044c\u0441\u044f, \u043a\u043e\u0433\u0434\u0430 \u0432\u0438\u0434\u0435\u043e \u0438\u043c\u043f\u043e\u0440\u0442\u0438\u0440\u0443\u044e\u0442\u0441\u044f \u0432\u043e \u0432\u0440\u0435\u043c\u044f \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438. \u041f\u0440\u0438 \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438, \u0442\u043e \u043e\u043d\u0438 \u0431\u0443\u0434\u0443\u0442 \u0438\u0437\u0432\u043b\u0435\u043a\u0430\u0442\u044c\u0441\u044f \u0432 \u0442\u0435\u0447\u0435\u043d\u0438\u0435 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043d\u043e\u0433\u043e \u0437\u0430\u0434\u0430\u043d\u0438\u044f \u00ab\u0420\u0438\u0441\u0443\u043d\u043a\u0438 \u0441\u0446\u0435\u043d\u00bb, \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u044f \u0440\u0435\u0433\u0443\u043b\u044f\u0440\u043d\u043e\u043c\u0443 \u0441\u043a\u0430\u043d\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044e \u043c\u0435\u0434\u0438\u0430\u0442\u0435\u043a\u0438 \u0437\u0430\u0432\u0435\u0440\u0448\u0430\u0442\u044c\u0441\u044f \u0431\u044b\u0441\u0442\u0440\u0435\u0435.",
     "OptionCommunityRating": "\u041e\u0431\u0449\u0435\u0441\u0442\u0432\u0435\u043d\u043d\u0430\u044f \u043e\u0446\u0435\u043d\u043a\u0430",
     "OptionNameSort": "\u041d\u0430\u0437\u0432\u0430\u043d\u0438\u0435",
     "OptionFolderSort": "\u041f\u0430\u043f\u043a\u0438",
@@ -568,7 +570,7 @@
     "EditCollectionItemsHelp": "\u0414\u043e\u0431\u0430\u0432\u044c\u0442\u0435 \u0438\u043b\u0438 \u0438\u0437\u044b\u043c\u0438\u0442\u0435 \u043b\u044e\u0431\u044b\u0435 \u0444\u0438\u043b\u044c\u043c\u044b, \u0441\u0435\u0440\u0438\u0430\u043b\u044b, \u0430\u043b\u044c\u0431\u043e\u043c\u044b, \u043a\u043d\u0438\u0433\u0438 \u0438\u043b\u0438 \u0438\u0433\u0440\u044b, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0445\u043e\u0442\u0438\u0442\u0435 \u0441\u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0432\u043d\u0443\u0442\u0440\u0438 \u0434\u0430\u043d\u043d\u043e\u0439 \u043a\u043e\u043b\u043b\u0435\u043a\u0446\u0438\u0438.",
     "HeaderAddTitles": "\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0434\u0435\u043d\u0438\u0439",
     "LabelEnableDlnaPlayTo": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0444\u0443\u043d\u043a\u0446\u0438\u044e DLNA \u0412\u043e\u0441\u043f\u0440\u043e\u0438\u0437\u0432\u0435\u0441\u0442\u0438 \u041d\u0430",
-    "LabelEnableDlnaPlayToHelp": "\u0412 Media Browser \u0438\u043c\u0435\u0435\u0442\u0441\u044f \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0438\u0432\u0430\u0442\u044c \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0432\u043d\u0443\u0442\u0440\u0438 \u0441\u0435\u0442\u0438 \u0438 \u0443\u0434\u0430\u043b\u0451\u043d\u043d\u043e \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c \u0438\u043c\u0438.",
+    "LabelEnableDlnaPlayToHelp": "\u0412 Media Browser \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0438\u0432\u0430\u0442\u044c \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0432\u043d\u0443\u0442\u0440\u0438 \u0441\u0435\u0442\u0438 \u0438 \u0443\u0434\u0430\u043b\u0451\u043d\u043d\u043e \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c \u0438\u043c\u0438.",
     "LabelEnableDlnaDebugLogging": "\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043e\u0442\u043b\u0430\u0434\u043e\u0447\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 DLNA \u0432 \u0416\u0443\u0440\u043d\u0430\u043b\u0435",
     "LabelEnableDlnaDebugLoggingHelp": "\u041f\u0440\u0438 \u044d\u0442\u043e\u043c \u0431\u0443\u0434\u0443\u0442 \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c\u0441\u044f \u0444\u0430\u0439\u043b\u044b \u0416\u0443\u0440\u043d\u0430\u043b\u0430 \u043e\u0447\u0435\u043d\u044c \u0431\u043e\u043b\u044c\u0448\u043e\u0433\u043e \u043e\u0431\u044a\u0451\u043c\u0430, \u0430 \u044d\u0442\u043e \u0434\u043e\u043b\u0436\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0442\u043e\u043b\u044c\u043a\u043e \u0432 \u0441\u0438\u043b\u0443 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e\u0441\u0442\u0438 \u0434\u043b\u044f \u0443\u0441\u0442\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u043d\u0435\u043f\u043e\u043b\u0430\u0434\u043e\u043a.",
     "LabelEnableDlnaClientDiscoveryInterval": "\u0418\u043d\u0442\u0435\u0440\u0432\u0430\u043b \u043e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d\u0438\u044f \u043a\u043b\u0438\u0435\u043d\u0442\u043e\u0432, \u0441",
@@ -969,7 +971,7 @@
     "ViewTypeLiveTV": "\u0422\u0412 \u044d\u0444\u0438\u0440",
     "ViewTypeLiveTvNowPlaying": "\u0412 \u044d\u0444\u0438\u0440\u0435",
     "ViewTypeLatestGames": "\u041d\u043e\u0432\u0438\u043d\u043a\u0438 \u0438\u0433\u0440",
-    "ViewTypeRecentlyPlayedGames": "\u041d\u0435\u0434\u0430\u0432\u043d\u043e \u0438\u0433\u0440\u0430\u043d\u043d\u044b\u0435",
+    "ViewTypeRecentlyPlayedGames": "\u041d\u0435\u0434\u0430\u0432\u043d\u043e \u0441\u044b\u0433\u0440\u0430\u043d\u043d\u044b\u0435",
     "ViewTypeGameFavorites": "\u0418\u0437\u0431\u0440\u0430\u043d\u043d\u043e\u0435",
     "ViewTypeGameSystems": "\u0418\u0433\u0440\u043e\u0432\u044b\u0435 \u0441\u0438\u0441\u0442\u0435\u043c\u044b",
     "ViewTypeGameGenres": "\u0416\u0430\u043d\u0440\u044b",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/sv.json b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
index 2580161e08..faba910f9d 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/sv.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/sv.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Artist",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Sp\u00e5rnamn",
+    "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.",
     "OptionCommunityRating": "Allm\u00e4nhetens betyg",
     "OptionNameSort": "Namn",
     "OptionFolderSort": "Mappar",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/tr.json b/MediaBrowser.Server.Implementations/Localization/Server/tr.json
index e9d006459a..d7d6dcf4d8 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/tr.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/tr.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Sanat\u00e7\u0131",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Alb\u00fcm",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "Par\u00e7a \u0130smi",
+    "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.",
     "OptionCommunityRating": "Community Rating",
     "OptionNameSort": "\u0130sim",
     "OptionFolderSort": "Klas\u00f6r",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/vi.json b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
index 16ab7510d5..c235ca454f 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/vi.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/vi.json
@@ -272,7 +272,9 @@
     "OptionArtist": "Ngh\u1ec7 s\u1ef9",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "Album",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "T\u00ean b\u00e0i",
+    "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.",
     "OptionCommunityRating": "\u0110\u00e1nh gi\u00e1 c\u1ee7a c\u1ed9ng \u0111\u1ed3ng",
     "OptionNameSort": "T\u00ean",
     "OptionFolderSort": "Folders",
diff --git a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
index 129f81f6c0..83b645f663 100644
--- a/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
+++ b/MediaBrowser.Server.Implementations/Localization/Server/zh_TW.json
@@ -272,7 +272,9 @@
     "OptionArtist": "\u6b4c\u624b",
     "OptionSaveMetadataAsHidden": "Save metadata and images as hidden files",
     "OptionAlbum": "\u5c08\u8f2f",
+    "LabelExtractChaptersDuringLibraryScan": "Extract chapter images during the library scan",
     "OptionTrackName": "\u66f2\u76ee\u540d\u7a31",
+    "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.",
     "OptionCommunityRating": "\u793e\u5340\u8a55\u5206",
     "OptionNameSort": "\u540d\u5b57",
     "OptionFolderSort": "Folders",
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteMediaStreamsRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteMediaStreamsRepository.cs
index 1e7d9fe823..4bcd4a46dd 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteMediaStreamsRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteMediaStreamsRepository.cs
@@ -40,7 +40,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             // Add PixelFormat column
 
-            createTableCommand += "(ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, PRIMARY KEY (ItemId, StreamIndex))";
+            createTableCommand += "(ItemId GUID, StreamIndex INT, StreamType TEXT, Codec TEXT, Language TEXT, ChannelLayout TEXT, Profile TEXT, AspectRatio TEXT, Path TEXT, IsInterlaced BIT, BitRate INT NULL, Channels INT NULL, SampleRate INT NULL, IsDefault BIT, IsForced BIT, IsExternal BIT, Height INT NULL, Width INT NULL, AverageFrameRate FLOAT NULL, RealFrameRate FLOAT NULL, Level FLOAT NULL, PixelFormat TEXT, BitDepth INT NULL, IsAnamorphic BIT NULL, RefFrames INT NULL, PRIMARY KEY (ItemId, StreamIndex))";
 
             string[] queries = {
 
@@ -59,6 +59,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
             AddPixelFormatColumnCommand();
             AddBitDepthCommand();
             AddIsAnamorphicColumn();
+            AddRefFramesCommand();
 
             PrepareStatements();
 
@@ -127,6 +128,37 @@ namespace MediaBrowser.Server.Implementations.Persistence
             _connection.RunQueries(new[] { builder.ToString() }, _logger);
         }
 
+        private void AddRefFramesCommand()
+        {
+            using (var cmd = _connection.CreateCommand())
+            {
+                cmd.CommandText = "PRAGMA table_info(mediastreams)";
+
+                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
+                {
+                    while (reader.Read())
+                    {
+                        if (!reader.IsDBNull(1))
+                        {
+                            var name = reader.GetString(1);
+
+                            if (string.Equals(name, "RefFrames", StringComparison.OrdinalIgnoreCase))
+                            {
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+
+            var builder = new StringBuilder();
+
+            builder.AppendLine("alter table mediastreams");
+            builder.AppendLine("add column RefFrames INT NULL");
+
+            _connection.RunQueries(new[] { builder.ToString() }, _logger);
+        }
+
         private void AddIsAnamorphicColumn()
         {
             using (var cmd = _connection.CreateCommand())
@@ -183,7 +215,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
             "Level",
             "PixelFormat",
             "BitDepth",
-            "IsAnamorphic"
+            "IsAnamorphic",
+            "RefFrames"
         };
 
         /// <summary>
@@ -357,6 +390,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 item.IsAnamorphic = reader.GetBoolean(23);
             }
 
+            if (!reader.IsDBNull(24))
+            {
+                item.RefFrames = reader.GetInt32(24);
+            }
+
             return item;
         }
 
@@ -421,6 +459,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                     _saveStreamCommand.GetParameter(21).Value = stream.PixelFormat;
                     _saveStreamCommand.GetParameter(22).Value = stream.BitDepth;
                     _saveStreamCommand.GetParameter(23).Value = stream.IsAnamorphic;
+                    _saveStreamCommand.GetParameter(24).Value = stream.RefFrames;
 
                     _saveStreamCommand.Transaction = transaction;
                     _saveStreamCommand.ExecuteNonQuery();
diff --git a/MediaBrowser.Server.Implementations/Persistence/SqliteProviderInfoRepository.cs b/MediaBrowser.Server.Implementations/Persistence/SqliteProviderInfoRepository.cs
index b99a84c5c5..f4820f432c 100644
--- a/MediaBrowser.Server.Implementations/Persistence/SqliteProviderInfoRepository.cs
+++ b/MediaBrowser.Server.Implementations/Persistence/SqliteProviderInfoRepository.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Common.Configuration;
+using System.Text;
+using MediaBrowser.Common.Configuration;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Logging;
 using System;
@@ -51,7 +52,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             string[] queries = {
 
-                                "create table if not exists MetadataStatus (ItemId GUID PRIMARY KEY, ItemName TEXT, ItemType TEXT, SeriesName TEXT, DateLastMetadataRefresh datetime, DateLastImagesRefresh datetime, LastStatus TEXT, LastErrorMessage TEXT, MetadataProvidersRefreshed TEXT, ImageProvidersRefreshed TEXT)",
+                                "create table if not exists MetadataStatus (ItemId GUID PRIMARY KEY, ItemName TEXT, ItemType TEXT, SeriesName TEXT, DateLastMetadataRefresh datetime, DateLastImagesRefresh datetime, LastStatus TEXT, LastErrorMessage TEXT, MetadataProvidersRefreshed TEXT, ImageProvidersRefreshed TEXT, ItemDateModified DateTimeNull)",
                                 "create index if not exists idx_MetadataStatus on MetadataStatus(ItemId)",
 
                                 //pragmas
@@ -62,6 +63,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
 
             _connection.RunQueries(queries, _logger);
 
+            AddItemDateModifiedCommand();
+
             PrepareStatements();
 
             _shrinkMemoryTimer = new SqliteShrinkMemoryTimer(_connection, _writeLock, _logger);
@@ -78,9 +81,41 @@ namespace MediaBrowser.Server.Implementations.Persistence
             "LastStatus",
             "LastErrorMessage",
             "MetadataProvidersRefreshed",
-            "ImageProvidersRefreshed"
+            "ImageProvidersRefreshed",
+            "ItemDateModified"
         };
 
+        private void AddItemDateModifiedCommand()
+        {
+            using (var cmd = _connection.CreateCommand())
+            {
+                cmd.CommandText = "PRAGMA table_info(MetadataStatus)";
+
+                using (var reader = cmd.ExecuteReader(CommandBehavior.SequentialAccess | CommandBehavior.SingleResult))
+                {
+                    while (reader.Read())
+                    {
+                        if (!reader.IsDBNull(1))
+                        {
+                            var name = reader.GetString(1);
+
+                            if (string.Equals(name, "ItemDateModified", StringComparison.OrdinalIgnoreCase))
+                            {
+                                return;
+                            }
+                        }
+                    }
+                }
+            }
+
+            var builder = new StringBuilder();
+
+            builder.AppendLine("alter table MetadataStatus");
+            builder.AppendLine("add column ItemDateModified DateTime NULL");
+
+            _connection.RunQueries(new[] { builder.ToString() }, _logger);
+        }
+        
         /// <summary>
         /// The _write lock
         /// </summary>
@@ -183,6 +218,11 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 result.ImageProvidersRefreshed = reader.GetString(9).Split('|').Where(i => !string.IsNullOrEmpty(i)).Select(i => new Guid(i)).ToList();
             }
 
+            if (!reader.IsDBNull(10))
+            {
+                result.ItemDateModified = reader.GetDateTime(10).ToUniversalTime();
+            }
+
             return result;
         }
 
@@ -213,6 +253,7 @@ namespace MediaBrowser.Server.Implementations.Persistence
                 _saveStatusCommand.GetParameter(7).Value = status.LastErrorMessage;
                 _saveStatusCommand.GetParameter(8).Value = string.Join("|", status.MetadataProvidersRefreshed.ToArray());
                 _saveStatusCommand.GetParameter(9).Value = string.Join("|", status.ImageProvidersRefreshed.ToArray());
+                _saveStatusCommand.GetParameter(10).Value = status.ItemDateModified;
 
                 _saveStatusCommand.Transaction = transaction;
 
diff --git a/MediaBrowser.Server.Mono/Imazen.WebP.dll.config b/MediaBrowser.Server.Mono/Imazen.WebP.dll.config
index 731902cd3d..4b4c72dd47 100644
--- a/MediaBrowser.Server.Mono/Imazen.WebP.dll.config
+++ b/MediaBrowser.Server.Mono/Imazen.WebP.dll.config
@@ -1,5 +1,5 @@
 <configuration>
   <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/mac/libwebp.dylib" os="osx"/>
+  <dllmap dll="libwebp" target="./libwebp/osx/libwebp.5.dylib" os="osx"/>
 </configuration>
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
index a778809d2c..abc27394f3 100644
--- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
+++ b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
@@ -153,6 +153,10 @@
       <Link>libwebp\linux\lib64\libwebp.so</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <Content Include="..\ThirdParty\libwebp\osx\libwebp.5.dylib">
+      <Link>libwebp\osx\libwebp.5.dylib</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
     <Content Include="..\ThirdParty\SQLite3\windows\x86\3.8.2\sqlite3.dll">
       <Link>sqlite3.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/MediaBrowser.ServerApplication/ApplicationHost.cs b/MediaBrowser.ServerApplication/ApplicationHost.cs
index b1a8c0c3f4..b5db94776a 100644
--- a/MediaBrowser.ServerApplication/ApplicationHost.cs
+++ b/MediaBrowser.ServerApplication/ApplicationHost.cs
@@ -2,9 +2,7 @@
 using MediaBrowser.Common;
 using MediaBrowser.Common.Configuration;
 using MediaBrowser.Common.Events;
-using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Implementations;
-using MediaBrowser.Common.Implementations.Devices;
 using MediaBrowser.Common.Implementations.ScheduledTasks;
 using MediaBrowser.Common.IO;
 using MediaBrowser.Common.Net;
@@ -48,7 +46,6 @@ using MediaBrowser.LocalMetadata.Providers;
 using MediaBrowser.MediaEncoding.BdInfo;
 using MediaBrowser.MediaEncoding.Encoder;
 using MediaBrowser.MediaEncoding.Subtitles;
-using MediaBrowser.Model.FileOrganization;
 using MediaBrowser.Model.Logging;
 using MediaBrowser.Model.MediaInfo;
 using MediaBrowser.Model.System;
@@ -313,13 +310,6 @@ namespace MediaBrowser.ServerApplication
         {
             var saveConfig = false;
 
-            if (ServerConfigurationManager.Configuration.TvFileOrganizationOptions != null)
-            {
-                ServerConfigurationManager.SaveConfiguration("autoorganize", new AutoOrganizeOptions { TvOptions = ServerConfigurationManager.Configuration.TvFileOrganizationOptions });
-                ServerConfigurationManager.Configuration.TvFileOrganizationOptions = null;
-                saveConfig = true;
-            }
-
             if (saveConfig)
             {
                 ServerConfigurationManager.SaveConfiguration();
diff --git a/MediaBrowser.WebDashboard/Api/DashboardService.cs b/MediaBrowser.WebDashboard/Api/DashboardService.cs
index 2269d308e1..cedc491608 100644
--- a/MediaBrowser.WebDashboard/Api/DashboardService.cs
+++ b/MediaBrowser.WebDashboard/Api/DashboardService.cs
@@ -387,7 +387,7 @@ namespace MediaBrowser.WebDashboard.Api
 
             sb.Append("<meta http-equiv=\"X-UA-Compatibility\" content=\"IE=Edge\">");
             sb.Append("<meta name=\"viewport\" content=\"width=device-width, initial-scale=1, user-scalable=no\">");
-            sb.Append("<meta name=\"apple-mobile-web-app-capable\" content=\"yes\">");
+            //sb.Append("<meta name=\"apple-mobile-web-app-capable\" content=\"yes\">");
             sb.Append("<meta name=\"mobile-web-app-capable\" content=\"yes\">");
             sb.Append("<meta name=\"application-name\" content=\"Media Browser\">");
             //sb.Append("<meta name=\"apple-mobile-web-app-status-bar-style\" content=\"black-translucent\">");